Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259677
b: refs/heads/master
c: cc976ce
h: refs/heads/master
i:
  259675: 0c3a4c1
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent 3a0d601 commit a14628b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6a7afe3acc4bfa54b1433b7f6b5b467ec05ee15b
refs/heads/master: cc976ced8e78332b88e4f4d63e7025d97809e776
12 changes: 12 additions & 0 deletions trunk/drivers/staging/gma500/psb_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a14628b

Please sign in to comment.