diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0349-drm-vc4-Fix-oops-dereferencing-DPI-s-connector-since.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0349-drm-vc4-Fix-oops-dereferencing-DPI-s-connector-since.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0349-drm-vc4-Fix-oops-dereferencing-DPI-s-connector-since.patch b/target/linux/brcm2708/patches-4.14/950-0349-drm-vc4-Fix-oops-dereferencing-DPI-s-connector-since.patch deleted file mode 100644 index 00585a983b..0000000000 --- a/target/linux/brcm2708/patches-4.14/950-0349-drm-vc4-Fix-oops-dereferencing-DPI-s-connector-since.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 2e4ad74553a929623fd09b2baf2ac73bc4adcd80 Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Fri, 9 Mar 2018 15:32:56 -0800 -Subject: [PATCH 349/454] drm/vc4: Fix oops dereferencing DPI's connector since - panel_bridge. - -In the cleanup, I didn't notice that we needed to dereference the -connector for the bus_format. Fix the regression by looking up the -first (and only) connector attached to us, and assume that its -bus_format is what we want. Some day it would be good to have that -part of display_info attached to the bridge, instead. - -v2: Fix stray whitespace change - -Signed-off-by: Eric Anholt <eric@anholt.net> -Fixes: 7b1298e05310 ("drm/vc4: Switch DPI to using the panel-bridge helper.") -Link: https://patchwork.freedesktop.org/patch/msgid/20180309233256.1667-1-eric@anholt.net -Reviewed-by: Sean Paul <seanpaul@chromium.org> -Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com> -(cherry picked from commit 721fe38db2010e8d475abf2c1d2bafb6dc031741) ---- - drivers/gpu/drm/vc4/vc4_dpi.c | 25 ++++++++++++++++++++++--- - 1 file changed, 22 insertions(+), 3 deletions(-) - ---- a/drivers/gpu/drm/vc4/vc4_dpi.c -+++ b/drivers/gpu/drm/vc4/vc4_dpi.c -@@ -96,7 +96,6 @@ struct vc4_dpi { - struct platform_device *pdev; - - struct drm_encoder *encoder; -- struct drm_connector *connector; - struct drm_bridge *bridge; - bool is_panel_bridge; - -@@ -166,14 +165,31 @@ static void vc4_dpi_encoder_disable(stru - - static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) - { -+ struct drm_device *dev = encoder->dev; - struct drm_display_mode *mode = &encoder->crtc->mode; - struct vc4_dpi_encoder *vc4_encoder = to_vc4_dpi_encoder(encoder); - struct vc4_dpi *dpi = vc4_encoder->dpi; -+ struct drm_connector_list_iter conn_iter; -+ struct drm_connector *connector = NULL, *connector_scan; - u32 dpi_c = DPI_ENABLE | DPI_OUTPUT_ENABLE_MODE; - int ret; - -- if (dpi->connector->display_info.num_bus_formats) { -- u32 bus_format = dpi->connector->display_info.bus_formats[0]; -+ /* Look up the connector attached to DPI so we can get the -+ * bus_format. Ideally the bridge would tell us the -+ * bus_format we want, but it doesn't yet, so assume that it's -+ * uniform throughout the bridge chain. -+ */ -+ drm_connector_list_iter_begin(dev, &conn_iter); -+ drm_for_each_connector_iter(connector_scan, &conn_iter) { -+ if (connector_scan->encoder == encoder) { -+ connector = connector_scan; -+ break; -+ } -+ } -+ drm_connector_list_iter_end(&conn_iter); -+ -+ if (connector && connector->display_info.num_bus_formats) { -+ u32 bus_format = connector->display_info.bus_formats[0]; - - switch (bus_format) { - case MEDIA_BUS_FMT_RGB888_1X24: -@@ -201,6 +217,9 @@ static void vc4_dpi_encoder_enable(struc - DRM_ERROR("Unknown media bus format %d\n", bus_format); - break; - } -+ } else { -+ /* Default to 24bit if no connector found. */ -+ dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, DPI_FORMAT); - } - - if (mode->flags & DRM_MODE_FLAG_NHSYNC) |