On Thu, Jan 1, 2015 at 9:52 AM, Oded Gabbay <oded.gabbay@xxxxxxx> wrote:
> From: Ben Goz <ben.goz@xxxxxxx>
>
> Signed-off-by: Ben Goz <ben.goz@xxxxxxx>
> Reviewed-by: Oded Gabbay <oded.gabbay@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +-
> drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 +-
> drivers/gpu/drm/radeon/radeon_kfd.c | 6 +++---
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> index adc3147..4c3828c 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
> @@ -184,7 +184,7 @@ static bool is_occupied(struct mqd_manager *mm, void *mqd,
> uint32_t queue_id)
> {
>
> - return kfd2kgd->hqd_is_occupies(mm->dev->kgd, queue_address,
> + return kfd2kgd->hqd_is_occupied(mm->dev->kgd, queue_address,
> pipe_id, queue_id);
>
> }
> diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> index 47b5519..96a5122 100644
> --- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> +++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h
> @@ -183,7 +183,7 @@ struct kfd2kgd_calls {
> int (*hqd_load)(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,
> uint32_t queue_id, uint32_t __user *wptr);
>
> - bool (*hqd_is_occupies)(struct kgd_dev *kgd, uint64_t queue_address,
> + bool (*hqd_is_occupied)(struct kgd_dev *kgd, uint64_t queue_address,
> uint32_t pipe_id, uint32_t queue_id);
>
> int (*hqd_destroy)(struct kgd_dev *kgd, uint32_t reset_type,
> diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c
> index d3e78b4..12c43df 100644
> --- a/drivers/gpu/drm/radeon/radeon_kfd.c
> +++ b/drivers/gpu/drm/radeon/radeon_kfd.c
> @@ -72,7 +72,7 @@ static int kgd_init_pipeline(struct kgd_dev *kgd, uint32_t pipe_id,
> static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,
> uint32_t queue_id, uint32_t __user *wptr);
>
> -static bool kgd_hqd_is_occupies(struct kgd_dev *kgd, uint64_t queue_address,
> +static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address,
> uint32_t pipe_id, uint32_t queue_id);
>
> static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,
> @@ -92,7 +92,7 @@ static const struct kfd2kgd_calls kfd2kgd = {
> .init_memory = kgd_init_memory,
> .init_pipeline = kgd_init_pipeline,
> .hqd_load = kgd_hqd_load,
> - .hqd_is_occupies = kgd_hqd_is_occupies,
> + .hqd_is_occupied = kgd_hqd_is_occupied,
> .hqd_destroy = kgd_hqd_destroy,
> .get_fw_version = get_fw_version
> };
> @@ -529,7 +529,7 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,
> return 0;
> }
>
> -static bool kgd_hqd_is_occupies(struct kgd_dev *kgd, uint64_t queue_address,
> +static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address,
> uint32_t pipe_id, uint32_t queue_id)
> {
> uint32_t act;
> --
> 1.9.1
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
