Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/qxl/qxl_release.c

diff --cc drivers/gpu/drm/i915/i915_dma.c
index 66c63808fa35e5834a876e59dd49735fdb6f82ac,6ce9033063206340c52b8b23d22ca68b0376dfa9..917c61faef3d3b27d92e7f61385336a3ab26e8ce
--- 1/drivers/gpu/drm/i915/i915_dma.c
--- 2/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -1495,15 -1490,6 +1490,14 @@@ int i915_driver_load(struct drm_device 
        dev_priv->dev = dev;
        dev_priv->info = info;
  
-       spin_lock_init(&dev_priv->rps.lock);
 +      spin_lock_init(&dev_priv->irq_lock);
 +      spin_lock_init(&dev_priv->gpu_error.lock);
 +      spin_lock_init(&dev_priv->gt_lock);
 +      spin_lock_init(&dev_priv->backlight.lock);
 +      mutex_init(&dev_priv->dpio_lock);
 +      mutex_init(&dev_priv->rps.hw_lock);
 +      mutex_init(&dev_priv->modeset_restore_lock);
 +
        i915_dump_device_info(dev_priv);
  
        if (i915_get_bridge_dev(dev)) {

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
index d2ee3343c9439cbcf306ce443b9fbe57e53e534a,cef35d3ab37b66b359b52ae9cb7d9f96468edf9d..8723c0413de84648d7a1ff86011a79c99fbfca68
--- 1/drivers/gpu/drm/i915/i915_drv.h
--- 2/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -1584,10 -1625,8 +1626,8 @@@ void i915_handle_error(struct drm_devic
  extern void intel_irq_init(struct drm_device *dev);
  extern void intel_hpd_init(struct drm_device *dev);
  extern void intel_gt_init(struct drm_device *dev);
 -extern void intel_gt_reset(struct drm_device *dev);
 +extern void intel_gt_sanitize(struct drm_device *dev);
  
- void i915_error_state_free(struct kref *error_ref);
- 
  void
  i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);
  

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_lvds.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_display.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_gem.c
Simple merge

diff --cc drivers/gpu/drm/qxl/qxl_object.h
Simple merge

diff --cc drivers/gpu/drm/qxl/qxl_release.c
index b61449e52cd5695c7c024548ecedfc3340b11156,1a648e1da6a6ac7f295fc6418e5ad8873b08236a..0109a9644cb29ef7a6e13ac76a90544effcefd20
--- 1/drivers/gpu/drm/qxl/qxl_release.c
--- 2/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@@ -85,13 -85,12 +85,13 @@@ qxl_release_free(struct qxl_device *qde
        if (release->surface_release_id)
                qxl_surface_id_dealloc(qdev, release->surface_release_id);
  
 -      for (i = 0 ; i < release->bo_count; ++i) {
 +      list_for_each_entry_safe(entry, tmp, &release->bos, tv.head) {
 +              struct qxl_bo *bo = to_qxl_bo(entry->tv.bo);
                QXL_INFO(qdev, "release %llx\n",
-                       entry->tv.bo->addr_space_offset
 -                      drm_vma_node_offset_addr(&release->bos[i]->tbo.vma_node)
++                      drm_vma_node_offset_addr(&entry->tv.bo->vma_node)
                                                - DRM_FILE_OFFSET);
 -              qxl_fence_remove_release(&release->bos[i]->fence, release->id);
 -              qxl_bo_unref(&release->bos[i]);
 +              qxl_fence_remove_release(&bo->fence, release->id);
 +              qxl_bo_unref(&bo);
        }
        spin_lock(&qdev->release_idr_lock);
        idr_remove(&qdev->release_idr, release->id);

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge