On Tue, Sep 28, 2021 at 10:44 AM Thomas Zimmermann wrote:
>
> Convert upcasts from struct drm_gem_object to struct gtt_range to
> to_gtt_range(). Some places used container_of() directly.
>
> Signed-off-by: Thomas Zimmermann
Acked-by: Patrik Jakobsson
> ---
> drivers/gpu/drm/gma500/gem.c | 4 ++--
> drivers/gpu/drm/gma500/gma_display.c | 7 +++
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
> index 734bcb7a80c8..ff2c1d64689e 100644
> --- a/drivers/gpu/drm/gma500/gem.c
> +++ b/drivers/gpu/drm/gma500/gem.c
> @@ -106,7 +106,7 @@ static vm_fault_t psb_gem_fault(struct vm_fault *vmf);
>
> static void psb_gem_free_object(struct drm_gem_object *obj)
> {
> - struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
> + struct gtt_range *gtt = to_gtt_range(obj);
>
> /* Remove the list map if one is present */
> drm_gem_free_mmap_offset(obj);
> @@ -256,7 +256,7 @@ static vm_fault_t psb_gem_fault(struct vm_fault *vmf)
> dev = obj->dev;
> dev_priv = to_drm_psb_private(dev);
>
> - r = container_of(obj, struct gtt_range, gem); /* Get the gtt range
> */
> + r = to_gtt_range(obj);
>
> /* Make sure we don't parallel update on a fault, nor move or remove
>something from beneath our feet */
> diff --git a/drivers/gpu/drm/gma500/gma_display.c
> b/drivers/gpu/drm/gma500/gma_display.c
> index ecf8153416ac..8285358fac01 100644
> --- a/drivers/gpu/drm/gma500/gma_display.c
> +++ b/drivers/gpu/drm/gma500/gma_display.c
> @@ -349,8 +349,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
>
> /* Unpin the old GEM object */
> if (gma_crtc->cursor_obj) {
> - gt = container_of(gma_crtc->cursor_obj,
> - struct gtt_range, gem);
> + gt = to_gtt_range(gma_crtc->cursor_obj);
> psb_gtt_unpin(gt);
> drm_gem_object_put(gma_crtc->cursor_obj);
> gma_crtc->cursor_obj = NULL;
> @@ -376,7 +375,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
> goto unref_cursor;
> }
>
> - gt = container_of(obj, struct gtt_range, gem);
> + gt = to_gtt_range(obj);
>
> /* Pin the memory into the GTT */
> ret = psb_gtt_pin(gt);
> @@ -426,7 +425,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
>
> /* unpin the old bo */
> if (gma_crtc->cursor_obj) {
> - gt = container_of(gma_crtc->cursor_obj, struct gtt_range,
> gem);
> + gt = to_gtt_range(gma_crtc->cursor_obj);
> psb_gtt_unpin(gt);
> drm_gem_object_put(gma_crtc->cursor_obj);
> }
> --
> 2.33.0
>
