summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2018-11-28 19:44:01 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2019-01-30 19:19:56 +0100
commit25120bbbc9031583c52ebf98939ffa531b0ccbca (patch)
tree2ca63f919d1d478569156028703fc4f0b41ac585 /drivers
parent047dac789427adf59462e4b331fd62b22a3d3094 (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')
-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 d98de4c49e02..1152c9aaff07 100644
--- a/drivers/gpu/drm/imx/hdp/imx-hdp.c
+++ b/drivers/gpu/drm/imx/hdp/imx-hdp.c
@@ -31,7 +31,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,
@@ -859,7 +859,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;