diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-10-07 14:30:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-10-07 14:30:32 +1000 |
| commit | 7bbc1920c0fd1416e4660b1dee5c467a2996c80e (patch) | |
| tree | f152432833a76a14532f7e5b89162eaf6e65d279 /drivers/gpu/drm/drm_edid.c | |
| parent | 436e94a4cb6f60c99edc7e424d32821c454ab8f0 (diff) | |
| parent | 1bcecfacde6269dc6cee9a098bc454222d441ff9 (diff) | |
| download | talos-obmc-linux-7bbc1920c0fd1416e4660b1dee5c467a2996c80e.tar.gz talos-obmc-linux-7bbc1920c0fd1416e4660b1dee5c467a2996c80e.zip | |
Merge tag 'topic/core-stuff-2014-10-03' of git://anongit.freedesktop.org/drm-intel into drm-next
two core fixes
* tag 'topic/core-stuff-2014-10-03' of git://anongit.freedesktop.org/drm-intel:
drm/core: use helper to check driver features
drm/edid: Add missing interlaced flag to 576i@100 modes.
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 1bdbfd0e0033..3bf999134bcc 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -841,13 +841,13 @@ static const struct drm_display_mode edid_cea_modes[] = { { DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, 795, 864, 0, 576, 580, 586, 625, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | - DRM_MODE_FLAG_DBLCLK), + DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK), .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, }, /* 45 - 720(1440)x576i@100Hz */ { DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, 795, 864, 0, 576, 580, 586, 625, 0, DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC | - DRM_MODE_FLAG_DBLCLK), + DRM_MODE_FLAG_INTERLACE | DRM_MODE_FLAG_DBLCLK), .vrefresh = 100, .picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, }, /* 46 - 1920x1080i@120Hz */ { DRM_MODE("1920x1080i", DRM_MODE_TYPE_DRIVER, 148500, 1920, 2008, |
