From 19226502bf6393706defe7f049c587b32c9b4f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Wed, 31 Jul 2019 18:23:26 +0200 Subject: brcm2708: update to latest patches from the RPi foundation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Fernández Rojas --- ...Attach-margin-props-to-the-HDMI-connector.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 target/linux/brcm2708/patches-4.19/950-0720-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch (limited to 'target/linux/brcm2708/patches-4.19/950-0720-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch') diff --git a/target/linux/brcm2708/patches-4.19/950-0720-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch b/target/linux/brcm2708/patches-4.19/950-0720-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch new file mode 100644 index 0000000000..10827939c1 --- /dev/null +++ b/target/linux/brcm2708/patches-4.19/950-0720-drm-vc4-Attach-margin-props-to-the-HDMI-connector.patch @@ -0,0 +1,71 @@ +From c0f966a04d5ff984a33d7d7b9c3cdc32514ebc14 Mon Sep 17 00:00:00 2001 +From: Boris Brezillon +Date: Thu, 6 Dec 2018 15:24:39 +0100 +Subject: [PATCH 720/725] drm/vc4: Attach margin props to the HDMI connector + +Commit db999538fdb0679629d90652f8a1437df1e85a7d upstream. + +Now that the plane code takes the margins setup into account, we can +safely attach margin props to the HDMI connector. + +We also take care of filling AVI infoframes correctly to expose the +top/botton/left/right bar. + +Note that those margin props match pretty well the +overscan_{left,right,top,bottom} properties defined in config.txt and +parsed by the VC4 firmware. + +Signed-off-by: Boris Brezillon +Reviewed-by: Eric Anholt +Acked-by: Daniel Vetter +Link: https://patchwork.freedesktop.org/patch/msgid/20181206142439.10441-6-boris.brezillon@bootlin.com +--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -310,6 +310,7 @@ static struct drm_connector *vc4_hdmi_co + { + struct drm_connector *connector; + struct vc4_hdmi_connector *hdmi_connector; ++ int ret; + + hdmi_connector = devm_kzalloc(dev->dev, sizeof(*hdmi_connector), + GFP_KERNEL); +@@ -323,6 +324,13 @@ static struct drm_connector *vc4_hdmi_co + DRM_MODE_CONNECTOR_HDMIA); + drm_connector_helper_add(connector, &vc4_hdmi_connector_helper_funcs); + ++ /* Create and attach TV margin props to this connector. */ ++ ret = drm_mode_create_tv_margin_properties(dev); ++ if (ret) ++ return ERR_PTR(ret); ++ ++ drm_connector_attach_tv_margin_properties(connector); ++ + connector->polled = (DRM_CONNECTOR_POLL_CONNECT | + DRM_CONNECTOR_POLL_DISCONNECT); + +@@ -408,6 +416,9 @@ static void vc4_hdmi_write_infoframe(str + static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder) + { + struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder); ++ struct vc4_dev *vc4 = encoder->dev->dev_private; ++ struct vc4_hdmi *hdmi = vc4->hdmi; ++ struct drm_connector_state *cstate = hdmi->connector->state; + struct drm_crtc *crtc = encoder->crtc; + const struct drm_display_mode *mode = &crtc->state->adjusted_mode; + union hdmi_infoframe frame; +@@ -426,6 +437,11 @@ static void vc4_hdmi_set_avi_infoframe(s + vc4_encoder->rgb_range_selectable, + false); + ++ frame.avi.right_bar = cstate->tv.margins.right; ++ frame.avi.left_bar = cstate->tv.margins.left; ++ frame.avi.top_bar = cstate->tv.margins.top; ++ frame.avi.bottom_bar = cstate->tv.margins.bottom; ++ + vc4_hdmi_write_infoframe(encoder, &frame); + } + -- cgit v1.2.3