From patchwork Thu Mar 5 09:04:56 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 307 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03499377ED4; Thu, 5 Mar 2026 09:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772701516; cv=none; b=qo4r1Fyq8PfYExwHEJnGuLTfc0i8hOP0WW6TKKQUnn7Rl3YUK6SOru3+WpHDlF12/LfhdbMlX7L7QdvTjTviC/KSxVJ7CV+vrrdEuiLamyO1qJb9NEsBLiqG0y7PQBoHXOuNlc8j75uvb4zYhisIYXEhnHKeGBtXjrePPF/q6YU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772701516; c=relaxed/simple; bh=Bi7dzqSb0xTzyJ/T4zIX0511vvg8pddfBkr4pnB64SM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RRPOBH+R8EBmlMgbVAen6QFr50VBSIvpoPw2W/0VHOIKO35iogl04gRYJ+lu8/cs0qaNKUbXUbWQUDB8BvyCtLnffqew2UmNlWk23Cudy6xQaqJgdxC2ZQfAsEfUDFdDmjV8Ab+voIA7cq6r2ZDe7ckZ1KvreRxegbVjN4LwsOI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EVEox1Eq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EVEox1Eq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07046C2BCAF; Thu, 5 Mar 2026 09:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772701515; bh=Bi7dzqSb0xTzyJ/T4zIX0511vvg8pddfBkr4pnB64SM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=EVEox1EqmbtV1utZkz+RzKWiDUb0h5Kk7iM2hm4bclF75JIknKHAsH4acyxtxuRL0 YHCLfUkaNxaIPzkT3n1yVt5XuD8zF/m9eCeEywShk2B1/R4LEP+OUsaDcJe2kaLfrp NSwjDOm4rl8MSp+Gq0uXAM3jrREitRTJwqgCOw2bnPD9d9qb0vjM6oCLtbEJCok7vG 7TWOeEzD8WZ/eqYPuAFLVRzHmXShRjbOQqxD1pKcAIGtABxD9trgOVyzSH73mt/AN9 A7N00vmML9JAfiD+KJAjsGH8EfA1eJFsyjwgPONIRgkQ+GNm4s8eFLex8xUh3f0oSk d5LsaHNq/Y29w== From: Maxime Ripard Date: Thu, 05 Mar 2026 10:04:56 +0100 Subject: [PATCH v3 04/14] drm/amdgpu: display: Convert to drm_output_color_format Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20260305-drm-rework-color-formats-v3-4-f3935f6db579@kernel.org> References: <20260305-drm-rework-color-formats-v3-0-f3935f6db579@kernel.org> In-Reply-To: <20260305-drm-rework-color-formats-v3-0-f3935f6db579@kernel.org> To: Nicolas Frattaroli , Jani Nikula , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Andy Yan , Liviu Dudau , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Liu Ying , Chen-Yu Tsai , Samuel Holland , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Cana?= =?utf-8?q?l?= , Raspberry Pi Kernel Maintenance Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Jani Nikula X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2094; i=mripard@kernel.org; h=from:subject:message-id; bh=Bi7dzqSb0xTzyJ/T4zIX0511vvg8pddfBkr4pnB64SM=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDJkr3S0uRef/nNDU9unHkR9tiZXPNnlP8c/b7jFRglW+f KFh52/xjqksDMKcDLJiiixPZMJOL29fXOVgv/IHzBxWJpAhDFycAjARFjXG+ngv458W1Y4Pl5p8 PPN5Sao9X3d3SM8Cxmof8S/tRxn6hfuT8p91+5bd33nh7adaZT9BxoaTziHRl5cyVr41fHV0frV bFZ/A7DJB4bf/P98XMYj+PSX/oUW079sFiobGRblJtbUFIgA= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Status: O Now that we introduced a new drm_output_color_format enum to represent what DRM_COLOR_FORMAT_* bits were representing, we can switch to the new enum. The main difference is that while DRM_COLOR_FORMAT_ was a bitmask, drm_output_color_format is a proper enum. However, the enum was done is such a way than DRM_COLOR_FORMAT_X = BIT(DRM_OUTPUT_COLOR_FORMAT_X) so the transitition is easier. The only thing we need to consider is if the original code meant to use that value as a bitmask, in which case we do need to keep the bit shift, or as a discriminant in which case we don't. Acked-by: Jani Nikula Signed-off-by: Maxime Ripard Tested-by: Nicolas Frattaroli --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index a8e4e3ab5e40276b3c723297ca6520688079e0a7..2fe9044e1e91d7581fd5032b9883548f8e5e1b43 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6723,15 +6723,15 @@ static void fill_stream_properties_from_drm_display_mode( timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420; else if (drm_mode_is_420_also(info, mode_in) && aconnector && aconnector->force_yuv420_output) timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR420; - else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR422) + else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422)) && aconnector && aconnector->force_yuv422_output) timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR422; - else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR444) + else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444)) && stream->signal == SIGNAL_TYPE_HDMI_TYPE_A) timing_out->pixel_encoding = PIXEL_ENCODING_YCBCR444; else timing_out->pixel_encoding = PIXEL_ENCODING_RGB;