libdrm: amdgpu: Initialize unions with memset rather than "= {0}"
Clang complains when initializing unions using "= {0}" so instead use memset. Cc: Sean Paul <seanpaul@chromium.org> Cc: Alistair Strachan <astrachan@google.com> Cc: Marissa Wall <marissaw@google.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: John Stultz <john.stultz@linaro.org>main
parent
ebbb8f9cbf
commit
51553dd0e0
|
@ -733,12 +733,13 @@ drm_public int amdgpu_cs_submit_raw(amdgpu_device_handle dev,
|
||||||
struct drm_amdgpu_cs_chunk *chunks,
|
struct drm_amdgpu_cs_chunk *chunks,
|
||||||
uint64_t *seq_no)
|
uint64_t *seq_no)
|
||||||
{
|
{
|
||||||
union drm_amdgpu_cs cs = {0};
|
union drm_amdgpu_cs cs;
|
||||||
uint64_t *chunk_array;
|
uint64_t *chunk_array;
|
||||||
int i, r;
|
int i, r;
|
||||||
if (num_chunks == 0)
|
if (num_chunks == 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
memset(&cs, 0, sizeof(cs));
|
||||||
chunk_array = alloca(sizeof(uint64_t) * num_chunks);
|
chunk_array = alloca(sizeof(uint64_t) * num_chunks);
|
||||||
for (i = 0; i < num_chunks; i++)
|
for (i = 0; i < num_chunks; i++)
|
||||||
chunk_array[i] = (uint64_t)(uintptr_t)&chunks[i];
|
chunk_array[i] = (uint64_t)(uintptr_t)&chunks[i];
|
||||||
|
@ -763,10 +764,11 @@ drm_public int amdgpu_cs_submit_raw2(amdgpu_device_handle dev,
|
||||||
struct drm_amdgpu_cs_chunk *chunks,
|
struct drm_amdgpu_cs_chunk *chunks,
|
||||||
uint64_t *seq_no)
|
uint64_t *seq_no)
|
||||||
{
|
{
|
||||||
union drm_amdgpu_cs cs = {0};
|
union drm_amdgpu_cs cs;
|
||||||
uint64_t *chunk_array;
|
uint64_t *chunk_array;
|
||||||
int i, r;
|
int i, r;
|
||||||
|
|
||||||
|
memset(&cs, 0, sizeof(cs));
|
||||||
chunk_array = alloca(sizeof(uint64_t) * num_chunks);
|
chunk_array = alloca(sizeof(uint64_t) * num_chunks);
|
||||||
for (i = 0; i < num_chunks; i++)
|
for (i = 0; i < num_chunks; i++)
|
||||||
chunk_array[i] = (uint64_t)(uintptr_t)&chunks[i];
|
chunk_array[i] = (uint64_t)(uintptr_t)&chunks[i];
|
||||||
|
@ -803,9 +805,10 @@ drm_public int amdgpu_cs_fence_to_handle(amdgpu_device_handle dev,
|
||||||
uint32_t what,
|
uint32_t what,
|
||||||
uint32_t *out_handle)
|
uint32_t *out_handle)
|
||||||
{
|
{
|
||||||
union drm_amdgpu_fence_to_handle fth = {0};
|
union drm_amdgpu_fence_to_handle fth;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
|
memset(&fth, 0, sizeof(fth));
|
||||||
fth.in.fence.ctx_id = fence->context->id;
|
fth.in.fence.ctx_id = fence->context->id;
|
||||||
fth.in.fence.ip_type = fence->ip_type;
|
fth.in.fence.ip_type = fence->ip_type;
|
||||||
fth.in.fence.ip_instance = fence->ip_instance;
|
fth.in.fence.ip_instance = fence->ip_instance;
|
||||||
|
|
Loading…
Reference in New Issue