From: Ilia Mirkin Date: Wed, 4 Nov 2015 02:14:26 +0000 (-0500) Subject: drm/nouveau/kms: no need to check for empty edid before drm_detect_hdmi_monitor X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=700c18ca08bf79360c117e39490c74c681189b65;p=linux-beck.git drm/nouveau/kms: no need to check for empty edid before drm_detect_hdmi_monitor Signed-off-by: Ilia Mirkin Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index ee97eae3c973..74247e1cb58d 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/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;