Skip to contentSkip to conversation

Revert "drm/amdkfd: Add queue to MES if it becomes active"

PATCH Superseded Philip Yang 2 participants 2 messages Jun 17, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "drm/amdkfd: Add queue to MES if it becomes active"

This reverts commit 8b9aa1fa82baf4e8b6a2daa3aa4d69b728df727e. As it breaks pqm_set_gws.

---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -4
index 67ae5b6385a2..e1797657b04c 100644
@@ -866,10 +866,8 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q,
 	 * dqm->active_queue_count to determine whether a new runlist must be
 	 * uploaded.
 	 */
-	if (q->properties.is_active) {
-		add_queue = true;
-		if (!prev_active)
-			increment_queue_count(dqm, &pdd->qpd, q);
+	if (q->properties.is_active && !prev_active) {
+		increment_queue_count(dqm, &pdd->qpd, q);
 	} else if (!q->properties.is_active && prev_active) {
 		decrement_queue_count(dqm, &pdd->qpd, q);
 	} else if (q->gws && !q->properties.is_gws) {
Signature · 1 line
2.35.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 23 lines · Philip Yang

This reverts commit 8b9aa1fa82baf4e8b6a2daa3aa4d69b728df727e. As it breaks pqm_set_gws.

---
  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +2 -4
index 67ae5b6385a2..e1797657b04c 100644
@@ -866,10 +866,8 @@ static int update_queue(struct device_queue_manager *dqm, struct queue *q,
  	 * dqm->active_queue_count to determine whether a new runlist must be
  	 * uploaded.
  	 */
-	if (q->properties.is_active) {
-		add_queue = true;
-		if (!prev_active)
-			increment_queue_count(dqm, &pdd->qpd, q);
+	if (q->properties.is_active && !prev_active) {
+		increment_queue_count(dqm, &pdd->qpd, q);
  	} else if (!q->properties.is_active && prev_active) {
  		decrement_queue_count(dqm, &pdd->qpd, q);
  	} else if (q->gws && !q->properties.is_gws) {