History

drm/amdgpu: change function declarations and add missing header dependencies

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.

Baoyou Xie committed 10 years ago

Commit 356aee31 parent f93932b8 files · +11 −7Browse files

Unified · Split

8 files
  1. drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +1 −0
  2. drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +2 −1
  3. drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +1 −0
  4. drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +1 −0
  5. drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +1 −0
  6. drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +1 −0
  7. drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c +1 −0
  8. drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h +3 −6
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c+1−0
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 */
2525 #include <drm/drmP.h>
2626 #include "amdgpu.h"
27+#include "amdgpu_gfx.h"
2728
2829 /*
2930 * GPU scratch registers helpers function.
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h+2−1
@@ -27,6 +27,7 @@ · 26 unmodified lines
2727 int amdgpu_gfx_scratch_get(struct amdgpu_device *adev, uint32_t *reg);
2828 void amdgpu_gfx_scratch_free(struct amdgpu_device *adev, uint32_t reg);
2929
30−unsigned amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se, unsigned max_sh);
30+void amdgpu_gfx_parse_disable_cu(unsigned *mask, unsigned max_se,
31+ unsigned max_sh);
3132
3233 #endif
drivers/gpu/drm/amd/amdgpu/atombios_crtc.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "atom.h"
3232 #include "atom-bits.h"
3333 #include "atombios_encoders.h"
34+#include "atombios_crtc.h"
3435 #include "amdgpu_atombios.h"
3536 #include "amdgpu_pll.h"
3637 #include "amdgpu_connectors.h"
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "atombios_encoders.h"
3232 #include "amdgpu_pll.h"
3333 #include "amdgpu_connectors.h"
34+#include "dce_v10_0.h"
3435
3536 #include "dce/dce_10_0_d.h"
3637 #include "dce/dce_10_0_sh_mask.h"
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "atombios_encoders.h"
3232 #include "amdgpu_pll.h"
3333 #include "amdgpu_connectors.h"
34+#include "dce_v11_0.h"
3435
3536 #include "dce/dce_11_0_d.h"
3637 #include "dce/dce_11_0_sh_mask.h"
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
3131 #include "atombios_encoders.h"
3232 #include "amdgpu_pll.h"
3333 #include "amdgpu_connectors.h"
34+#include "dce_v8_0.h"
3435
3536 #include "dce/dce_8_0_d.h"
3637 #include "dce/dce_8_0_sh_mask.h"
drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c+1−0
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 #include "linux/delay.h"
2626 #include "hwmgr.h"
2727 #include "amd_acpi.h"
28+#include "pp_acpi.h"
2829
2930 bool acpi_atcs_functions_supported(void *device, uint32_t index)
3031 {
drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h+3−6
@@ -21,9 +21,6 @@ · 20 unmodified lines
2121 *
2222 */
2323
24−extern bool acpi_atcs_functions_supported(void *device,
25− uint32_t index);
26−extern int acpi_pcie_perf_request(void *device,
27− uint8_t perf_req,
28− bool advertise);
29−extern bool acpi_atcs_notify_pcie_device_ready(void *device);
24+bool acpi_atcs_functions_supported(void *device, uint32_t index);
25+int acpi_pcie_perf_request(void *device, uint8_t perf_req, bool advertise);
26+bool acpi_atcs_notify_pcie_device_ready(void *device);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t