gma500: enable Medfield CRTC support

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/gma500/mdfld_intel_display.c b/drivers/staging/gma500/mdfld_intel_display.c
index 26d7f8071a02a93f35bad83ecf9cb1ca4e0940df..0b619b68642fae67eb9896fd09b0d9e68a9f5a51 100644 (file)
--- a/drivers/staging/gma500/mdfld_intel_display.c
+++ b/drivers/staging/gma500/mdfld_intel_display.c
@@ -44,7 +44,6 @@
 /* Hardcoded currently */
 static int ksel = KSEL_CRYSTAL_19;
 
-extern struct drm_device *gpDrmDevice;
 extern void mdfld_save_display(struct drm_device *dev);
 extern bool gbgfxsuspended;
 
@@ -561,10 +560,10 @@ static void mdfld_crtc_dpms(struct drm_crtc *crtc, int mode)
                return;
 
         /* Ignore if system is already in DSR and in suspended state. */
-       if(gbgfxsuspended && dev_priv->dispstatus == false && mode == 3){
+       if(/*gbgfxsuspended */0 && dev_priv->dispstatus == false && mode == 3){
            if(dev_priv->rpm_enabled && pipe == 1){
        //          dev_priv->is_mipi_on = false;
-                   pm_request_idle(&gpDrmDevice->pdev->dev);
+                 pm_request_idle(&dev->pdev->dev);
            }
            return;
        }else if(mode == 0) {
@@ -1386,3 +1385,31 @@ mrst_crtc_mode_set_exit:
 
        return 0;
 }
+
+static void mdfld_crtc_prepare(struct drm_crtc *crtc)
+{
+       struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+       crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
+}
+
+static void mdfld_crtc_commit(struct drm_crtc *crtc)
+{
+       struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
+       crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
+}
+
+static bool mdfld_crtc_mode_fixup(struct drm_crtc *crtc,
+                                 struct drm_display_mode *mode,
+                                 struct drm_display_mode *adjusted_mode)
+{
+       return true;
+}
+
+const struct drm_crtc_helper_funcs mdfld_helper_funcs = {
+       .dpms = mdfld_crtc_dpms,
+       .mode_fixup = mdfld_crtc_mode_fixup,
+       .mode_set = mdfld_crtc_mode_set,
+       .mode_set_base = mdfld__intel_pipe_set_base,
+       .prepare = mdfld_crtc_prepare,
+       .commit = mdfld_crtc_commit,
+};

diff --git a/drivers/staging/gma500/mdfld_output.h b/drivers/staging/gma500/mdfld_output.h
index 53b57db2c4f4a112d9570214b1aa77a00d478556..70f2302ad25fea0b1a83b46cb2e1d3741ecb2596 100644 (file)
--- a/drivers/staging/gma500/mdfld_output.h
+++ b/drivers/staging/gma500/mdfld_output.h
@@ -74,4 +74,7 @@ int mdfld_panel_dpi(struct drm_device *dev);
 int mdfld_get_panel_type(struct drm_device *dev, int pipe);
 void mdfld_disable_crtc (struct drm_device *dev, int pipe);
 
+extern const struct drm_crtc_helper_funcs mdfld_helper_funcs;
+extern const struct drm_crtc_funcs mdfld_intel_crtc_funcs;
+
 #endif

diff --git a/drivers/staging/gma500/mrst_bios.c b/drivers/staging/gma500/mrst_bios.c
index 103777b6776a0bcdc93d0112bd3f835824f52ec6..c3707f4b85f0586664590807637d49f086b33705 100644 (file)
--- a/drivers/staging/gma500/mrst_bios.c
+++ b/drivers/staging/gma500/mrst_bios.c
@@ -30,7 +30,7 @@
 #include "mrst_bios.h"
 #include "mdfld_output.h"
 
-static int panel_id;
+static int panel_id = GCT_DETECT;
 module_param_named(panel_id, panel_id, int, 0600);
 MODULE_PARM_DESC(panel_id, "Panel Identifier");
 
@@ -237,7 +237,7 @@ void mrst_get_vbt_data(struct drm_psb_private *dev_priv)
                dev_err(dev->dev, "Unknown revision of GCT!\n");
                vbt->size = 0;
        }
-       if (IS_MDFLD(dev_priv->dev)){
+       if (IS_MFLD(dev_priv->dev)){
                if (panel_id == GCT_DETECT) {
                        if (dev_priv->gct_data.bpi == 2) {
                                dev_info(dev->dev, "[GFX] PYR Panel Detected\n");

diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c
index ac0d9da9955477deb5aeacee5af9230f46b33986..907c68e845b8c36d9c843be6640bd4229aa2da68 100644 (file)
--- a/drivers/staging/gma500/psb_intel_display.c
+++ b/drivers/staging/gma500/psb_intel_display.c
@@ -29,6 +29,7 @@
 #include "psb_intel_display.h"
 #include "psb_powermgmt.h"
 
+#include "mdfld_output.h"
 
 struct psb_intel_clock_t {
        /* given values */
@@ -1303,12 +1304,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
                return;
        }
 
-#if 0  /* FIXME */
        if (IS_MFLD(dev))
                drm_crtc_init(dev, &psb_intel_crtc->base,
-                                               &mfld_intel_crtc_funcs);
+                                               &mdfld_intel_crtc_funcs);
        else
-#endif
                drm_crtc_init(dev, &psb_intel_crtc->base,
                                                &psb_intel_crtc_funcs);
 
@@ -1336,9 +1335,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
        if (IS_MRST(dev))
                drm_crtc_helper_add(&psb_intel_crtc->base,
                                    &mrst_helper_funcs);
-/*     else if (IS_MDFLD(dev))
+       else if (IS_MFLD(dev))
                drm_crtc_helper_add(&psb_intel_crtc->base,
-                                   &mfld_helper_funcs); */
+                                   &mdfld_helper_funcs);
        else
                drm_crtc_helper_add(&psb_intel_crtc->base,
                                    &psb_intel_helper_funcs);