diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-23 14:54:20 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-02-23 14:56:11 +0100 |
| commit | ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1 (patch) | |
| tree | 18867fdd805f1beefd3592bca76f4794bdc094b8 /drivers/gpu/drm/gma500/psb_drv.c | |
| parent | de67cba65944f26c0f147035bd62e30c5f456b96 (diff) | |
| parent | 019d96cb55ade38a4b4a52bba0304e8cd681f30a (diff) | |
| download | linux-ff5f4b0585620e5c158ecaad84d91c5bf3c5d0a1.tar.bz2 | |
Merge remote-tracking branch 'airlied/drm-next' into for-airlied
Manually resolve the conflict between the new enum drm property
helpers in drm-next and the new "force-dvi" option that the "audio" output
property gained in drm-intel-next.
While resolving this conflict, switch the new drm_prop_enum_list to
use the newly introduced enum defines instead of magic values.
Conflicts:
drivers/gpu/drm/i915/intel_modes.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/gma500/psb_drv.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index f14768f2b364..1f57aac2cf80 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -283,6 +283,8 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) dev_priv->dev = dev; dev->dev_private = (void *) dev_priv; + pci_set_master(dev->pdev); + if (!IS_PSB(dev)) { if (pci_enable_msi(dev->pdev)) dev_warn(dev->dev, "Enabling MSI failed!\n"); |