aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2018-07-18 07:58:16 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-07-25 16:05:08 -0400
commitf8a91d45553ab581964f40b1e46bdf3d0974d339 (patch)
tree121d65389266629417a96605b02aa4c441dc4d65 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
parentbb805f2b20e2200753bf0a69b3ef5332b37eb781 (diff)
drm/amdgpu: clean up coding style a bit
No need to bitcast a boolean and even if we should use "!!" instead. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 207f238649b4..053d31017c26 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -328,35 +328,35 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
328 case AMDGPU_HW_IP_GFX: 328 case AMDGPU_HW_IP_GFX:
329 type = AMD_IP_BLOCK_TYPE_GFX; 329 type = AMD_IP_BLOCK_TYPE_GFX;
330 for (i = 0; i < adev->gfx.num_gfx_rings; i++) 330 for (i = 0; i < adev->gfx.num_gfx_rings; i++)
331 ring_mask |= ((adev->gfx.gfx_ring[i].ready ? 1 : 0) << i); 331 ring_mask |= adev->gfx.gfx_ring[i].ready << i;
332 ib_start_alignment = 32; 332 ib_start_alignment = 32;
333 ib_size_alignment = 32; 333 ib_size_alignment = 32;
334 break; 334 break;
335 case AMDGPU_HW_IP_COMPUTE: 335 case AMDGPU_HW_IP_COMPUTE:
336 type = AMD_IP_BLOCK_TYPE_GFX; 336 type = AMD_IP_BLOCK_TYPE_GFX;
337 for (i = 0; i < adev->gfx.num_compute_rings; i++) 337 for (i = 0; i < adev->gfx.num_compute_rings; i++)
338 ring_mask |= ((adev->gfx.compute_ring[i].ready ? 1 : 0) << i); 338 ring_mask |= adev->gfx.compute_ring[i].ready << i;
339 ib_start_alignment = 32; 339 ib_start_alignment = 32;
340 ib_size_alignment = 32; 340 ib_size_alignment = 32;
341 break; 341 break;
342 case AMDGPU_HW_IP_DMA: 342 case AMDGPU_HW_IP_DMA:
343 type = AMD_IP_BLOCK_TYPE_SDMA; 343 type = AMD_IP_BLOCK_TYPE_SDMA;
344 for (i = 0; i < adev->sdma.num_instances; i++) 344 for (i = 0; i < adev->sdma.num_instances; i++)
345 ring_mask |= ((adev->sdma.instance[i].ring.ready ? 1 : 0) << i); 345 ring_mask |= adev->sdma.instance[i].ring.ready << i;
346 ib_start_alignment = 256; 346 ib_start_alignment = 256;
347 ib_size_alignment = 4; 347 ib_size_alignment = 4;
348 break; 348 break;
349 case AMDGPU_HW_IP_UVD: 349 case AMDGPU_HW_IP_UVD:
350 type = AMD_IP_BLOCK_TYPE_UVD; 350 type = AMD_IP_BLOCK_TYPE_UVD;
351 for (i = 0; i < adev->uvd.num_uvd_inst; i++) 351 for (i = 0; i < adev->uvd.num_uvd_inst; i++)
352 ring_mask |= ((adev->uvd.inst[i].ring.ready ? 1 : 0) << i); 352 ring_mask |= adev->uvd.inst[i].ring.ready << i;
353 ib_start_alignment = 64; 353 ib_start_alignment = 64;
354 ib_size_alignment = 64; 354 ib_size_alignment = 64;
355 break; 355 break;
356 case AMDGPU_HW_IP_VCE: 356 case AMDGPU_HW_IP_VCE:
357 type = AMD_IP_BLOCK_TYPE_VCE; 357 type = AMD_IP_BLOCK_TYPE_VCE;
358 for (i = 0; i < adev->vce.num_rings; i++) 358 for (i = 0; i < adev->vce.num_rings; i++)
359 ring_mask |= ((adev->vce.ring[i].ready ? 1 : 0) << i); 359 ring_mask |= adev->vce.ring[i].ready << i;
360 ib_start_alignment = 4; 360 ib_start_alignment = 4;
361 ib_size_alignment = 1; 361 ib_size_alignment = 1;
362 break; 362 break;
@@ -365,27 +365,27 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
365 for (i = 0; i < adev->uvd.num_uvd_inst; i++) 365 for (i = 0; i < adev->uvd.num_uvd_inst; i++)
366 for (j = 0; j < adev->uvd.num_enc_rings; j++) 366 for (j = 0; j < adev->uvd.num_enc_rings; j++)
367 ring_mask |= 367 ring_mask |=
368 ((adev->uvd.inst[i].ring_enc[j].ready ? 1 : 0) << 368 adev->uvd.inst[i].ring_enc[j].ready <<
369 (j + i * adev->uvd.num_enc_rings)); 369 (j + i * adev->uvd.num_enc_rings);
370 ib_start_alignment = 64; 370 ib_start_alignment = 64;
371 ib_size_alignment = 64; 371 ib_size_alignment = 64;
372 break; 372 break;
373 case AMDGPU_HW_IP_VCN_DEC: 373 case AMDGPU_HW_IP_VCN_DEC:
374 type = AMD_IP_BLOCK_TYPE_VCN; 374 type = AMD_IP_BLOCK_TYPE_VCN;
375 ring_mask = adev->vcn.ring_dec.ready ? 1 : 0; 375 ring_mask = adev->vcn.ring_dec.ready;
376 ib_start_alignment = 16; 376 ib_start_alignment = 16;
377 ib_size_alignment = 16; 377 ib_size_alignment = 16;
378 break; 378 break;
379 case AMDGPU_HW_IP_VCN_ENC: 379 case AMDGPU_HW_IP_VCN_ENC:
380 type = AMD_IP_BLOCK_TYPE_VCN; 380 type = AMD_IP_BLOCK_TYPE_VCN;
381 for (i = 0; i < adev->vcn.num_enc_rings; i++) 381 for (i = 0; i < adev->vcn.num_enc_rings; i++)
382 ring_mask |= ((adev->vcn.ring_enc[i].ready ? 1 : 0) << i); 382 ring_mask |= adev->vcn.ring_enc[i].ready << i;
383 ib_start_alignment = 64; 383 ib_start_alignment = 64;
384 ib_size_alignment = 1; 384 ib_size_alignment = 1;
385 break; 385 break;
386 case AMDGPU_HW_IP_VCN_JPEG: 386 case AMDGPU_HW_IP_VCN_JPEG:
387 type = AMD_IP_BLOCK_TYPE_VCN; 387 type = AMD_IP_BLOCK_TYPE_VCN;
388 ring_mask = adev->vcn.ring_jpeg.ready ? 1 : 0; 388 ring_mask = adev->vcn.ring_jpeg.ready;
389 ib_start_alignment = 16; 389 ib_start_alignment = 16;
390 ib_size_alignment = 16; 390 ib_size_alignment = 16;
391 break; 391 break;