From: Harry Wentland <harry.wentland@amd.com> To: <amd-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org> Cc: Sebastian Wick <sebastian.wick@redhat.com>, Pekka Paalanen <ppaalanen@gmail.com>, Uma Shankar <uma.shankar@intel.com>, Vitaly.Prosyak@amd.com, Joshua Ashton <joshua@froggi.es> Subject: [PATCH 15/16] drm/amd/display: Add default case for output_color_space switch Date: Mon, 12 Dec 2022 13:21:36 -0500 [thread overview] Message-ID: <20221212182137.374625-16-harry.wentland@amd.com> (raw) In-Reply-To: <20221212182137.374625-1-harry.wentland@amd.com> Signed-off-by: Harry Wentland <harry.wentland@amd.com> Cc: Pekka Paalanen <ppaalanen@gmail.com> Cc: Sebastian Wick <sebastian.wick@redhat.com> Cc: Vitaly.Prosyak@amd.com Cc: Uma Shankar <uma.shankar@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Joshua Ashton <joshua@froggi.es> Cc: dri-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 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 768c0c8fada1..d0c071000a5d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5153,7 +5153,29 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing, enum dc_color_space color_space = COLOR_SPACE_SRGB; switch (connector_state->colorspace) { + case DRM_MODE_COLORIMETRY_BT601_YCC: + if (dc_crtc_timing->flags.Y_ONLY) + color_space = COLOR_SPACE_YCBCR601_LIMITED; + else + color_space = COLOR_SPACE_YCBCR601; + break; + case DRM_MODE_COLORIMETRY_BT709_YCC: + if (dc_crtc_timing->flags.Y_ONLY) + color_space = COLOR_SPACE_YCBCR709_LIMITED; + else + color_space = COLOR_SPACE_YCBCR709; + break; + case DRM_MODE_COLORIMETRY_OPRGB: + color_space = COLOR_SPACE_ADOBERGB; + break; + case DRM_MODE_COLORIMETRY_BT2020_RGB: + color_space = COLOR_SPACE_2020_RGB_FULLRANGE; + break; + case DRM_MODE_COLORIMETRY_BT2020_YCC: + color_space = COLOR_SPACE_2020_YCBCR; + break; case DRM_MODE_COLORIMETRY_DEFAULT: // ITU601 + default: if (dc_crtc_timing->pixel_encoding == PIXEL_ENCODING_RGB) { color_space = COLOR_SPACE_SRGB; /* @@ -5175,27 +5197,6 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing, color_space = COLOR_SPACE_YCBCR601; } break; - case DRM_MODE_COLORIMETRY_BT601_YCC: - if (dc_crtc_timing->flags.Y_ONLY) - color_space = COLOR_SPACE_YCBCR601_LIMITED; - else - color_space = COLOR_SPACE_YCBCR601; - break; - case DRM_MODE_COLORIMETRY_BT709_YCC: - if (dc_crtc_timing->flags.Y_ONLY) - color_space = COLOR_SPACE_YCBCR709_LIMITED; - else - color_space = COLOR_SPACE_YCBCR709; - break; - case DRM_MODE_COLORIMETRY_OPRGB: - color_space = COLOR_SPACE_ADOBERGB; - break; - case DRM_MODE_COLORIMETRY_BT2020_RGB: - color_space = COLOR_SPACE_2020_RGB_FULLRANGE; - break; - case DRM_MODE_COLORIMETRY_BT2020_YCC: - color_space = COLOR_SPACE_2020_YCBCR; - break; } return color_space; -- 2.38.1
WARNING: multiple messages have this Message-ID (diff)
From: Harry Wentland <harry.wentland@amd.com> To: <amd-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org> Cc: "Sebastian Wick" <sebastian.wick@redhat.com>, "Pekka Paalanen" <ppaalanen@gmail.com>, "Uma Shankar" <uma.shankar@intel.com>, Vitaly.Prosyak@amd.com, "Joshua Ashton" <joshua@froggi.es>, "Harry Wentland" <harry.wentland@amd.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Subject: [PATCH 15/16] drm/amd/display: Add default case for output_color_space switch Date: Mon, 12 Dec 2022 13:21:36 -0500 [thread overview] Message-ID: <20221212182137.374625-16-harry.wentland@amd.com> (raw) In-Reply-To: <20221212182137.374625-1-harry.wentland@amd.com> Signed-off-by: Harry Wentland <harry.wentland@amd.com> Cc: Pekka Paalanen <ppaalanen@gmail.com> Cc: Sebastian Wick <sebastian.wick@redhat.com> Cc: Vitaly.Prosyak@amd.com Cc: Uma Shankar <uma.shankar@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Joshua Ashton <joshua@froggi.es> Cc: dri-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 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 768c0c8fada1..d0c071000a5d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5153,7 +5153,29 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing, enum dc_color_space color_space = COLOR_SPACE_SRGB; switch (connector_state->colorspace) { + case DRM_MODE_COLORIMETRY_BT601_YCC: + if (dc_crtc_timing->flags.Y_ONLY) + color_space = COLOR_SPACE_YCBCR601_LIMITED; + else + color_space = COLOR_SPACE_YCBCR601; + break; + case DRM_MODE_COLORIMETRY_BT709_YCC: + if (dc_crtc_timing->flags.Y_ONLY) + color_space = COLOR_SPACE_YCBCR709_LIMITED; + else + color_space = COLOR_SPACE_YCBCR709; + break; + case DRM_MODE_COLORIMETRY_OPRGB: + color_space = COLOR_SPACE_ADOBERGB; + break; + case DRM_MODE_COLORIMETRY_BT2020_RGB: + color_space = COLOR_SPACE_2020_RGB_FULLRANGE; + break; + case DRM_MODE_COLORIMETRY_BT2020_YCC: + color_space = COLOR_SPACE_2020_YCBCR; + break; case DRM_MODE_COLORIMETRY_DEFAULT: // ITU601 + default: if (dc_crtc_timing->pixel_encoding == PIXEL_ENCODING_RGB) { color_space = COLOR_SPACE_SRGB; /* @@ -5175,27 +5197,6 @@ get_output_color_space(const struct dc_crtc_timing *dc_crtc_timing, color_space = COLOR_SPACE_YCBCR601; } break; - case DRM_MODE_COLORIMETRY_BT601_YCC: - if (dc_crtc_timing->flags.Y_ONLY) - color_space = COLOR_SPACE_YCBCR601_LIMITED; - else - color_space = COLOR_SPACE_YCBCR601; - break; - case DRM_MODE_COLORIMETRY_BT709_YCC: - if (dc_crtc_timing->flags.Y_ONLY) - color_space = COLOR_SPACE_YCBCR709_LIMITED; - else - color_space = COLOR_SPACE_YCBCR709; - break; - case DRM_MODE_COLORIMETRY_OPRGB: - color_space = COLOR_SPACE_ADOBERGB; - break; - case DRM_MODE_COLORIMETRY_BT2020_RGB: - color_space = COLOR_SPACE_2020_RGB_FULLRANGE; - break; - case DRM_MODE_COLORIMETRY_BT2020_YCC: - color_space = COLOR_SPACE_2020_YCBCR; - break; } return color_space; -- 2.38.1
next prev parent reply other threads:[~2022-12-12 18:23 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-12 18:21 [PATCH 00/16] Enable Colorspace connector property in amdgpu Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 01/16] drm/display: Don't block HDR_OUTPUT_METADATA on unknown EOTF Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 02/16] drm/connector: print max_requested_bpc in state debugfs Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 03/16] drm/connector: Drop COLORIMETRY_NO_DATA Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 04/16] drm/connector: Convert DRM_MODE_COLORIMETRY to enum Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-13 10:39 ` Pekka Paalanen 2022-12-13 10:39 ` Pekka Paalanen 2022-12-13 16:41 ` Harry Wentland 2022-12-13 16:41 ` Harry Wentland 2022-12-14 8:57 ` Pekka Paalanen 2022-12-14 8:57 ` Pekka Paalanen 2022-12-12 18:21 ` [PATCH 05/16] drm/connector: Pull out common create_colorspace_property code Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 06/16] drm/connector: Allow drivers to pass list of supported colorspaces Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-13 10:20 ` Jani Nikula 2022-12-13 10:23 ` Pekka Paalanen 2022-12-13 10:23 ` Pekka Paalanen 2022-12-13 16:32 ` Harry Wentland 2022-12-13 16:32 ` Harry Wentland 2022-12-14 8:55 ` Pekka Paalanen 2022-12-14 8:55 ` Pekka Paalanen 2022-12-14 19:07 ` Harry Wentland 2022-12-14 19:07 ` Harry Wentland 2022-12-14 19:37 ` Alex Deucher 2022-12-14 19:37 ` Alex Deucher 2022-12-13 10:34 ` Pekka Paalanen 2022-12-13 10:34 ` Pekka Paalanen 2022-12-13 16:36 ` Harry Wentland 2022-12-13 16:36 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 07/16] drm/connector: Print connector colorspace in state debugfs Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 21:04 ` kernel test robot 2022-12-12 21:04 ` kernel test robot 2022-12-13 2:58 ` kernel test robot 2022-12-13 2:58 ` kernel test robot 2022-12-12 18:21 ` [PATCH 08/16] drm/amd/display: Always pass connector_state to stream validation Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 09/16] drm/amd/display: Register Colorspace property for DP and HDMI Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 10/16] drm/amd/display: Set colorspace for HDMI infoframe Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 11/16] drm/amd/display: Send correct DP colorspace infopacket Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 12/16] drm/amd/display: Always set crtcinfo from create_stream_for_sink Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 13/16] drm/amd/display: Add support for explicit BT601_YCC Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-12 18:21 ` [PATCH 14/16] drm/amd/display: Add debugfs for testing output colorspace Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-13 10:35 ` Pekka Paalanen 2022-12-13 10:35 ` Pekka Paalanen 2022-12-12 18:21 ` Harry Wentland [this message] 2022-12-12 18:21 ` [PATCH 15/16] drm/amd/display: Add default case for output_color_space switch Harry Wentland 2022-12-12 18:21 ` [PATCH 16/16] drm/amd/display: Don't restrict bpc to 8 bpc Harry Wentland 2022-12-12 18:21 ` Harry Wentland 2022-12-13 10:48 ` Pekka Paalanen 2022-12-13 10:48 ` Pekka Paalanen 2022-12-13 17:20 ` Michel Dänzer 2022-12-13 17:20 ` Michel Dänzer 2022-12-14 9:01 ` Pekka Paalanen 2022-12-14 9:01 ` Pekka Paalanen 2022-12-14 15:46 ` Alex Deucher 2022-12-15 9:07 ` Michel Dänzer 2022-12-15 17:30 ` Alex Deucher 2022-12-16 11:01 ` Michel Dänzer 2022-12-15 9:17 ` Pekka Paalanen 2022-12-15 17:33 ` Alex Deucher 2022-12-15 17:42 ` Michel Dänzer 2022-12-15 17:46 ` Michel Dänzer 2022-12-23 19:10 ` Harry Wentland 2022-12-23 19:10 ` Harry Wentland 2023-01-04 11:23 ` Michel Dänzer 2023-01-05 14:45 ` Sebastian Wick 2023-01-05 14:45 ` Sebastian Wick 2022-12-13 5:53 ` [PATCH 00/16] Enable Colorspace connector property in amdgpu Joshua Ashton 2022-12-13 5:53 ` Joshua Ashton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221212182137.374625-16-harry.wentland@amd.com \ --to=harry.wentland@amd.com \ --cc=Vitaly.Prosyak@amd.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=joshua@froggi.es \ --cc=ppaalanen@gmail.com \ --cc=sebastian.wick@redhat.com \ --cc=uma.shankar@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.