diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-02-03 11:47:26 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-02-16 12:19:52 -0500 |
commit | e8411302b44b844b4f619e8064735c70b7490ee8 (patch) | |
tree | da05620db54b729f276fdb718968b02c0e40112e | |
parent | 5187b6cd1d22a010e7701e3ed74bdf0ad175904a (diff) |
drm/amdgpu: fix warning on older gcc releases
gcc-4.8 warns about '{0}' being used an an initializer for nested structures:
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c: In function ‘gfx_v8_0_ring_emit_ce_meta_init’:
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c:7263:2: warning: missing braces around initializer [-Wmissing-braces]
} ce_payload = {0};
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c: In function ‘gfx_v8_0_ring_emit_de_meta_init’:
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c:7290:2: warning: missing braces around initializer [-Wmissing-braces]
} de_payload = {0};
Using an empty {} initializer however has the same effect and works on all versions.
Fixes: acad2b2a7b70 ("drm/amdgpu:implement CE/DE meta-init routines")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index 6ed19e3ab364..67afc901905c 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | |||
@@ -7268,7 +7268,7 @@ static void gfx_v8_0_ring_emit_ce_meta_init(struct amdgpu_ring *ring, uint64_t c | |||
7268 | static union { | 7268 | static union { |
7269 | struct amdgpu_ce_ib_state regular; | 7269 | struct amdgpu_ce_ib_state regular; |
7270 | struct amdgpu_ce_ib_state_chained_ib chained; | 7270 | struct amdgpu_ce_ib_state_chained_ib chained; |
7271 | } ce_payload = {0}; | 7271 | } ce_payload = {}; |
7272 | 7272 | ||
7273 | if (ring->adev->virt.chained_ib_support) { | 7273 | if (ring->adev->virt.chained_ib_support) { |
7274 | ce_payload_addr = csa_addr + offsetof(struct amdgpu_gfx_meta_data_chained_ib, ce_payload); | 7274 | ce_payload_addr = csa_addr + offsetof(struct amdgpu_gfx_meta_data_chained_ib, ce_payload); |
@@ -7295,7 +7295,7 @@ static void gfx_v8_0_ring_emit_de_meta_init(struct amdgpu_ring *ring, uint64_t c | |||
7295 | static union { | 7295 | static union { |
7296 | struct amdgpu_de_ib_state regular; | 7296 | struct amdgpu_de_ib_state regular; |
7297 | struct amdgpu_de_ib_state_chained_ib chained; | 7297 | struct amdgpu_de_ib_state_chained_ib chained; |
7298 | } de_payload = {0}; | 7298 | } de_payload = {}; |
7299 | 7299 | ||
7300 | gds_addr = csa_addr + 4096; | 7300 | gds_addr = csa_addr + 4096; |
7301 | if (ring->adev->virt.chained_ib_support) { | 7301 | if (ring->adev->virt.chained_ib_support) { |