Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1490855 > unrolled thread
| Started by | Baoyou Xie <baoyou.xie@linaro.org> |
|---|---|
| First post | 2016-09-25 10:50 +0200 |
| Last post | 2016-09-26 22:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/4] drm/amdgpu: add missing header dependencies Baoyou Xie <baoyou.xie@linaro.org> - 2016-09-25 10:50 +0200
Re: [PATCH 1/4] drm/amdgpu: add missing header dependencies Alex Deucher <alexdeucher@gmail.com> - 2016-09-26 22:00 +0200
| From | Baoyou Xie <baoyou.xie@linaro.org> |
|---|---|
| Date | 2016-09-25 10:50 +0200 |
| Subject | [PATCH 1/4] drm/amdgpu: add missing header dependencies |
| Message-ID | <sldih-4kE-5@gated-at.bofh.it> |
We get a few warnings when building kernel with W=1: drivers/gpu/drm/amd/amdgpu/dce_v8_0.c:629:6: warning: no previous prototype for 'dce_v8_0_disable_dce' [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/dce_v10_0.c:730:6: warning: no previous prototype for 'dce_v10_0_disable_dce' [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/dce_v11_0.c:699:6: warning: no previous prototype for 'dce_v11_0_disable_dce' [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:40:5: warning: no previous prototype for 'amdgpu_gfx_scratch_get' [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:62:6: warning: no previous prototype for 'amdgpu_gfx_scratch_free' [-Wmissing-prototypes] drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:84:6: warning: no previous prototype for 'amdgpu_gfx_parse_disable_cu' [-Wmissing-prototypes] .... In fact, these functions are declared in drivers/gpu/drm/amd/amdgpu/atombios_crtc.h, drivers/gpu/drm/amd/amdgpu/dce_v8_0.h drivers/gpu/drm/amd/amdgpu/dce_v10_0.h drivers/gpu/drm/amd/amdgpu/dce_v11_0.h drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h, so this patch adds missing header dependencies. by the way, we amend the declaration of amdgpu_gfx_parse_disable_cu(). Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> --- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 ++- drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c index a074edd..01a42b6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c @@ -24,6 +24,7 @@ */ #include <drm/drmP.h> #include "amdgpu.h" +#include "amdgpu_gfx.h" /* * GPU scratch registers helpers function. diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h index 51321e1..abd9432 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h @@ -27,6 +27,7 @@ int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg); void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg); -unsigned amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_sh); +void amdgpu_gfx_parse_disable_cu(unsigned int *mask, unsigned int max_se, + unsigned int max_sh); #endif diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c b/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c index f7d236f..4853ae0 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c @@ -30,6 +30,7 @@ #include "amdgpu.h" #include "atom.h" #include "atom-bits.h" +#include "atombios_crtc.h" #include "atombios_encoders.h" #include "amdgpu_atombios.h" #include "amdgpu_pll.h" diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c index bc5bb4e..d3925a5 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c @@ -32,6 +32,7 @@ #include "amdgpu_pll.h" #include "amdgpu_connectors.h" +#include "dce_v10_0.h" #include "dce/dce_10_0_d.h" #include "dce/dce_10_0_sh_mask.h" #include "dce/dce_10_0_enum.h" diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c index b93eba0..1002113 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c @@ -32,6 +32,7 @@ #include "amdgpu_pll.h" #include "amdgpu_connectors.h" +#include "dce_v11_0.h" #include "dce/dce_11_0_d.h" #include "dce/dce_11_0_sh_mask.h" #include "dce/dce_11_0_enum.h" diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c index abd5213..686c50d 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c @@ -32,6 +32,7 @@ #include "amdgpu_pll.h" #include "amdgpu_connectors.h" +#include "dce_v8_0.h" #include "dce/dce_8_0_d.h" #include "dce/dce_8_0_sh_mask.h" -- 2.7.4
[toc] | [next] | [standalone]
| From | Alex Deucher <alexdeucher@gmail.com> |
|---|---|
| Date | 2016-09-26 22:00 +0200 |
| Message-ID | <slKee-80K-17@gated-at.bofh.it> |
| In reply to | #1490855 |
On Sun, Sep 25, 2016 at 4:43 AM, Baoyou Xie <baoyou.xie@linaro.org> wrote: > We get a few warnings when building kernel with W=1: > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c:629:6: warning: no previous prototype for 'dce_v8_0_disable_dce' [-Wmissing-prototypes] > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c:730:6: warning: no previous prototype for 'dce_v10_0_disable_dce' [-Wmissing-prototypes] > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c:699:6: warning: no previous prototype for 'dce_v11_0_disable_dce' [-Wmissing-prototypes] > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:40:5: warning: no previous prototype for 'amdgpu_gfx_scratch_get' [-Wmissing-prototypes] > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:62:6: warning: no previous prototype for 'amdgpu_gfx_scratch_free' [-Wmissing-prototypes] > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:84:6: warning: no previous prototype for 'amdgpu_gfx_parse_disable_cu' [-Wmissing-prototypes] > .... > > In fact, these functions are declared in > drivers/gpu/drm/amd/amdgpu/atombios_crtc.h, > drivers/gpu/drm/amd/amdgpu/dce_v8_0.h > drivers/gpu/drm/amd/amdgpu/dce_v10_0.h > drivers/gpu/drm/amd/amdgpu/dce_v11_0.h > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h, > so this patch adds missing header dependencies. > > by the way, we amend the declaration of amdgpu_gfx_parse_disable_cu(). > > Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 ++- > drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 1 + > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 + > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 + > 6 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > index a074edd..01a42b6 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c > @@ -24,6 +24,7 @@ > */ > #include <drm/drmP.h> > #include "amdgpu.h" > +#include "amdgpu_gfx.h" > > /* > * GPU scratch registers helpers function. > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h > index 51321e1..abd9432 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h > @@ -27,6 +27,7 @@ > int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg); > void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg); > > -unsigned amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_sh); > +void amdgpu_gfx_parse_disable_cu(unsigned int *mask, unsigned int max_se, > + unsigned int max_sh); Please only fix the return type rather than the parameters for consistency with the rest of the driver. Alex > > #endif > diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c b/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c > index f7d236f..4853ae0 100644 > --- a/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c > +++ b/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c > @@ -30,6 +30,7 @@ > #include "amdgpu.h" > #include "atom.h" > #include "atom-bits.h" > +#include "atombios_crtc.h" > #include "atombios_encoders.h" > #include "amdgpu_atombios.h" > #include "amdgpu_pll.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > index bc5bb4e..d3925a5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c > @@ -32,6 +32,7 @@ > #include "amdgpu_pll.h" > #include "amdgpu_connectors.h" > > +#include "dce_v10_0.h" > #include "dce/dce_10_0_d.h" > #include "dce/dce_10_0_sh_mask.h" > #include "dce/dce_10_0_enum.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > index b93eba0..1002113 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c > @@ -32,6 +32,7 @@ > #include "amdgpu_pll.h" > #include "amdgpu_connectors.h" > > +#include "dce_v11_0.h" > #include "dce/dce_11_0_d.h" > #include "dce/dce_11_0_sh_mask.h" > #include "dce/dce_11_0_enum.h" > diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > index abd5213..686c50d 100644 > --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c > @@ -32,6 +32,7 @@ > #include "amdgpu_pll.h" > #include "amdgpu_connectors.h" > > +#include "dce_v8_0.h" > #include "dce/dce_8_0_d.h" > #include "dce/dce_8_0_sh_mask.h" > > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web