summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-11-03 21:14:26 -0500
committerBen Skeggs <bskeggs@redhat.com>2015-11-05 07:21:19 +1000
commit9eed71218ca3a632aa55e6a27386991d7a1e9ba8 (patch)
treec7492b3e60b1abbd8d5bb05e4ec1cc8cd9087fcf
parentb6fb76f7792fd5ac9b95f3b4254e3a8d85dc6186 (diff)
kms: no need to check for empty edid before drm_detect_hdmi_monitor
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau/nv50_display.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drm/nouveau/nv50_display.c b/drm/nouveau/nv50_display.c
index bdaba912..d9cba873 100644
--- a/drm/nouveau/nv50_display.c
+++ b/drm/nouveau/nv50_display.c
@@ -773,7 +773,6 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update)
*/
if (nv_connector && ( nv_connector->underscan == UNDERSCAN_ON ||
(nv_connector->underscan == UNDERSCAN_AUTO &&
- nv_connector->edid &&
drm_detect_hdmi_monitor(nv_connector->edid)))) {
u32 bX = nv_connector->underscan_hborder;
u32 bY = nv_connector->underscan_vborder;