* [PATCH 2/3] drm/amdgpu: drop amdgpu_display_gem_fb_init()
2022-03-15 17:09 [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static Alex Deucher
@ 2022-03-15 17:09 ` Alex Deucher
2022-03-15 17:09 ` [PATCH 3/3] drm/amdgpu: make amdgpu_display_gem_fb_verify_and_init() static Alex Deucher
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Alex Deucher @ 2022-03-15 17:09 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Unused.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 25 ---------------------
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ----
2 files changed, 29 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index cb78ba396672..6af7a5e9b28d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -1042,31 +1042,6 @@ static int amdgpu_display_get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb
return 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,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 69ce2eeb782e..2d2f01eb2521 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -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,
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] drm/amdgpu: make amdgpu_display_gem_fb_verify_and_init() static
2022-03-15 17:09 [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static Alex Deucher
2022-03-15 17:09 ` [PATCH 2/3] drm/amdgpu: drop amdgpu_display_gem_fb_init() Alex Deucher
@ 2022-03-15 17:09 ` Alex Deucher
2022-03-15 19:27 ` [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static Aurabindo Pillai
2022-03-16 0:55 ` Chen, Guchun
3 siblings, 0 replies; 5+ messages in thread
From: Alex Deucher @ 2022-03-15 17:09 UTC (permalink / raw)
To: amd-gfx; +Cc: Alex Deucher
Unused outside of amdgpu_display.c.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
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(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 6af7a5e9b28d..d137f2c356df 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -1042,10 +1042,11 @@ static int amdgpu_display_get_fb_info(const struct amdgpu_framebuffer *amdgpu_fb
return 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;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 2d2f01eb2521..d794d4a15774 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -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);
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static
2022-03-15 17:09 [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static Alex Deucher
2022-03-15 17:09 ` [PATCH 2/3] drm/amdgpu: drop amdgpu_display_gem_fb_init() Alex Deucher
2022-03-15 17:09 ` [PATCH 3/3] drm/amdgpu: make amdgpu_display_gem_fb_verify_and_init() static Alex Deucher
@ 2022-03-15 19:27 ` Aurabindo Pillai
2022-03-16 0:55 ` Chen, Guchun
3 siblings, 0 replies; 5+ messages in thread
From: Aurabindo Pillai @ 2022-03-15 19:27 UTC (permalink / raw)
To: Alex Deucher, amd-gfx
Series is
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
On 2022-03-15 13:09, Alex Deucher wrote:
> It's not used outside of amdgpu_display.c.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> index 70be09dd2a93..cb78ba396672 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> index 28848f1348a8..69ce2eeb782e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> @@ -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);
>
^ permalink raw reply [flat|nested] 5+ messages in thread* RE: [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static
2022-03-15 17:09 [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static Alex Deucher
` (2 preceding siblings ...)
2022-03-15 19:27 ` [PATCH 1/3] drm/amdgpu: make amdgpu_display_framebuffer_init() static Aurabindo Pillai
@ 2022-03-16 0:55 ` Chen, Guchun
3 siblings, 0 replies; 5+ messages in thread
From: Chen, Guchun @ 2022-03-16 0:55 UTC (permalink / raw)
To: Deucher, Alexander, amd-gfx; +Cc: Deucher, Alexander
Series are: Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Regards,
Guchun
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Wednesday, March 16, 2022 1:09 AM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
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 <alexander.deucher@amd.com>
---
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(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 70be09dd2a93..cb78ba396672 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 28848f1348a8..69ce2eeb782e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -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);
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread