[PATCH 3/3] drm/etnaviv: remove lastctx member from gpu struct
Christian Gmeiner
christian.gmeiner at gmail.com
Mon Dec 17 16:05:39 UTC 2018
Am Mo., 17. Dez. 2018 um 16:36 Uhr schrieb Lucas Stach <l.stach at pengutronix.de>:
>
> It only written and we don't infer any useful information from
> it anymore. Remove it.
>
> Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
> ---
> drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 2 --
> drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +-------
> drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 --
> drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 -
> 4 files changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
> index 7fea74861a87..160ce3c060a5 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
> @@ -439,6 +439,4 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,
>
> if (drm_debug & DRM_UT_DRIVER)
> etnaviv_buffer_dump(gpu, buffer, 0, 0x50);
> -
> - gpu->lastctx = cmdbuf->ctx;
> }
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> index 1bb1d09e5fb0..96efc84396bf 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> @@ -72,14 +72,8 @@ static void etnaviv_postclose(struct drm_device *dev, struct drm_file *file)
> for (i = 0; i < ETNA_MAX_PIPES; i++) {
> struct etnaviv_gpu *gpu = priv->gpu[i];
>
> - if (gpu) {
> - mutex_lock(&gpu->lock);
> - if (gpu->lastctx == ctx)
> - gpu->lastctx = NULL;
> - mutex_unlock(&gpu->lock);
> -
> + if (gpu)
> drm_sched_entity_destroy(&ctx->sched_entity[i]);
> - }
> }
>
> kfree(ctx);
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> index aefb17e39ad0..6904535475de 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> @@ -997,7 +997,6 @@ void etnaviv_gpu_recover_hang(struct etnaviv_gpu *gpu)
> spin_unlock(&gpu->event_spinlock);
>
> etnaviv_gpu_hw_init(gpu);
> - gpu->lastctx = NULL;
> gpu->exec_state = -1;
>
> mutex_unlock(&gpu->lock);
> @@ -1546,7 +1545,6 @@ static int etnaviv_gpu_hw_resume(struct etnaviv_gpu *gpu)
> etnaviv_gpu_update_clock(gpu);
> etnaviv_gpu_hw_init(gpu);
>
> - gpu->lastctx = NULL;
> gpu->exec_state = -1;
>
> mutex_unlock(&gpu->lock);
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
> index 56b6a8ee7ec0..9bcf151f706b 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
> @@ -97,7 +97,6 @@ struct etnaviv_gpu {
> struct mutex lock;
> struct etnaviv_chip_identity identity;
> enum etnaviv_sec_mode sec_mode;
> - struct etnaviv_file_private *lastctx;
> struct workqueue_struct *wq;
> struct drm_gpu_scheduler sched;
>
> --
> 2.19.1
>
--
greets
--
Christian Gmeiner, MSc
https://christian-gmeiner.info
More information about the etnaviv
mailing list