openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alan Cox 2011-07-05 15:38:53 +01:00 committed by Greg Kroah-Hartman
parent 6a7afe3acc
commit cc976ced8e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/gma500/psb_drv.c
View File

@ -28,6 +28,7 @@
#include "psb_intel_reg.h" #include "psb_intel_reg.h"
#include "psb_intel_bios.h" #include "psb_intel_bios.h"
#include "mrst_bios.h" #include "mrst_bios.h"
#include "mdfld_dsi_dbi.h"
#include <drm/drm_pciids.h> #include <drm/drm_pciids.h>
#include "psb_powermgmt.h" #include "psb_powermgmt.h"
#include <linux/cpu.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; 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) { if (drm_psb_no_fb == 0) {
psb_modeset_init(dev); psb_modeset_init(dev);
psb_fbdev_init(dev); psb_fbdev_init(dev);