From cc976ced8e78332b88e4f4d63e7025d97809e776 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 5 Jul 2011 15:38:53 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gma500/psb_drv.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 #include "psb_powermgmt.h" #include @@ -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);