summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-11-03 21:14:26 -0500
committerBen Skeggs <bskeggs@redhat.com>2016-01-11 11:10:49 +1000
commit33568b3b89524ef8d2375ebf08045ddf5dfae6ed (patch)
tree6d33c64c87050f14c1e62a41bf851a6e08ccdf03
parentf6e7449b4d1076dfeb29419f4c8f24ec9db77bcc (diff)
downloadnouveau-33568b3b89524ef8d2375ebf08045ddf5dfae6ed.tar.gz
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 ee97eae3c..74247e1cb 100644
--- a/drm/nouveau/nv50_display.c
+++ b/drm/nouveau/nv50_display.c
@@ -774,7 +774,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;