diff options
| author | Alan Cox | 2011-07-05 16:38:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-05 17:20:41 +0200 |
| commit | cc976ced8e78332b88e4f4d63e7025d97809e776 (patch) | |
| tree | b8522c0a436c6efb1ddd1692b0cac08d10e634f0 /drivers/staging/gma500 | |
| parent | gma500: continue abstracting platform specific code (diff) | |
| download | kernel-qcow2-linux-cc976ced8e78332b88e4f4d63e7025d97809e776.tar.gz kernel-qcow2-linux-cc976ced8e78332b88e4f4d63e7025d97809e776.tar.xz kernel-qcow2-linux-cc976ced8e78332b88e4f4d63e7025d97809e776.zip | |
gma500: Fix early Medfield crash
We need to initialise the DBI interface and the code for it got missed in
the original merge as it's in a daft place. This will need moving but lets
get it added first.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500')
| -rw-r--r-- | drivers/staging/gma500/psb_drv.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index bb6b68f55607..dfb3f3a88597 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -28,6 +28,7 @@ #include "psb_intel_reg.h" #include "psb_intel_bios.h" #include "mrst_bios.h" +#include "mdfld_dsi_dbi.h" #include <drm/drm_pciids.h> #include "psb_powermgmt.h" #include <linux/cpu.h> @@ -442,6 +443,17 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) dev->driver->get_vblank_counter = psb_get_vblank_counter; + /* FIXME: this is not the right place for this stuff ! */ + if (IS_MFLD(dev)) { +#ifdef CONFIG_MDFLD_DSI_DPU + /*init dpu info*/ + mdfld_dbi_dpu_init(dev); +#else + mdfld_dbi_dsr_init(dev); +#endif /*CONFIG_MDFLD_DSI_DPU*/ + /* INIT_WORK(&dev_priv->te_work, mdfld_te_handler_work);*/ + } + if (drm_psb_no_fb == 0) { psb_modeset_init(dev); psb_fbdev_init(dev); |