summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2018-11-28 19:44:01 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2019-06-21 17:22:02 +0200
commit4b25622441b30d2b20fb1bf8914ff719b0d04936 (patch)
treeb3fe1d8a268e5c7b1d66be84c0db697d9499869b /drivers/gpu
parent8734872403941af2e0682ac14b8dc16e800da4a5 (diff)
imx-hdp.c: fix default resolution
Make 1920x1080 really the default and only mark one resolution as the preferred one. (cherry picked from commit c61d21ae6156ff7c6ce981a586c52ca0abefa17c)
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/imx/hdp/imx-hdp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/imx/hdp/imx-hdp.c b/drivers/gpu/drm/imx/hdp/imx-hdp.c
index 4b4bbfee629a..c40a0ea660f9 100644
--- a/drivers/gpu/drm/imx/hdp/imx-hdp.c
+++ b/drivers/gpu/drm/imx/hdp/imx-hdp.c
@@ -33,7 +33,7 @@
#define B0_SILICON_ID 0x11
struct drm_display_mode *g_mode;
-uint8_t g_default_mode = 3;
+uint8_t g_default_mode = 2;
static struct drm_display_mode edid_cea_modes[] = {
/* 3 - 720x480@60Hz */
{ DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736,
@@ -862,7 +862,9 @@ static int imx_hdp_default_video_modes(struct drm_connector *connector)
if (!mode)
return -EINVAL;
drm_mode_copy(mode, &edid_cea_modes[i]);
- mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
+ mode->type |= DRM_MODE_TYPE_DRIVER;
+ if(i == g_default_mode)
+ mode->type |= DRM_MODE_TYPE_PREFERRED;
drm_mode_probed_add(connector, mode);
}
return i;