| Message ID | 20220801135259.3039679-2-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 compiler warnings like the following triggered by > '-Wmissing-prototypes': > > CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.o > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:83:31: warning: no previous prototype for ‘amd_get_format_info’ [-Wmissing-prototypes] I see "‘" around "amd_get_format_info"; I'm not sure if my email client adds that or if there is something wrong in the commit message. With the commit message change: Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > const struct drm_format_info *amd_get_format_info(const struct drm_mode_fb_cmd2 *cmd) > > Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") > Cc: Harry Wentland <Harry.Wentland@amd.com> > Cc: Alan Liu <HaoPing.Liu@amd.com> > Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > index 5eb5d31e591de..da3b086b0d6ef 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > @@ -33,6 +33,7 @@ > #include "amdgpu.h" > #include "dal_asic_id.h" > #include "amdgpu_display.h" > +#include "amdgpu_dm_plane.h" > #include "amdgpu_dm_trace.h" > #include "gc/gc_11_0_0_offset.h" > #include "gc/gc_11_0_0_sh_mask.h"
On Tue, Aug 02, 2022 at 12:57:24PM -0400, Rodrigo Siqueira Jordao wrote: > > > On 2022-08-01 09:52, Imre Deak wrote: > > Fix compiler warnings like the following triggered by > > '-Wmissing-prototypes': > > > > CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.o > > drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:83:31: warning: no previous prototype for ‘amd_get_format_info’ [-Wmissing-prototypes] > > I see "‘" around "amd_get_format_info"; I'm not sure if my email client > adds that or if there is something wrong in the commit message. Yes, it's a copy-paste from http://gfx-ci.fi.intel.com/archive/deploy/CI_DRM_11953/build_failure.log should be 'amd_get_format_info' and can be fixed while applying the patch. > With the commit message change: > > Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Thanks for the review. Could this and patch 3/3 be merged via the amd tree? > > > const struct drm_format_info *amd_get_format_info(const struct drm_mode_fb_cmd2 *cmd) > > > > Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") > > Cc: Harry Wentland <Harry.Wentland@amd.com> > > Cc: Alan Liu <HaoPing.Liu@amd.com> > > Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > > Signed-off-by: Imre Deak <imre.deak@intel.com> > > --- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > > index 5eb5d31e591de..da3b086b0d6ef 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c > > @@ -33,6 +33,7 @@ > > #include "amdgpu.h" > > #include "dal_asic_id.h" > > #include "amdgpu_display.h" > > +#include "amdgpu_dm_plane.h" > > #include "amdgpu_dm_trace.h" > > #include "gc/gc_11_0_0_offset.h" > > #include "gc/gc_11_0_0_sh_mask.h" >
On 2022-08-03 08:41, Imre Deak wrote: > On Tue, Aug 02, 2022 at 12:57:24PM -0400, Rodrigo Siqueira Jordao wrote: >> >> >> On 2022-08-01 09:52, Imre Deak wrote: >>> Fix compiler warnings like the following triggered by >>> '-Wmissing-prototypes': >>> >>> CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.o >>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:83:31: warning: no previous prototype for ‘amd_get_format_info’ [-Wmissing-prototypes] >> >> I see "‘" around "amd_get_format_info"; I'm not sure if my email client >> adds that or if there is something wrong in the commit message. > > Yes, it's a copy-paste from > http://gfx-ci.fi.intel.com/archive/deploy/CI_DRM_11953/build_failure.log>> should be 'amd_get_format_info' and can be fixed while applying the > patch. > >> With the commit message change: >> >> Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > > Thanks for the review. Could this and patch 3/3 be merged via the amd > tree? Sure, Patch 2 and 3 applied to amd-staging-drm-next. Thanks Siqueira > >> >>> const struct drm_format_info *amd_get_format_info(const struct drm_mode_fb_cmd2 *cmd) >>> >>> Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") >>> Cc: Harry Wentland <Harry.Wentland@amd.com> >>> Cc: Alan Liu <HaoPing.Liu@amd.com> >>> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> >>> Signed-off-by: Imre Deak <imre.deak@intel.com> >>> --- >>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c >>> index 5eb5d31e591de..da3b086b0d6ef 100644 >>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c >>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c >>> @@ -33,6 +33,7 @@ >>> #include "amdgpu.h" >>> #include "dal_asic_id.h" >>> #include "amdgpu_display.h" >>> +#include "amdgpu_dm_plane.h" >>> #include "amdgpu_dm_trace.h" >>> #include "gc/gc_11_0_0_offset.h" >>> #include "gc/gc_11_0_0_sh_mask.h" >>
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index 5eb5d31e591de..da3b086b0d6ef 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -33,6 +33,7 @@ #include "amdgpu.h" #include "dal_asic_id.h" #include "amdgpu_display.h" +#include "amdgpu_dm_plane.h" #include "amdgpu_dm_trace.h" #include "gc/gc_11_0_0_offset.h" #include "gc/gc_11_0_0_sh_mask.h"
Fix compiler warnings like the following triggered by '-Wmissing-prototypes': CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.o drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_plane.c:83:31: warning: no previous prototype for ‘amd_get_format_info’ [-Wmissing-prototypes] const struct drm_format_info *amd_get_format_info(const struct drm_mode_fb_cmd2 *cmd) Fixes: 5d945cbcd4b1 ("drm/amd/display: Create a file dedicated to planes") Cc: Harry Wentland <Harry.Wentland@amd.com> Cc: Alan Liu <HaoPing.Liu@amd.com> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 + 1 file changed, 1 insertion(+)