drm/amdgpu: make amdgpu_display_framebuffer_init() static
Subsystems (2)
Alex Deucher
maintainerPATCH 1/3 drm/amdgpu: make amdgpu_display_framebuffer_init() static
It's not used outside of amdgpu_display.c.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 +++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ---- 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +9 -4
@@ -41,6 +41,11 @@#include <drm/drm_fourcc.h> #include <drm/drm_vblank.h> +static int amdgpu_display_framebuffer_init (struct drm_device *dev, +struct amdgpu_framebuffer *rfb, +const struct drm_mode_fb_cmd2 *mode_cmd, +struct drm_gem_object *obj); +static void amdgpu_display_flip_callback (struct dma_fence *f,struct dma_fence_cb *cb) {
@@ -1097,10 +1102,10 @@ int amdgpu_display_gem_fb_verify_and_init(return ret; } -int amdgpu_display_framebuffer_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj) +static int amdgpu_display_framebuffer_init (struct drm_device *dev, +struct amdgpu_framebuffer *rfb, +const struct drm_mode_fb_cmd2 *mode_cmd, +struct drm_gem_object *obj) {struct amdgpu_device *adev =drm_to_adev (dev);int ret, i;
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -4
@@ -600,10 +600,6 @@ int amdgpu_display_gem_fb_verify_and_init( struct drm_device *dev, struct amdgpu_framebuffer *rfb, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj); -int amdgpu_display_framebuffer_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj);int amdgpufb_remove (struct drm_device *dev,struct drm_framebuffer *fb);
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 2/3 drm/amdgpu: drop amdgpu_display_gem_fb_init()
Unused.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 25 --------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ---- 2 files changed, 29 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +0 -25
@@ -1042,31 +1042,6 @@ static int amdgpu_display_get_fb_info(const struct amdgpu_framebuffer *amdgpu_fbreturn r; } -int amdgpu_display_gem_fb_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj) -{ -int ret; - - rfb->base.obj[0 ] = obj; -drm_helper_mode_fill_fb_struct (dev, &rfb->base, mode_cmd); - - ret =amdgpu_display_framebuffer_init (dev, rfb, mode_cmd, obj); -if (ret) - goto err; - - ret =drm_framebuffer_init (dev, &rfb->base, &amdgpu_fb_funcs); -if (ret) - goto err; - -return 0 ; -err: -drm_dbg_kms (dev,"Failed to init gem fb: %d\n" , ret); - rfb->base.obj[0 ] =NULL ; -return ret; -} - int amdgpu_display_gem_fb_verify_and_init( struct drm_device *dev, struct amdgpu_framebuffer *rfb, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd,
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -4
@@ -592,10 +592,6 @@ int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev, int *hpos, ktime_t *stime, ktime_t *etime, const struct drm_display_mode *mode); -int amdgpu_display_gem_fb_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj); int amdgpu_display_gem_fb_verify_and_init( struct drm_device *dev, struct amdgpu_framebuffer *rfb, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd,
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 3/3 drm/amdgpu: make amdgpu_display_gem_fb_verify_and_init() static
In reply to Alex DeucherUnused outside of amdgpu_display.c.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 ----- 2 files changed, 5 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +5 -4
@@ -1042,10 +1042,11 @@ static int amdgpu_display_get_fb_info(const struct amdgpu_framebuffer *amdgpu_fbreturn r; } -int amdgpu_display_gem_fb_verify_and_init ( -struct drm_device *dev,struct amdgpu_framebuffer *rfb, -struct drm_file *file_priv,const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj) +static int amdgpu_display_gem_fb_verify_and_init (struct drm_device *dev, +struct amdgpu_framebuffer *rfb, +struct drm_file *file_priv, +const struct drm_mode_fb_cmd2 *mode_cmd, +struct drm_gem_object *obj) {int ret;
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -5
@@ -592,11 +592,6 @@ int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev, int *hpos, ktime_t *stime, ktime_t *etime, const struct drm_display_mode *mode); -int amdgpu_display_gem_fb_verify_and_init ( -struct drm_device *dev,struct amdgpu_framebuffer *rfb, -struct drm_file *file_priv,const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj); -int amdgpufb_remove (struct drm_device *dev,struct drm_framebuffer *fb);void amdgpu_enc_destroy (struct drm_encoder *encoder);
Signature · 1 line
2.35.1
Series is
Reviewed-by Aurabindo Pillai <[email protected]>
Quoted 54 lines · Alex Deucher
It's not used outside of
amdgpu_display.c.Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 +++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ---- 2 files changed, 9 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +9
-4@@ -41,6 +41,11 @@#include <drm/drm_fourcc.h> #include <drm/drm_vblank.h> +static int amdgpu_display_framebuffer_init (struct drm_device *dev, +struct amdgpu_framebuffer *rfb, +const struct drm_mode_fb_cmd2 *mode_cmd, +struct drm_gem_object *obj); +static void amdgpu_display_flip_callback (struct dma_fence *f,struct dma_fence_cb *cb) {@@ -1097,10 +1102,10 @@ int amdgpu_display_gem_fb_verify_and_init(return ret; } -int amdgpu_display_framebuffer_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj) +static int amdgpu_display_framebuffer_init (struct drm_device *dev, +struct amdgpu_framebuffer *rfb, +const struct drm_mode_fb_cmd2 *mode_cmd, +struct drm_gem_object *obj) {struct amdgpu_device *adev =drm_to_adev (dev);int ret, i;drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0
-4@@ -600,10 +600,6 @@ int amdgpu_display_gem_fb_verify_and_init( struct drm_device *dev, struct amdgpu_framebuffer *rfb, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj); -int amdgpu_display_framebuffer_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj);int amdgpufb_remove (struct drm_device *dev,struct drm_framebuffer *fb);
Series are: Reviewed-by: Guchun Chen <[email protected]>
Regards,
Guchun
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, March 16, 2022 1:09 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static
It's not used outside of amdgpu_display.c.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 13 +++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ---- 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +9 -4
@@ -41,6 +41,11 @@#include <drm/drm_fourcc.h> #include <drm/drm_vblank.h> +static int amdgpu_display_framebuffer_init (struct drm_device *dev, +struct amdgpu_framebuffer *rfb, +const struct drm_mode_fb_cmd2 *mode_cmd, +struct drm_gem_object *obj); +static void amdgpu_display_flip_callback (struct dma_fence *f,struct dma_fence_cb *cb) {
@@ -1097,10 +1102,10 @@ int amdgpu_display_gem_fb_verify_and_init(return ret; } -int amdgpu_display_framebuffer_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj) +static int amdgpu_display_framebuffer_init (struct drm_device *dev, +struct amdgpu_framebuffer *rfb, +const struct drm_mode_fb_cmd2 *mode_cmd, +struct drm_gem_object *obj) {struct amdgpu_device *adev =drm_to_adev (dev);int ret, i;
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +0 -4
@@ -600,10 +600,6 @@ int amdgpu_display_gem_fb_verify_and_init( struct drm_device *dev, struct amdgpu_framebuffer *rfb, struct drm_file *file_priv, const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj); -int amdgpu_display_framebuffer_init (struct drm_device *dev, -struct amdgpu_framebuffer *rfb, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj);int amdgpufb_remove (struct drm_device *dev,struct drm_framebuffer *fb);
Signature · 1 line
2.35.1