Merge tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel into drm-next

This backmerges 4.0-rc6 due to the recent fixes in rc5/6

- DP link rate refactoring from Ville
- byt/bsw rps tuning from Chris
- kerneldoc for the shrinker code
- more dynamic ppgtt pte work (Michel, Ben, ...)
- vlv dpll code refactoring to prep fro bxt (Imre)
- refactoring the sprite colorkey code (Ville)
- rotated ggtt view support from Tvrtko
- roll out struct drm_atomic_state to prep for atomic update (Ander)

* tag 'drm-intel-next-2015-03-27-merge' of git://anongit.freedesktop.org/drm-intel: (473 commits)
  Linux 4.0-rc6
  arm64: juno: Fix misleading name of UART reference clock
  drm/i915: Update DRIVER_DATE to 20150327
  drm/i915: Skip allocating shadow batch for 0-length batches
  drm/i915: Handle error to get connector state when staging config
  drm/i915: Compare GGTT view structs instead of types
  drm/i915: fix simple_return.cocci warnings
  drm/i915: Add module param to test the load detect code
  drm/i915: Remove usage of encoder->new_crtc from clock computations
  drm/i915: Don't look at staged config crtc when changing DRRS state
  drm/i915: Convert intel_pipe_will_have_type() to using atomic state
  drm/i915: Pass an atomic state to modeset_global_resources() functions
  drm/i915: Add dynamic page trace events
  drm/i915: Finish gen6/7 dynamic page table allocation
  drm/i915: Remove unnecessary gen6_ppgtt_unmap_pages
  drm/i915: Fix i915_dma_map_single positive error code
  drm/i915: Prevent out of range pt in gen6_for_each_pde
  drm/i915: fix definition of the DRM_IOCTL_I915_GET_SPRITE_COLORKEY ioctl
  drm/i915: Rip out GET_SPRITE_COLORKEY ioctl
  watchdog: imgpdc: Fix default heartbeat
  ...

2 files changed, 22 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index d7174300f501..69af73f15310 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -649,6 +649,7 @@ static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm,
         pr_debug("     sdma queue id: %d\n", q->properties.sdma_queue_id);
         pr_debug("     sdma engine id: %d\n", q->properties.sdma_engine_id);
 
+        init_sdma_vm(dqm, q, qpd);
         retval = mqd->init_mqd(mqd, &q->mqd, &q->mqd_mem_obj,
                                 &q->gart_mqd_addr, &q->properties);
         if (retval != 0) {
@@ -656,7 +657,14 @@ static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm,
                 return retval;
         }
 
-        init_sdma_vm(dqm, q, qpd);
+        retval = mqd->load_mqd(mqd, q->mqd, 0,
+                                0, NULL);
+        if (retval != 0) {
+                deallocate_sdma_queue(dqm, q->sdma_id);
+                mqd->uninit_mqd(mqd, q->mqd, q->mqd_mem_obj);
+                return retval;
+        }
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
index e415a2a9207e..c7d298e62c96 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -44,7 +44,7 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev,
         BUG_ON(!kq || !dev);
         BUG_ON(type != KFD_QUEUE_TYPE_DIQ && type != KFD_QUEUE_TYPE_HIQ);
 
-        pr_debug("kfd: In func %s initializing queue type %d size %d\n",
+        pr_debug("amdkfd: In func %s initializing queue type %d size %d\n",
                         __func__, KFD_QUEUE_TYPE_HIQ, queue_size);
 
         nop.opcode = IT_NOP;
@@ -69,12 +69,16 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev,
 
         prop.doorbell_ptr = kfd_get_kernel_doorbell(dev, &prop.doorbell_off);
 
-        if (prop.doorbell_ptr == NULL)
+        if (prop.doorbell_ptr == NULL) {
+                pr_err("amdkfd: error init doorbell");
                 goto err_get_kernel_doorbell;
+        }
 
         retval = kfd_gtt_sa_allocate(dev, queue_size, &kq->pq);
-        if (retval != 0)
+        if (retval != 0) {
+                pr_err("amdkfd: error init pq queues size (%d)\n", queue_size);
                 goto err_pq_allocate_vidmem;
+        }
 
         kq->pq_kernel_addr = kq->pq->cpu_ptr;
         kq->pq_gpu_addr = kq->pq->gpu_addr;
@@ -165,10 +169,8 @@ err_rptr_allocate_vidmem:
 err_eop_allocate_vidmem:
         kfd_gtt_sa_free(dev, kq->pq);
 err_pq_allocate_vidmem:
-        pr_err("kfd: error init pq\n");
         kfd_release_kernel_doorbell(dev, prop.doorbell_ptr);
 err_get_kernel_doorbell:
-        pr_err("kfd: error init doorbell");
         return false;
 
 }
@@ -187,6 +189,8 @@ static void uninitialize(struct kernel_queue *kq)
         else if (kq->queue->properties.type == KFD_QUEUE_TYPE_DIQ)
                 kfd_gtt_sa_free(kq->dev, kq->fence_mem_obj);
 
+        kq->mqd->uninit_mqd(kq->mqd, kq->queue->mqd, kq->queue->mqd_mem_obj);
+
         kfd_gtt_sa_free(kq->dev, kq->rptr_mem);
         kfd_gtt_sa_free(kq->dev, kq->wptr_mem);
         kq->ops_asic_specific.uninitialize(kq);
@@ -211,7 +215,7 @@ static int acquire_packet_buffer(struct kernel_queue *kq,
         queue_address = (unsigned int *)kq->pq_kernel_addr;
         queue_size_dwords = kq->queue->properties.queue_size / sizeof(uint32_t);
 
-        pr_debug("kfd: In func %s\nrptr: %d\nwptr: %d\nqueue_address 0x%p\n",
+        pr_debug("amdkfd: In func %s\nrptr: %d\nwptr: %d\nqueue_address 0x%p\n",
                         __func__, rptr, wptr, queue_address);
 
         available_size = (rptr - 1 - wptr + queue_size_dwords) %
@@ -296,7 +300,7 @@ struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,
         }
 
         if (kq->ops.initialize(kq, dev, type, KFD_KERNEL_QUEUE_SIZE) == false) {
-                pr_err("kfd: failed to init kernel queue\n");
+                pr_err("amdkfd: failed to init kernel queue\n");
                 kfree(kq);
                 return NULL;
         }
@@ -319,7 +323,7 @@ static __attribute__((unused)) void test_kq(struct kfd_dev *dev)
 
         BUG_ON(!dev);
 
-        pr_err("kfd: starting kernel queue test\n");
+        pr_err("amdkfd: starting kernel queue test\n");
 
         kq = kernel_queue_init(dev, KFD_QUEUE_TYPE_HIQ);
         BUG_ON(!kq);
@@ -330,7 +334,7 @@ static __attribute__((unused)) void test_kq(struct kfd_dev *dev)
                 buffer[i] = kq->nop_packet;
         kq->ops.submit_packet(kq);
 
-        pr_err("kfd: ending kernel queue test\n");
+        pr_err("amdkfd: ending kernel queue test\n");
 }