| Message ID | 20220801135259.3039679-3-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/amd/display: Fix merge conflict resolution in amdgpu_dm_plane.c | expand |
On 2022-08-01 09:52, Imre Deak wrote: > 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); > Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
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);
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(-)