All of lore.kernel.org
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: Alan Liu <HaoPing.Liu@amd.com>,
	Harry Wentland <Harry.Wentland@amd.com>,
	intel-gfx@lists.freedesktop.org,
	Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Subject: [Intel-gfx] [PATCH 3/3] drm/amd/display: Fix static declaration follows non-static declaration compiler warn
Date: Mon,  1 Aug 2022 16:52:59 +0300	[thread overview]
Message-ID: <20220801135259.3039679-3-imre.deak@intel.com> (raw)
In-Reply-To: <20220801135259.3039679-1-imre.deak@intel.com>

Fix the

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:951:13: error: static declaration of ‘get_min_max_dc_plane_scaling’ follows non-static declaration
  951 | static void get_min_max_dc_plane_scaling(struct drm_device *dev,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:36:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.h:39:6: note: previous declaration of ‘get_min_max_dc_plane_scaling’ with type ‘void(struct drm_device *, struct drm_framebuffer *, int *, int *)’
   39 | void get_min_max_dc_plane_scaling(struct drm_device *dev,

complier warning.

Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes")
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Harry Wentland <Harry.Wentland@amd.com>
Cc: Alan Liu <HaoPing.Liu@amd.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
index 95168c2cfa6fa..eeeec391f4b53 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
@@ -36,10 +36,6 @@ int fill_dc_scaling_info(struct amdgpu_device *adev,
 			 const struct drm_plane_state *state,
 			 struct dc_scaling_info *scaling_info);
 
-void get_min_max_dc_plane_scaling(struct drm_device *dev,
-				  struct drm_framebuffer *fb,
-				  int *min_downscale, int *max_upscale);
-
 int dm_plane_helper_check_state(struct drm_plane_state *state,
 				struct drm_crtc_state *new_crtc_state);
 
-- 
2.37.1


WARNING: multiple messages have this Message-ID (diff)
From: Imre Deak <imre.deak@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: Alan Liu <HaoPing.Liu@amd.com>,
	intel-gfx@lists.freedesktop.org,
	Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Subject: [PATCH 3/3] drm/amd/display: Fix static declaration follows non-static declaration compiler warn
Date: Mon,  1 Aug 2022 16:52:59 +0300	[thread overview]
Message-ID: <20220801135259.3039679-3-imre.deak@intel.com> (raw)
In-Reply-To: <20220801135259.3039679-1-imre.deak@intel.com>

Fix the

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:951:13: error: static declaration of ‘get_min_max_dc_plane_scaling’ follows non-static declaration
  951 | static void get_min_max_dc_plane_scaling(struct drm_device *dev,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:36:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.h:39:6: note: previous declaration of ‘get_min_max_dc_plane_scaling’ with type ‘void(struct drm_device *, struct drm_framebuffer *, int *, int *)’
   39 | void get_min_max_dc_plane_scaling(struct drm_device *dev,

complier warning.

Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes")
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Harry Wentland <Harry.Wentland@amd.com>
Cc: Alan Liu <HaoPing.Liu@amd.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
index 95168c2cfa6fa..eeeec391f4b53 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h
@@ -36,10 +36,6 @@ int fill_dc_scaling_info(struct amdgpu_device *adev,
 			 const struct drm_plane_state *state,
 			 struct dc_scaling_info *scaling_info);
 
-void get_min_max_dc_plane_scaling(struct drm_device *dev,
-				  struct drm_framebuffer *fb,
-				  int *min_downscale, int *max_upscale);
-
 int dm_plane_helper_check_state(struct drm_plane_state *state,
 				struct drm_crtc_state *new_crtc_state);
 
-- 
2.37.1


  parent reply	other threads:[~2022-08-01 14:01 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-01 13:52 [PATCH 1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c Imre Deak
2022-08-01 13:52 ` [Intel-gfx] " Imre Deak
2022-08-01 13:52 ` [PATCH 2/3] drm/amd/display: Fix 'no previous prototype' compiler warns " Imre Deak
2022-08-01 13:52   ` [Intel-gfx] " Imre Deak
2022-08-02 16:57   ` Rodrigo Siqueira Jordao
2022-08-02 16:57     ` [Intel-gfx] " Rodrigo Siqueira Jordao
2022-08-03 12:41     ` Imre Deak
2022-08-03 12:41       ` [Intel-gfx] " Imre Deak
2022-08-03 14:24       ` Rodrigo Siqueira Jordao
2022-08-03 14:24         ` [Intel-gfx] " Rodrigo Siqueira Jordao
2022-08-01 13:52 ` Imre Deak [this message]
2022-08-01 13:52   ` [PATCH 3/3] drm/amd/display: Fix static declaration follows non-static declaration compiler warn Imre Deak
2022-08-02 16:58   ` Rodrigo Siqueira Jordao
2022-08-02 16:58     ` [Intel-gfx] " Rodrigo Siqueira Jordao
2022-08-01 13:57 ` [PATCH 1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c Simon Ser
2022-08-01 13:57   ` [Intel-gfx] " Simon Ser
2022-08-10 16:45   ` Alex Deucher
2022-08-10 16:45     ` Alex Deucher
2022-08-10 16:45     ` [Intel-gfx] " Alex Deucher
2022-08-01 20:29 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] " Patchwork
2022-08-01 20:29 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-08-01 20:53 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-08-02  6:47 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220801135259.3039679-3-imre.deak@intel.com \
    --to=imre.deak@intel.com \
    --cc=HaoPing.Liu@amd.com \
    --cc=Harry.Wentland@amd.com \
    --cc=Rodrigo.Siqueira@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.