Commit 71138b7f authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

gma500: enable Medfield CRTC support

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 060351f1
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
/* Hardcoded currently */ /* Hardcoded currently */
static int ksel = KSEL_CRYSTAL_19; static int ksel = KSEL_CRYSTAL_19;
extern struct drm_device *gpDrmDevice;
extern void mdfld_save_display(struct drm_device *dev); extern void mdfld_save_display(struct drm_device *dev);
extern bool gbgfxsuspended; extern bool gbgfxsuspended;
...@@ -561,10 +560,10 @@ static void mdfld_crtc_dpms(struct drm_crtc *crtc, int mode) ...@@ -561,10 +560,10 @@ static void mdfld_crtc_dpms(struct drm_crtc *crtc, int mode)
return; return;
/* Ignore if system is already in DSR and in suspended state. */ /* 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){ if(dev_priv->rpm_enabled && pipe == 1){
// dev_priv->is_mipi_on = false; // dev_priv->is_mipi_on = false;
pm_request_idle(&gpDrmDevice->pdev->dev); pm_request_idle(&dev->pdev->dev);
} }
return; return;
}else if(mode == 0) { }else if(mode == 0) {
...@@ -1386,3 +1385,31 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc, ...@@ -1386,3 +1385,31 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
return 0; 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,
};
...@@ -74,4 +74,7 @@ int mdfld_panel_dpi(struct drm_device *dev); ...@@ -74,4 +74,7 @@ int mdfld_panel_dpi(struct drm_device *dev);
int mdfld_get_panel_type(struct drm_device *dev, int pipe); int mdfld_get_panel_type(struct drm_device *dev, int pipe);
void mdfld_disable_crtc (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 #endif
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "mrst_bios.h" #include "mrst_bios.h"
#include "mdfld_output.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_param_named(panel_id, panel_id, int, 0600);
MODULE_PARM_DESC(panel_id, "Panel Identifier"); MODULE_PARM_DESC(panel_id, "Panel Identifier");
...@@ -237,7 +237,7 @@ void mrst_get_vbt_data(struct drm_psb_private *dev_priv) ...@@ -237,7 +237,7 @@ void mrst_get_vbt_data(struct drm_psb_private *dev_priv)
dev_err(dev->dev, "Unknown revision of GCT!\n"); dev_err(dev->dev, "Unknown revision of GCT!\n");
vbt->size = 0; vbt->size = 0;
} }
if (IS_MDFLD(dev_priv->dev)){ if (IS_MFLD(dev_priv->dev)){
if (panel_id == GCT_DETECT) { if (panel_id == GCT_DETECT) {
if (dev_priv->gct_data.bpi == 2) { if (dev_priv->gct_data.bpi == 2) {
dev_info(dev->dev, "[GFX] PYR Panel Detected\n"); dev_info(dev->dev, "[GFX] PYR Panel Detected\n");
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "psb_intel_display.h" #include "psb_intel_display.h"
#include "psb_powermgmt.h" #include "psb_powermgmt.h"
#include "mdfld_output.h"
struct psb_intel_clock_t { struct psb_intel_clock_t {
/* given values */ /* given values */
...@@ -1303,12 +1304,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, ...@@ -1303,12 +1304,10 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
return; return;
} }
#if 0 /* FIXME */
if (IS_MFLD(dev)) if (IS_MFLD(dev))
drm_crtc_init(dev, &psb_intel_crtc->base, drm_crtc_init(dev, &psb_intel_crtc->base,
&mfld_intel_crtc_funcs); &mdfld_intel_crtc_funcs);
else else
#endif
drm_crtc_init(dev, &psb_intel_crtc->base, drm_crtc_init(dev, &psb_intel_crtc->base,
&psb_intel_crtc_funcs); &psb_intel_crtc_funcs);
...@@ -1336,9 +1335,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, ...@@ -1336,9 +1335,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
if (IS_MRST(dev)) if (IS_MRST(dev))
drm_crtc_helper_add(&psb_intel_crtc->base, drm_crtc_helper_add(&psb_intel_crtc->base,
&mrst_helper_funcs); &mrst_helper_funcs);
/* else if (IS_MDFLD(dev)) else if (IS_MFLD(dev))
drm_crtc_helper_add(&psb_intel_crtc->base, drm_crtc_helper_add(&psb_intel_crtc->base,
&mfld_helper_funcs); */ &mdfld_helper_funcs);
else else
drm_crtc_helper_add(&psb_intel_crtc->base, drm_crtc_helper_add(&psb_intel_crtc->base,
&psb_intel_helper_funcs); &psb_intel_helper_funcs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment