drm/amdkfd: Disable CP/SDMA ring/doorbell in MQD

The MQD represents an inactive context and should not have ring or
doorbell enable bits set. Doing so interferes with HWS which streams
the MQD onto the HQD. If enable bits are set this activates the ring
or doorbell before the HQD is fully configured.

Signed-off-by: Jay Cornwall <Jay.Cornwall@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
index 44ffd23348fc4481932a851ea6e1d6a38a9b2989..4859d263fa2a3ce51a816b2f3b36b98f298cf9f7 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
@@ -189,12 +189,9 @@ static int update_mqd(struct mqd_manager *mm, void *mqd,
        if (q->format == KFD_QUEUE_FORMAT_AQL)
                m->cp_hqd_pq_control |= NO_UPDATE_RPTR;
 
-       q->is_active = false;
-       if (q->queue_size > 0 &&
+       q->is_active = (q->queue_size > 0 &&
                        q->queue_address != 0 &&
-                       q->queue_percent > 0) {
-               q->is_active = true;
-       }
+                       q->queue_percent > 0);
 
        return 0;
 }
@@ -215,24 +212,17 @@ static int update_mqd_sdma(struct mqd_manager *mm, void *mqd,
        m->sdma_rlc_rb_base_hi = upper_32_bits(q->queue_address >> 8);
        m->sdma_rlc_rb_rptr_addr_lo = lower_32_bits((uint64_t)q->read_ptr);
        m->sdma_rlc_rb_rptr_addr_hi = upper_32_bits((uint64_t)q->read_ptr);
-       m->sdma_rlc_doorbell = q->doorbell_off <<
-                       SDMA0_RLC0_DOORBELL__OFFSET__SHIFT |
-                       1 << SDMA0_RLC0_DOORBELL__ENABLE__SHIFT;
+       m->sdma_rlc_doorbell =
+               q->doorbell_off << SDMA0_RLC0_DOORBELL__OFFSET__SHIFT;
 
        m->sdma_rlc_virtual_addr = q->sdma_vm_addr;
 
        m->sdma_engine_id = q->sdma_engine_id;
        m->sdma_queue_id = q->sdma_queue_id;
 
-       q->is_active = false;
-       if (q->queue_size > 0 &&
+       q->is_active = (q->queue_size > 0 &&
                        q->queue_address != 0 &&
-                       q->queue_percent > 0) {
-               m->sdma_rlc_rb_cntl |=
-                               1 << SDMA0_RLC0_RB_CNTL__RB_ENABLE__SHIFT;
-
-               q->is_active = true;
-       }
+                       q->queue_percent > 0);
 
        return 0;
 }
@@ -359,19 +349,13 @@ static int update_mqd_hiq(struct mqd_manager *mm, void *mqd,
        m->cp_hqd_pq_base_hi = upper_32_bits((uint64_t)q->queue_address >> 8);
        m->cp_hqd_pq_rptr_report_addr_lo = lower_32_bits((uint64_t)q->read_ptr);
        m->cp_hqd_pq_rptr_report_addr_hi = upper_32_bits((uint64_t)q->read_ptr);
-       m->cp_hqd_pq_doorbell_control = DOORBELL_EN |
-                                       DOORBELL_OFFSET(q->doorbell_off);
+       m->cp_hqd_pq_doorbell_control = DOORBELL_OFFSET(q->doorbell_off);
 
        m->cp_hqd_vmid = q->vmid;
 
-       m->cp_hqd_active = 0;
-       q->is_active = false;
-       if (q->queue_size > 0 &&
+       q->is_active = (q->queue_size > 0 &&
                        q->queue_address != 0 &&
-                       q->queue_percent > 0) {
-               m->cp_hqd_active = 1;
-               q->is_active = true;
-       }
+                       q->queue_percent > 0);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
index 73cbfe186dd22ec38e9469e804ef69527cf55eab..4ea854f9007b7a1f26045b8d57e0b5a306bd6619 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
@@ -163,12 +163,9 @@ static int __update_mqd(struct mqd_manager *mm, void *mqd,
                                2 << CP_HQD_PQ_CONTROL__SLOT_BASED_WPTR__SHIFT;
        }
 
-       q->is_active = false;
-       if (q->queue_size > 0 &&
+       q->is_active = (q->queue_size > 0 &&
                        q->queue_address != 0 &&
-                       q->queue_percent > 0) {
-               q->is_active = true;
-       }
+                       q->queue_percent > 0);
 
        return 0;
 }