openwrt/upstream - upstream openwrt

	Commit message (Expand)	Author	Age	Files	Lines
*	e2fsprogs: update to 1.42.8, fixes a build error	Felix Fietkau	2013-10-28	1	-2/+2
*	build: BSD compile fixes	Felix Fietkau	2013-03-07	2	-0/+37
*	e2fsprogs: upgrade to version 1.42.7	Luka Perkov	2013-02-28	1	-3/+3
*	tools: e2fsprogs: delete doc/ directory after unpacking to ensure that makein...	Jo-Philipp Wich	2012-12-02	1	-0/+5
*	tools/e2fsprogs: enable parallel builds	Felix Fietkau	2012-09-15	1	-0/+2
*	use HOST_STATIC_LINKING instead of hardcoding -static	Jo-Philipp Wich	2012-08-12	1	-1/+1
*	e2fsprogs: link statically	Jo-Philipp Wich	2012-08-10	1	-0/+1
*	tools/e2fsprogs: don't build e4defrag	Gabor Juhos	2012-06-19	1	-0/+11
*	e2fsprogs: fix md5sum issue	Luka Perkov	2012-06-17	1	-1/+1
*	e2fsprogs: update to 1.42.4	Luka Perkov	2012-06-17	1	-2/+2
*	tools/e2fsprogs: disable building elf shared libraries, it is unnecessary and...	Felix Fietkau	2012-06-10	1	-1/+1
*	more e2fsprogs fixes	John Crispin	2012-06-10	1	-3/+2
*	fix build breakage introduced by [32142]	John Crispin	2012-06-10	1	-1/+2
*	e2fsprogs: update to 1.42.3	Luka Perkov	2012-06-09	6	-115/+4
*	e2fsprogs: add posix_memalign related portability patch from #8508	Felix Fietkau	2012-06-07	1	-0/+31
*	tools/e2fsprogs: move uuid/uuid.h into a subdirectory, it conflicts with a sy...	Felix Fietkau	2011-02-20	1	-0/+3
*	revert r24851, it breaks compilation on many hosts	Jo-Philipp Wich	2011-01-01	2	-2/+28
*	tools/e2fsprogs: update to version 1.41.14	Alexandros C. Couloumbis	2010-12-29	2	-28/+2
*	e2fsprogs: add two compile fixes.	Hauke Mehrtens	2010-12-19	2	-0/+62
*	e2fsprogs: update to version 1.41.13	Hauke Mehrtens	2010-12-18	1	-2/+2
*	tools/e2fsprogs: fix freebsd compile issue	Alexandros C. Couloumbis	2010-11-24	1	-0/+18
*	tools/e2fsprogs: update to e2fsprogs-1.41.12	Alexandros C. Couloumbis	2010-11-24	1	-2/+2
*	e2fsprogs: fix libuuid installation	Felix Fietkau	2010-11-22	1	-0/+1
*	e2fsprogs: clean up the makefile and install libuuid	Felix Fietkau	2010-11-22	1	-29/+3
*	add e2fsprogs to tools and use that instead of libuuid	Imre Kaloz	2010-11-22	2	-0/+77

From 82a5aa1df1b04efef46c7be82a7d71ea5300ce92 Mon Sep 17 00:00:00 2001 From: Dave Stevenson <dave.stevenson@raspberrypi.com> Date: Wed, 2 Dec 2020 18:36:24 +0000 Subject: [PATCH] drm/vc4: Add HDR metadata property to the VC5 HDMI connectors Now that we can export deeper colour depths, add in the signalling for HDR metadata. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- drivers/gpu/drm/vc4/vc4_hdmi.c | 28 ++++++++++++++++++++++++++++ drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++ 2 files changed, 31 insertions(+) --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -312,6 +312,10 @@ static int vc4_hdmi_connector_init(struc connector->doublescan_allowed = 0; connector->stereo_allowed = 1; + if (vc4_hdmi->variant->supports_hdr) + drm_object_attach_property(&connector->base, + connector->dev->mode_config.hdr_output_metadata_property, 0); + drm_connector_attach_encoder(connector, encoder); return 0; @@ -451,6 +455,25 @@ static void vc4_hdmi_set_audio_infoframe vc4_hdmi_write_infoframe(encoder, &frame); } +static void vc4_hdmi_set_hdr_infoframe(struct drm_encoder *encoder) +{ + struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); + struct drm_connector *connector = &vc4_hdmi->connector; + struct drm_connector_state *conn_state = connector->state; + union hdmi_infoframe frame; + + if (!vc4_hdmi->variant->supports_hdr) + return; + + if (!conn_state->hdr_output_metadata) + return; + + if (drm_hdmi_infoframe_set_hdr_metadata(&frame.drm, conn_state)) + return; + + vc4_hdmi_write_infoframe(encoder, &frame); +} + static void vc4_hdmi_set_infoframes(struct drm_encoder *encoder) { struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); @@ -463,6 +486,8 @@ static void vc4_hdmi_set_infoframes(stru */ if (vc4_hdmi->audio.streaming) vc4_hdmi_set_audio_infoframe(encoder); + + vc4_hdmi_set_hdr_infoframe(encoder); } static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder, @@ -2300,6 +2325,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_disable = vc4_hdmi_phy_rng_disable, .channel_map = vc4_hdmi_channel_map, + .supports_hdr = false, }; static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { @@ -2327,6 +2353,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .channel_map = vc5_hdmi_channel_map, + .supports_hdr = true, }; static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { @@ -2354,6 +2381,7 @@ static const struct vc4_hdmi_variant bcm .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, .channel_map = vc5_hdmi_channel_map, + .supports_hdr = true, }; static const struct of_device_id vc4_hdmi_dt_match[] = { --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -99,6 +99,9 @@ struct vc4_hdmi_variant { /* Callback to get channel map */ u32 (*channel_map)(struct vc4_hdmi *vc4_hdmi, u32 channel_mask); + + /* Enables HDR metadata */ + bool supports_hdr; }; /* HDMI audio information */