diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 21:21:36 -0500 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 644a9d3b66e6983c2c1f3b24c3006d49b184c871 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index c9bfd83dde64..61ae104dca8c 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -1505,7 +1505,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
| 1505 | goto put_gmch; | 1505 | goto put_gmch; |
| 1506 | } | 1506 | } |
| 1507 | 1507 | ||
| 1508 | i915_kick_out_firmware_fb(dev_priv); | 1508 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
| 1509 | i915_kick_out_firmware_fb(dev_priv); | ||
| 1509 | 1510 | ||
| 1510 | pci_set_master(dev->pdev); | 1511 | pci_set_master(dev->pdev); |
| 1511 | 1512 | ||