cdv: continue synching up with updated reference code

In particular clean up the errata handling and correct the crtc masks. We do
this a bit differently using our device abstraction for neatness.

This doesn't address the ACPI opregion and hotplug plumbing, nor the IRQ related
changes that will need. It touches on backlight init but the full backlight
support is not in this change set.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index c2cf6bf217dd..c9fe4bdeb681 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -748,10 +748,7 @@ static void psb_setup_outputs(struct drm_device *dev)
                         clone_mask = (1 << INTEL_OUTPUT_SDVO);
                         break;
                 case INTEL_OUTPUT_LVDS:
-                        if (IS_MRST(dev))
-                                crtc_mask = (1 << 0);
-                        else
-                                crtc_mask = (1 << 1);
+                        crtc_mask = dev_priv->ops->lvds_mask;
                         clone_mask = (1 << INTEL_OUTPUT_LVDS);
                         break;
                 case INTEL_OUTPUT_MIPI:
@@ -763,10 +760,7 @@ static void psb_setup_outputs(struct drm_device *dev)
                         clone_mask = (1 << INTEL_OUTPUT_MIPI2);
                         break;
                 case INTEL_OUTPUT_HDMI:
-                        if (IS_MFLD(dev))
-                                crtc_mask = (1 << 1);
-                        else    
-                                crtc_mask = (1 << 0);
+                        crtc_mask = dev_priv->ops->hdmi_mask;
                         clone_mask = (1 << INTEL_OUTPUT_HDMI);
                         break;
                 }
@@ -802,6 +796,9 @@ void psb_modeset_init(struct drm_device *dev)
         dev->mode_config.max_height = 2048;
 
         psb_setup_outputs(dev);
+
+        if (dev_priv->ops->errata)
+                dev_priv->ops->errata(dev);
 }
 
 void psb_modeset_cleanup(struct drm_device *dev)