Message ID | 20201116173700.1830487-26-lee.jones@linaro.org |
---|---|
State | Accepted |
Commit | 6faf027f51472d72b6e47654f9333486709cd667 |
Headers | show |
Series | Rid W=1 warnings from GPU | expand |
On Mon, Nov 16, 2020 at 12:37 PM Lee Jones <lee.jones@linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/ni.c:1733:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes] > 1733 | u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: amd-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/ni.h | 1 + > drivers/gpu/drm/radeon/ni_dma.c | 3 +-- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h > index d63be1c88c0f1..9a5f31a05e68f 100644 > --- a/drivers/gpu/drm/radeon/ni.h > +++ b/drivers/gpu/drm/radeon/ni.h > @@ -34,5 +34,6 @@ void cayman_cp_int_cntl_setup(struct radeon_device *rdev, > int ring, u32 cp_int_cntl); > void cayman_vm_decode_fault(struct radeon_device *rdev, > u32 status, u32 addr); > +u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); > > #endif /* __NI_H__ */ > diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c > index c56136848360e..bd515ad4fe4cc 100644 > --- a/drivers/gpu/drm/radeon/ni_dma.c > +++ b/drivers/gpu/drm/radeon/ni_dma.c > @@ -25,10 +25,9 @@ > #include "radeon.h" > #include "radeon_asic.h" > #include "radeon_trace.h" > +#include "ni.h" > #include "nid.h" > > -u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); > - > /* > * DMA > * Starting with R600, the GPU has an asynchronous > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/ni.h b/drivers/gpu/drm/radeon/ni.h index d63be1c88c0f1..9a5f31a05e68f 100644 --- a/drivers/gpu/drm/radeon/ni.h +++ b/drivers/gpu/drm/radeon/ni.h @@ -34,5 +34,6 @@ void cayman_cp_int_cntl_setup(struct radeon_device *rdev, int ring, u32 cp_int_cntl); void cayman_vm_decode_fault(struct radeon_device *rdev, u32 status, u32 addr); +u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); #endif /* __NI_H__ */ diff --git a/drivers/gpu/drm/radeon/ni_dma.c b/drivers/gpu/drm/radeon/ni_dma.c index c56136848360e..bd515ad4fe4cc 100644 --- a/drivers/gpu/drm/radeon/ni_dma.c +++ b/drivers/gpu/drm/radeon/ni_dma.c @@ -25,10 +25,9 @@ #include "radeon.h" #include "radeon_asic.h" #include "radeon_trace.h" +#include "ni.h" #include "nid.h" -u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev); - /* * DMA * Starting with R600, the GPU has an asynchronous
Fixes the following W=1 kernel build warning(s): drivers/gpu/drm/radeon/ni.c:1733:5: warning: no previous prototype for ‘cayman_gpu_check_soft_reset’ [-Wmissing-prototypes] 1733 | u32 cayman_gpu_check_soft_reset(struct radeon_device *rdev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/gpu/drm/radeon/ni.h | 1 + drivers/gpu/drm/radeon/ni_dma.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-)