[Mesa-dev] [PATCH v2 3/8] panfrost: Remove use of duplicate function panfrost_screen

[Tomeu Vizoso]

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa at rosenzweig.io>
---
 src/gallium/drivers/panfrost/pan_allocate.c  | 4 ++--
 src/gallium/drivers/panfrost/pan_resource.c  | 2 +-
 src/gallium/drivers/panfrost/pan_screen.h    | 6 ------
 src/gallium/drivers/panfrost/pan_wallpaper.c | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/gallium/drivers/panfrost/pan_allocate.c b/src/gallium/drivers/panfrost/pan_allocate.c
index 3732d253978a..91ace74d0e43 100644
--- a/src/gallium/drivers/panfrost/pan_allocate.c
+++ b/src/gallium/drivers/panfrost/pan_allocate.c
@@ -41,7 +41,7 @@ panfrost_allocate_chunk(struct panfrost_context *ctx, size_t size, unsigned heap
         size = ALIGN(size, ALIGNMENT);
 
         struct pipe_context *gallium = (struct pipe_context *) ctx;
-        struct panfrost_screen *screen = panfrost_screen(gallium->screen);
+        struct panfrost_screen *screen = pan_screen(gallium->screen);
 
         struct pb_slab_entry *entry = pb_slab_alloc(&screen->slabs, size, heap_id);
         struct panfrost_memory_entry *p_entry = (struct panfrost_memory_entry *) entry;
@@ -81,7 +81,7 @@ panfrost_allocate_transient(struct panfrost_context *ctx, size_t sz)
                 if (pool->entry_index >= pool->entry_count) {
                         /* Don't overflow the pool -- allocate a new one */
                         struct pipe_context *gallium = (struct pipe_context *) ctx;
-                        struct panfrost_screen *screen = panfrost_screen(gallium->screen);
+                        struct panfrost_screen *screen = pan_screen(gallium->screen);
                         struct pb_slab_entry *entry = pb_slab_alloc(&screen->slabs, pool->entry_size, HEAP_TRANSIENT);
 
                         pool->entry_count++;
diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index f26f33db96b6..a64814902573 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -322,7 +322,7 @@ static void
 panfrost_resource_destroy(struct pipe_screen *screen,
                           struct pipe_resource *pt)
 {
-        struct panfrost_screen *pscreen = panfrost_screen(screen);
+        struct panfrost_screen *pscreen = pan_screen(screen);
         struct panfrost_resource *rsrc = (struct panfrost_resource *) pt;
 
 	if (rsrc->scanout)
diff --git a/src/gallium/drivers/panfrost/pan_screen.h b/src/gallium/drivers/panfrost/pan_screen.h
index 002c430cacbc..576dca11dc7b 100644
--- a/src/gallium/drivers/panfrost/pan_screen.h
+++ b/src/gallium/drivers/panfrost/pan_screen.h
@@ -86,10 +86,4 @@ struct panfrost_screen {
 	int last_fragment_flushed;
 };
 
-static inline struct panfrost_screen *
-panfrost_screen( struct pipe_screen *pipe )
-{
-        return (struct panfrost_screen *)pipe;
-}
-
 #endif /* PAN_SCREEN_H */
diff --git a/src/gallium/drivers/panfrost/pan_wallpaper.c b/src/gallium/drivers/panfrost/pan_wallpaper.c
index 735524a49c9c..48418012fe84 100644
--- a/src/gallium/drivers/panfrost/pan_wallpaper.c
+++ b/src/gallium/drivers/panfrost/pan_wallpaper.c
@@ -181,7 +181,7 @@ panfrost_draw_wallpaper(struct pipe_context *pipe)
                 .normalized_coords = 1
         };
 
-        struct pipe_resource *rsrc = panfrost_screen(pipe->screen)->display_target;
+        struct pipe_resource *rsrc = pan_screen(pipe->screen)->display_target;
         struct pipe_sampler_state *sampler_state = pipe->create_sampler_state(pipe, &state);
         struct pipe_sampler_view *sampler_view = pipe->create_sampler_view(pipe, rsrc, &tmpl);
 
-- 
2.20.1