[PATCH 1/3] drm/amdgpu: change function declarations and add missing header dependencies
Alex Deucher
alexdeucher at gmail.com
Mon Oct 24 16:29:39 UTC 2016
On Mon, Oct 24, 2016 at 5:35 AM, Christian König
<christian.koenig at amd.com> wrote:
> Am 22.10.2016 um 10:48 schrieb Baoyou Xie:
>>
>> We get a few warnings when building kernel with W=1:
>> drivers/gpu/drm/amd/amdgpu/atombios_crtc.c:38:6: warning: no previous
>> prototype for 'amdgpu_atombios_crtc_overscan_setup' [-Wmissing-prototypes]
>> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c:661:6: warning: no previous
>> prototype for 'dce_v8_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]
>> ....
>>
>> In fact, these functions are declared in
>> drivers/gpu/drm/amd/amdgpu/atombios_crtc.h
>> drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.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/powerplay/inc/pp_acpi.h.
>> So this patch adds missing header dependencies.
>>
>> By the way, this patch changes declaration of
>> amdgpu_gfx_parse_disable_cu()
>> to subject to its implement, and clean three function declarations
>> in pp_acpi.h up.
>>
>> Signed-off-by: Baoyou Xie <baoyou.xie at linaro.org>
>
>
> Patch #2 and #3 of this series is Reviewed-by: Christian König
> <christian.koenig at amd.com>.
>
Alternative for patch 3 just sent out.
> The powerplay part is developed by a different team inside AMD, so it would
> be nice to split that change in a different patch and CC Rex.Zhu at amd.com on
> it.
>
> This is only nice to have, so feel free to add an Acked-by: Christian König
> <christian.koenig at amd.com> on the current version of the patch as well.
Patches 1 and 2 applied. Thanks!
>
> BTW: Any objections to add Rex into MAINTAINERS for the powerplay component?
> The rather extensive TO list on this trivial patch shows that we clearly
> need to better delegate responsibilities, otherwise people will sooner or
> later start to CC half AMD on fixing a typo :)
>
None here. You can add me as a back up. Rex, any objections?
Alex
> Regards,
> Christian.
>
>
>> ---
>> 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 +
>> drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 1 +
>> drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h | 9 +++------
>> 8 files changed, 11 insertions(+), 7 deletions(-)
>>
>> 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..8c9bc75 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c
>> @@ -31,6 +31,7 @@
>> #include "atom.h"
>> #include "atom-bits.h"
>> #include "atombios_encoders.h"
>> +#include "atombios_crtc.h"
>> #include "amdgpu_atombios.h"
>> #include "amdgpu_pll.h"
>> #include "amdgpu_connectors.h"
>> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>> b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>> index 4108c68..443b35f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
>> @@ -31,6 +31,7 @@
>> #include "atombios_encoders.h"
>> #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"
>> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
>> b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
>> index f264b8f..d58638c 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
>> @@ -31,6 +31,7 @@
>> #include "atombios_encoders.h"
>> #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"
>> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
>> b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
>> index 5966166..dd5838c 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
>> @@ -31,6 +31,7 @@
>> #include "atombios_encoders.h"
>> #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"
>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
>> b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
>> index 1944d28..f5e8fda 100644
>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c
>> @@ -25,6 +25,7 @@
>> #include "linux/delay.h"
>> #include "hwmgr.h"
>> #include "amd_acpi.h"
>> +#include "pp_acpi.h"
>> bool acpi_atcs_functions_supported(void *device, uint32_t index)
>> {
>> diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h
>> b/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h
>> index 3df5de2..8fe8ba9 100644
>> --- a/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h
>> +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h
>> @@ -21,9 +21,6 @@
>> *
>> */
>> -extern bool acpi_atcs_functions_supported(void *device,
>> - uint32_t index);
>> -extern int acpi_pcie_perf_request(void *device,
>> - uint8_t perf_req,
>> - bool advertise);
>> -extern bool acpi_atcs_notify_pcie_device_ready(void *device);
>> +bool acpi_atcs_functions_supported(void *device, uint32_t index);
>> +int acpi_pcie_perf_request(void *device, uint8_t perf_req, bool
>> advertise);
>> +bool acpi_atcs_notify_pcie_device_ready(void *device);
>
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the dri-devel
mailing list