1 files changed, 8 insertions, 22 deletions

diff --git a/drivers/gpu/drm/gma500/cdv_intel_crt.c b/drivers/gpu/drm/gma500/cdv_intel_crt.c
index a71a6cd95bdd..187422018601 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_crt.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_crt.c
@@ -67,8 +67,6 @@ static void cdv_intel_crt_dpms(struct drm_encoder *encoder, int mode)
 static int cdv_intel_crt_mode_valid(struct drm_connector *connector,
                                 struct drm_display_mode *mode)
 {
-        struct drm_psb_private *dev_priv = connector->dev->dev_private;
-        int max_clock = 0;
         if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
                 return MODE_NO_DBLESCAN;
 
@@ -77,18 +75,9 @@ static int cdv_intel_crt_mode_valid(struct drm_connector *connector,
                 return MODE_CLOCK_LOW;
 
         /* The max clock for CDV is 355 instead of 400 */
-        max_clock = 355000;
-        if (mode->clock > max_clock)
+        if (mode->clock > 355000)
                 return MODE_CLOCK_HIGH;
 
-        if (mode->hdisplay > 1680 || mode->vdisplay > 1050)
-                return MODE_PANEL;
-
-        /* We assume worst case scenario of 32 bpp here, since we don't know */
-        if ((ALIGN(mode->hdisplay * 4, 64) * mode->vdisplay) >
-            dev_priv->vram_stolen_size)
-                return MODE_MEM;
-
         return MODE_OK;
 }
 
@@ -156,13 +145,7 @@ static bool cdv_intel_crt_detect_hotplug(struct drm_connector *connector,
         struct drm_device *dev = connector->dev;
         u32 hotplug_en;
         int i, tries = 0, ret = false;
-        u32 adpa_orig;
-
-        /* disable the DAC when doing the hotplug detection */
-
-        adpa_orig = REG_READ(ADPA);
-
-        REG_WRITE(ADPA, adpa_orig & ~(ADPA_DAC_ENABLE));
+        u32 orig;
 
         /*
          * On a CDV thep, CRT detect sequence need to be done twice
@@ -170,7 +153,7 @@ static bool cdv_intel_crt_detect_hotplug(struct drm_connector *connector,
          */
         tries = 2;
 
-        hotplug_en = REG_READ(PORT_HOTPLUG_EN);
+        orig = hotplug_en = REG_READ(PORT_HOTPLUG_EN);
         hotplug_en &= ~(CRT_HOTPLUG_DETECT_MASK);
         hotplug_en |= CRT_HOTPLUG_FORCE_DETECT;
 
@@ -195,8 +178,11 @@ static bool cdv_intel_crt_detect_hotplug(struct drm_connector *connector,
             CRT_HOTPLUG_MONITOR_NONE)
                 ret = true;
 
-        /* Restore the saved ADPA */
-        REG_WRITE(ADPA, adpa_orig);
+         /* clear the interrupt we just generated, if any */
+        REG_WRITE(PORT_HOTPLUG_STAT, CRT_HOTPLUG_INT_STATUS);
+
+        /* and put the bits back */
+        REG_WRITE(PORT_HOTPLUG_EN, orig);
         return ret;
 }