diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:33:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-27 09:33:49 +0200 |
| commit | 64282ea2d2a90437c0739ce016b80a1dec16507e (patch) | |
| tree | f1d484bb588a0739fda81db193325cf0c0d553ea /drivers/gpu/drm/i915/i915_drv.c | |
| parent | Revert "drm/i915: Add heuristic to determine better way to adjust brightness" (diff) | |
| parent | drm: linux-next: build failure after merge of the drm-misc tree (diff) | |
| download | linux-dev-64282ea2d2a90437c0739ce016b80a1dec16507e.tar.xz linux-dev-64282ea2d2a90437c0739ce016b80a1dec16507e.zip | |
Merge airlied/drm-next into drm-intel-next-queued
Resync with upstream to avoid git getting too badly confused. Also, we
have a conflict with the drm_vblank_cleanup removal, which cannot be
resolved by simply taking our side. Bake that in properly.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 5a21a6fcc90d..6b583dc2eb1f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1333,7 +1333,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) ret = i915_load_modeset_init(&dev_priv->drm); if (ret < 0) - goto out_cleanup_vblank; + goto out_cleanup_hw; i915_driver_register(dev_priv); @@ -1350,8 +1350,6 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; -out_cleanup_vblank: - drm_vblank_cleanup(&dev_priv->drm); out_cleanup_hw: i915_driver_cleanup_hw(dev_priv); out_cleanup_mmio: @@ -1385,8 +1383,6 @@ void i915_driver_unload(struct drm_device *dev) intel_gvt_cleanup(dev_priv); - drm_vblank_cleanup(dev); - intel_modeset_cleanup(dev); /* @@ -2743,7 +2739,6 @@ static struct drm_driver driver = { .open = i915_driver_open, .lastclose = i915_driver_lastclose, .postclose = i915_driver_postclose, - .set_busid = drm_pci_set_busid, .gem_close_object = i915_gem_close_object, .gem_free_object_unlocked = i915_gem_free_object, |