On Mon, Feb 23, 2026 at 3:39 PM Andrew Martin <[email protected]> wrote: > > Missed deleting the commented line in the original patch. > > Fixes:3e95063383f5 ("drm/amdkfd: Disable MQD queue priority")
This should be rebased on top of a tree which contains the original patch. I.e., the patch should look like: - /* m->cp_hqd_queue_priority = q->priority; */ With that fixed, Reviewed-by: Alex Deucher <[email protected]> > Signed-off-by: Andrew Martin <[email protected]> > --- > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 1 - > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 1 - > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 1 - > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 1 - > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 1 - > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 1 - > drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 1 - > 7 files changed, 7 deletions(-) > > 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 90ac3a30e81d..14123c5d4925 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c > @@ -70,7 +70,6 @@ static void update_cu_mask(struct mqd_manager *mm, void > *mqd, > static void set_priority(struct cik_mqd *m, struct queue_properties *q) > { > m->cp_hqd_pipe_priority = pipe_priority_map[q->priority]; > - m->cp_hqd_queue_priority = q->priority; > } > > static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm, > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c > b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c > index 97055f808d4a..0f7688a1f8b1 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c > @@ -70,7 +70,6 @@ static void update_cu_mask(struct mqd_manager *mm, void > *mqd, > static void set_priority(struct v10_compute_mqd *m, struct queue_properties > *q) > { > m->cp_hqd_pipe_priority = pipe_priority_map[q->priority]; > - m->cp_hqd_queue_priority = q->priority; > } > > static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm, > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c > b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c > index 7e5a7ab6d0c0..d8f565cb2180 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c > @@ -96,7 +96,6 @@ static void update_cu_mask(struct mqd_manager *mm, void > *mqd, > static void set_priority(struct v11_compute_mqd *m, struct queue_properties > *q) > { > m->cp_hqd_pipe_priority = pipe_priority_map[q->priority]; > - m->cp_hqd_queue_priority = q->priority; > } > > static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm, > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c > b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c > index a51f217329db..db615b42b25c 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c > @@ -77,7 +77,6 @@ static void update_cu_mask(struct mqd_manager *mm, void > *mqd, > static void set_priority(struct v12_compute_mqd *m, struct queue_properties > *q) > { > m->cp_hqd_pipe_priority = pipe_priority_map[q->priority]; > - m->cp_hqd_queue_priority = q->priority; > } > > static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm, > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c > b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c > index d0776ba2cc99..6e591103c3b6 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c > @@ -131,7 +131,6 @@ static void update_cu_mask(struct mqd_manager *mm, void > *mqd, > static void set_priority(struct v12_1_compute_mqd *m, struct > queue_properties *q) > { > m->cp_hqd_pipe_priority = pipe_priority_map[q->priority]; > - m->cp_hqd_queue_priority = q->priority; > } > > static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm, > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c > b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c > index dcf4bbfa641b..ad0dcaed3d35 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c > @@ -106,7 +106,6 @@ static void update_cu_mask(struct mqd_manager *mm, void > *mqd, > static void set_priority(struct v9_mqd *m, struct queue_properties *q) > { > m->cp_hqd_pipe_priority = pipe_priority_map[q->priority]; > - m->cp_hqd_queue_priority = q->priority; > } > > static bool mqd_on_vram(struct amdgpu_device *adev) > 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 09483f0862d4..c192c66a5c7b 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c > @@ -73,7 +73,6 @@ static void update_cu_mask(struct mqd_manager *mm, void > *mqd, > static void set_priority(struct vi_mqd *m, struct queue_properties *q) > { > m->cp_hqd_pipe_priority = pipe_priority_map[q->priority]; > - m->cp_hqd_queue_priority = q->priority; > } > > static struct kfd_mem_obj *allocate_mqd(struct mqd_manager *mm, > -- > 2.43.0 >
