| Message ID | 20221207-rpi-hdmi-improvements-v1-9-6b15f774c13a@cerno.tech (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vc4: hdmi: Broadcast RGB, BT601, BT2020 | expand |
Am 07.12.22 um 17:07 schrieb Maxime Ripard: > From: Dave Stevenson <dave.stevenson@raspberrypi.com> > > Even though we report that we support the BT.2020 Colorspace, we were > always using the BT.709 conversion matrices. Let's add the BT.2020 ones. > > Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> > Signed-off-by: Maxime Ripard <maxime@cerno.tech> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 38 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index e3428fb2c22d..2734cab34660 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -1277,6 +1277,37 @@ static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt709[2][3][4] = { > }, > }; > > +/* > + * Conversion between Full Range RGB and YUV using the BT.2020 Colorspace > + * > + * Matrices are signed 2p13 fixed point, with signed 9p6 offsets > + */ > +static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt2020[2][3][4] = { > + { > + /* > + * Full Range > + * > + * [ 0.262700 0.678000 0.059300 0 ] > + * [ -0.139630 -0.360370 0.500000 128 ] > + * [ 0.500000 -0.459786 -0.040214 128 ] > + */ > + { 0x0868, 0x15b2, 0x01e6, 0x0000 }, > + { 0xfb89, 0xf479, 0x1000, 0x2000 }, > + { 0x1000, 0xf14a, 0xfeb8, 0x2000 }, > + }, > + { > + /* Limited Range > + * > + * [ 0.224732 0.580008 0.050729 16 ] > + * [ -0.122176 -0.315324 0.437500 128 ] > + * [ 0.437500 -0.402312 -0.035188 128 ] > + */ > + { 0x082f, 0x1012, 0x031f, 0x0400 }, > + { 0xfb48, 0xf6ba, 0x0e00, 0x2000 }, > + { 0x0e00, 0xf448, 0xfdba, 0x2000 }, > + }, > +}; > + > static void vc5_hdmi_set_csc_coeffs(struct vc4_hdmi *vc4_hdmi, > const u16 coeffs[3][4]) > { > @@ -1322,6 +1353,13 @@ static const u16 > case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED: > case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT: > return vc5_hdmi_csc_full_rgb_to_yuv_bt709[limited]; > + > + case DRM_MODE_COLORIMETRY_BT2020_CYCC: > + case DRM_MODE_COLORIMETRY_BT2020_YCC: > + case DRM_MODE_COLORIMETRY_BT2020_RGB: > + case DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65: > + case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER: > + return vc5_hdmi_csc_full_rgb_to_yuv_bt2020[limited]; > } > } > >
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index e3428fb2c22d..2734cab34660 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1277,6 +1277,37 @@ static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt709[2][3][4] = { }, }; +/* + * Conversion between Full Range RGB and YUV using the BT.2020 Colorspace + * + * Matrices are signed 2p13 fixed point, with signed 9p6 offsets + */ +static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt2020[2][3][4] = { + { + /* + * Full Range + * + * [ 0.262700 0.678000 0.059300 0 ] + * [ -0.139630 -0.360370 0.500000 128 ] + * [ 0.500000 -0.459786 -0.040214 128 ] + */ + { 0x0868, 0x15b2, 0x01e6, 0x0000 }, + { 0xfb89, 0xf479, 0x1000, 0x2000 }, + { 0x1000, 0xf14a, 0xfeb8, 0x2000 }, + }, + { + /* Limited Range + * + * [ 0.224732 0.580008 0.050729 16 ] + * [ -0.122176 -0.315324 0.437500 128 ] + * [ 0.437500 -0.402312 -0.035188 128 ] + */ + { 0x082f, 0x1012, 0x031f, 0x0400 }, + { 0xfb48, 0xf6ba, 0x0e00, 0x2000 }, + { 0x0e00, 0xf448, 0xfdba, 0x2000 }, + }, +}; + static void vc5_hdmi_set_csc_coeffs(struct vc4_hdmi *vc4_hdmi, const u16 coeffs[3][4]) { @@ -1322,6 +1353,13 @@ static const u16 case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED: case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT: return vc5_hdmi_csc_full_rgb_to_yuv_bt709[limited]; + + case DRM_MODE_COLORIMETRY_BT2020_CYCC: + case DRM_MODE_COLORIMETRY_BT2020_YCC: + case DRM_MODE_COLORIMETRY_BT2020_RGB: + case DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65: + case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER: + return vc5_hdmi_csc_full_rgb_to_yuv_bt2020[limited]; } }