On Mon, Nov 5, 2018 at 8:40 PM Kuehling, Felix <Felix.Kuehling@xxxxxxx> wrote: > > From: Yong Zhao <yong.zhao@xxxxxxx> > > This will make reading code much easier. This fixes a few spots missed in a > previous commit with the same title. > > Signed-off-by: Yong Zhao <yong.zhao@xxxxxxx> > Reviewed-by: Felix Kuehling <Felix.Kuehling@xxxxxxx> > Signed-off-by: Felix Kuehling <Felix.Kuehling@xxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 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 fb9d66e..d38efbb 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c > @@ -1547,7 +1547,7 @@ static int get_wave_state(struct device_queue_manager *dqm, > u32 *ctl_stack_used_size, > u32 *save_area_used_size) > { > - struct mqd_manager *mqd; > + struct mqd_manager *mqd_mgr; > int r; > > dqm_lock(dqm); > @@ -1558,19 +1558,19 @@ static int get_wave_state(struct device_queue_manager *dqm, > goto dqm_unlock; > } > > - mqd = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE); > - if (!mqd) { > + mqd_mgr = dqm->ops.get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE); > + if (!mqd_mgr) { > r = -ENOMEM; > goto dqm_unlock; > } > > - if (!mqd->get_wave_state) { > + if (!mqd_mgr->get_wave_state) { > r = -EINVAL; > goto dqm_unlock; > } > > - r = mqd->get_wave_state(mqd, q->mqd, ctl_stack, ctl_stack_used_size, > - save_area_used_size); > + r = mqd_mgr->get_wave_state(mqd_mgr, q->mqd, ctl_stack, > + ctl_stack_used_size, save_area_used_size); > > dqm_unlock: > dqm_unlock(dqm); > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx