On Thu, Mar 09, 2023 at 02:05:55AM +0100, Sebastian Wick wrote: > On Wed, Mar 8, 2023 at 10:09 AM Pekka Paalanen <ppaala...@gmail.com> wrote: > > > > On Tue, 7 Mar 2023 10:10:53 -0500 > > Harry Wentland <harry.wentl...@amd.com> wrote: > > > > > From: Joshua Ashton <jos...@froggi.es> > > > > > > Userspace has no way of controlling or knowing the pixel encoding > > > currently, so there is no way for it to ever get the right values here. > > > > > > When we do add pixel_encoding control from userspace,we can pick the > > > right value for the colorimetry packet based on the > > > pixel_encoding + the colorspace. > > > > > > Let's deprecate these values, and have one BT.2020 colorspace entry > > > that userspace can use. > > > > > > v2: > > > - leave CYCC alone for now; it serves a purpose > > > - leave BT2020_RGB the new default BT2020 > > > > > > Signed-off-by: Joshua Ashton <jos...@froggi.es> > > > Signed-off-by: Harry Wentland <harry.wentl...@amd.com> > > > Reviewed-by: Harry Wentland <harry.wentl...@amd.com> > > > > > > Cc: Pekka Paalanen <ppaala...@gmail.com> > > > Cc: Sebastian Wick <sebastian.w...@redhat.com> > > > Cc: vitaly.pros...@amd.com > > > Cc: Uma Shankar <uma.shan...@intel.com> > > > Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> > > > Cc: Joshua Ashton <jos...@froggi.es> > > > Cc: dri-devel@lists.freedesktop.org > > > Cc: amd-...@lists.freedesktop.org > > > --- > > > drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +++---- > > > drivers/gpu/drm/drm_connector.c | 8 ++++---- > > > drivers/gpu/drm/i915/display/intel_dp.c | 14 +++++++------- > > > include/drm/drm_connector.h | 15 +++++++++------ > > > 4 files changed, 23 insertions(+), 21 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/display/drm_hdmi_helper.c > > > b/drivers/gpu/drm/display/drm_hdmi_helper.c > > > index faf5e9efa7d3..05a0d03ffcda 100644 > > > --- a/drivers/gpu/drm/display/drm_hdmi_helper.c > > > +++ b/drivers/gpu/drm/display/drm_hdmi_helper.c > > > @@ -97,8 +97,7 @@ EXPORT_SYMBOL(drm_hdmi_infoframe_set_hdr_metadata); > > > #define HDMI_COLORIMETRY_OPYCC_601 (C(3) | EC(3) | ACE(0)) > > > #define HDMI_COLORIMETRY_OPRGB (C(3) | EC(4) | > > > ACE(0)) > > > #define HDMI_COLORIMETRY_BT2020_CYCC (C(3) | EC(5) | ACE(0)) > > > -#define HDMI_COLORIMETRY_BT2020_RGB (C(3) | EC(6) | ACE(0)) > > > -#define HDMI_COLORIMETRY_BT2020_YCC (C(3) | EC(6) | ACE(0)) > > > +#define HDMI_COLORIMETRY_BT2020 (C(3) | EC(6) | > > > ACE(0)) > > > #define HDMI_COLORIMETRY_DCI_P3_RGB_D65 (C(3) | EC(7) | > > > ACE(0)) > > > #define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER (C(3) | EC(7) | ACE(1)) > > > > > > @@ -112,8 +111,8 @@ static const u32 hdmi_colorimetry_val[] = { > > > [DRM_MODE_COLORIMETRY_OPYCC_601] = HDMI_COLORIMETRY_OPYCC_601, > > > [DRM_MODE_COLORIMETRY_OPRGB] = HDMI_COLORIMETRY_OPRGB, > > > [DRM_MODE_COLORIMETRY_BT2020_CYCC] = HDMI_COLORIMETRY_BT2020_CYCC, > > > - [DRM_MODE_COLORIMETRY_BT2020_RGB] = HDMI_COLORIMETRY_BT2020_RGB, > > > - [DRM_MODE_COLORIMETRY_BT2020_YCC] = HDMI_COLORIMETRY_BT2020_YCC, > > > + [DRM_MODE_COLORIMETRY_BT2020_DEPRECATED] = HDMI_COLORIMETRY_BT2020, > > > + [DRM_MODE_COLORIMETRY_BT2020] = HDMI_COLORIMETRY_BT2020, > > > }; > > > > > > #undef C > > > diff --git a/drivers/gpu/drm/drm_connector.c > > > b/drivers/gpu/drm/drm_connector.c > > > index 61c29ce74b03..fe7eab15f727 100644 > > > --- a/drivers/gpu/drm/drm_connector.c > > > +++ b/drivers/gpu/drm/drm_connector.c > > > @@ -1031,9 +1031,9 @@ static const struct drm_prop_enum_list > > > hdmi_colorspaces[] = { > > > /* Colorimetry based on ITU-R BT.2020 */ > > > { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, > > > /* Colorimetry based on ITU-R BT.2020 */ > > > - { DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, > > > + { DRM_MODE_COLORIMETRY_BT2020, "BT2020" }, > > > /* Colorimetry based on ITU-R BT.2020 */ > > > - { DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, > > > + { DRM_MODE_COLORIMETRY_BT2020_DEPRECATED, "BT2020_DEPRECATED" }, > > > /* Added as part of Additional Colorimetry Extension in 861.G */ > > > { DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65, "DCI-P3_RGB_D65" }, > > > { DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER, "DCI-P3_RGB_Theater" }, > > > @@ -1054,7 +1054,7 @@ static const struct drm_prop_enum_list > > > dp_colorspaces[] = { > > > /* Colorimetry based on SMPTE RP 431-2 */ > > > { DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65, "DCI-P3_RGB_D65" }, > > > /* Colorimetry based on ITU-R BT.2020 */ > > > - { DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, > > > + { DRM_MODE_COLORIMETRY_BT2020, "BT2020" }, > > > { DRM_MODE_COLORIMETRY_BT601_YCC, "BT601_YCC" }, > > > { DRM_MODE_COLORIMETRY_BT709_YCC, "BT709_YCC" }, > > > /* Standard Definition Colorimetry based on IEC 61966-2-4 */ > > > @@ -1068,7 +1068,7 @@ static const struct drm_prop_enum_list > > > dp_colorspaces[] = { > > > /* Colorimetry based on ITU-R BT.2020 */ > > > { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, > > > /* Colorimetry based on ITU-R BT.2020 */ > > > - { DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, > > > + { DRM_MODE_COLORIMETRY_BT2020_DEPRECATED, "BT2020_DEPRECATED" }, > > > > Let's hope no-one complains about missing the old string names in UABI. :-) > > > > Actually, you should write in the commit message why removing old names > > is fine. > > Uhm, yeah, I'm just going to do that. This breaks my code! Mutter > actually uses the strings and not the values. > > It's still not clear to me if we want to break backwards compatibility > or not. This patch definitely does break backwards compatibility but > it also doesn't get rid of all the other crap, so it's the worst of > both worlds.
Yeah, why are people still massaging this same turd? Wasn't the earlier conclusion just to define a new property that controls both the infoframes/msa/sdp stuff and RGB->YCbCr conversion (if necessary)? -- Ville Syrjälä Intel