diff --git a/[refs] b/[refs] index 9a94ec2d7e99..31e868eceaed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a7afe3acc4bfa54b1433b7f6b5b467ec05ee15b +refs/heads/master: cc976ced8e78332b88e4f4d63e7025d97809e776 diff --git a/trunk/drivers/staging/gma500/psb_drv.c b/trunk/drivers/staging/gma500/psb_drv.c index bb6b68f55607..dfb3f3a88597 100644 --- a/trunk/drivers/staging/gma500/psb_drv.c +++ b/trunk/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);