Skip to contentSkip to conversation

drm/amdgpu: Clear active for HIQ in RLC_CP_SCHEDULER

PATCH In review Shaoyun Liu 2 participants 2 messages Jul 19, 2017 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 drm/amdgpu: Clear active for HIQ in RLC_CP_SCHEDULER

Change-Id I780e276983ba5a3bf077d274c84eb168585c806a
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 11 +++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 12 ++++++++++++
 2 files changed, 23 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +11 -0
index cb41b54..5fa2f8e 100644
@@ -619,9 +619,20 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd,
 	enum hqd_dequeue_request_type type;
 	unsigned long flags, end_jiffies;
 	int retry;
+	struct vi_mqd *m;
+
+	m = get_mqd(mqd);
 
 	acquire_queue(kgd, pipe_id, queue_id);
 
+	if (m->cp_hqd_vmid == 0) {
+		uint32_t value;
+
+		value = RREG32(mmRLC_CP_SCHEDULERS);
+		value = REG_SET_FIELD(value, RLC_CP_SCHEDULERS, scheduler1, 0);
+		WREG32(mmRLC_CP_SCHEDULERS, value);
+	}
+
 	switch (reset_type) {
 	case KFD_PREEMPT_TYPE_WAVEFRONT_DRAIN:
 		type = DRAIN_PIPE;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +12 -0
index 2f36d11..d47cdff 100644
@@ -754,14 +754,26 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd,
 	struct amdgpu_device *adev = get_amdgpu_device(kgd);
 	enum hqd_dequeue_request_type type;
 	unsigned long end_jiffies;
+	struct v9_mqd *m;
 	uint32_t temp;
+
 #if 0
 	unsigned long flags;
 	int retry;
 #endif
+	m = get_mqd(mqd);
 
 	acquire_queue(kgd, pipe_id, queue_id);
 
+	if (m->cp_hqd_vmid == 0) {
+		uint32_t value;
+
+		value = RREG32(SOC15_REG_OFFSET(GC, 0, mmRLC_CP_SCHEDULERS));
+		value = REG_SET_FIELD(value, RLC_CP_SCHEDULERS, scheduler1, 0);
+		WREG32(SOC15_REG_OFFSET(GC, 0, mmRLC_CP_SCHEDULERS), value);
+	}
+
+
 	switch (reset_type) {
 	case KFD_PREEMPT_TYPE_WAVEFRONT_DRAIN:
 		type = DRAIN_PIPE;
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1500495990-30616-1-git-send-email-Shaoyun.Liu-5C7GfCeVMHo@public.gmane.org

#2 lore raw

You could use WREG32_FIELD15 to drop 3 lines into one.

Tom
________________________________________
From: amd-gfx <[email protected]> on behalf of Shaoyun Liu <[email protected]>
Sent: Wednesday, July 19, 2017 16:26
To: [email protected]
Cc: Liu, Shaoyun
Subject: [PATCH 2/2] drm/amdgpu: Clear active for HIQ in RLC_CP_SCHEDULER

Change-Id I780e276983ba5a3bf077d274c84eb168585c806a
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 11 +++++++++++
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 12 ++++++++++++
 2 files changed, 23 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c +11 -0
index cb41b54..5fa2f8e 100644
@@ -619,9 +619,20 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd,
        enum hqd_dequeue_request_type type;
        unsigned long flags, end_jiffies;
        int retry;
+       struct vi_mqd *m;
+
+       m = get_mqd(mqd);
 
        acquire_queue(kgd, pipe_id, queue_id);
 
+       if (m->cp_hqd_vmid == 0) {
+               uint32_t value;
+
+               value = RREG32(mmRLC_CP_SCHEDULERS);
+               value = REG_SET_FIELD(value, RLC_CP_SCHEDULERS, scheduler1, 0);
+               WREG32(mmRLC_CP_SCHEDULERS, value);
+       }
+
        switch (reset_type) {
        case KFD_PREEMPT_TYPE_WAVEFRONT_DRAIN:
                type = DRAIN_PIPE;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +12 -0
index 2f36d11..d47cdff 100644
@@ -754,14 +754,26 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd,
        struct amdgpu_device *adev = get_amdgpu_device(kgd);
        enum hqd_dequeue_request_type type;
        unsigned long end_jiffies;
+       struct v9_mqd *m;
        uint32_t temp;
+
 #if 0
        unsigned long flags;
        int retry;
 #endif
+       m = get_mqd(mqd);
 
        acquire_queue(kgd, pipe_id, queue_id);
 
+       if (m->cp_hqd_vmid == 0) {
+               uint32_t value;
+
+               value = RREG32(SOC15_REG_OFFSET(GC, 0, mmRLC_CP_SCHEDULERS));
+               value = REG_SET_FIELD(value, RLC_CP_SCHEDULERS, scheduler1, 0);
+               WREG32(SOC15_REG_OFFSET(GC, 0, mmRLC_CP_SCHEDULERS), value);
+       }
+
+
        switch (reset_type) {
        case KFD_PREEMPT_TYPE_WAVEFRONT_DRAIN:
                type = DRAIN_PIPE;

--
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx