diff options
| -rw-r--r-- | src/amd/common/ac_gpu_info.c | 2 | ||||
| -rw-r--r-- | src/amd/common/ac_gpu_info.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 0b4933e174b..56645c48632 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -241,7 +241,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev, info->max_shader_clock = amdinfo->max_engine_clk / 1000; info->max_se = amdinfo->num_shader_engines; info->max_sh_per_se = amdinfo->num_shader_arrays_per_engine; - info->has_uvd = uvd.available_rings != 0; + info->has_hw_decode = uvd.available_rings != 0; info->uvd_fw_version = uvd.available_rings ? uvd_version : 0; info->vce_fw_version = diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 3785eb4d164..3f7ade1a0bb 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -55,7 +55,7 @@ struct radeon_info { bool has_dedicated_vram; bool has_virtual_memory; bool gfx_ib_pad_with_type2; - bool has_uvd; + bool has_hw_decode; uint32_t num_sdma_rings; uint32_t num_compute_rings; uint32_t uvd_fw_version; diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index fd01672c1d1..2ed6880d590 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -137,7 +137,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, r600_init_blit_functions(rctx); - if (rscreen->b.info.has_uvd) { + if (rscreen->b.info.has_hw_decode) { rctx->b.b.create_video_codec = r600_uvd_create_decoder; rctx->b.b.create_video_buffer = r600_video_buffer_create; } else { diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 5460daabbb4..2c0cadb0309 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -1351,7 +1351,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, rscreen->b.resource_from_user_memory = r600_buffer_from_user_memory; rscreen->b.query_memory_info = r600_query_memory_info; - if (rscreen->info.has_uvd) { + if (rscreen->info.has_hw_decode) { rscreen->b.get_video_param = rvid_get_video_param; rscreen->b.is_video_format_supported = rvid_is_format_supported; } else { @@ -1397,7 +1397,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, printf("has_virtual_memory = %i\n", rscreen->info.has_virtual_memory); printf("gfx_ib_pad_with_type2 = %i\n", rscreen->info.gfx_ib_pad_with_type2); printf("num_sdma_rings = %i\n", rscreen->info.num_sdma_rings); - printf("has_uvd = %i\n", rscreen->info.has_uvd); + printf("has_hw_decode = %i\n", rscreen->info.has_hw_decode); printf("me_fw_version = %i\n", rscreen->info.me_fw_version); printf("pfp_fw_version = %i\n", rscreen->info.pfp_fw_version); printf("ce_fw_version = %i\n", rscreen->info.ce_fw_version); diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 6f82e294bde..909a959bc1c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -175,7 +175,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, si_init_cp_dma_functions(sctx); si_init_debug_functions(sctx); - if (sscreen->b.info.has_uvd) { + if (sscreen->b.info.has_hw_decode) { sctx->b.b.create_video_codec = si_uvd_create_decoder; sctx->b.b.create_video_buffer = si_video_buffer_create; } else { diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index ce52e2ad516..a485615ae4f 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -312,13 +312,13 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) } /* Check for UVD and VCE */ - ws->info.has_uvd = false; + ws->info.has_hw_decode = false; ws->info.vce_fw_version = 0x00000000; if (ws->info.drm_minor >= 32) { uint32_t value = RADEON_CS_RING_UVD; if (radeon_get_drm_value(ws->fd, RADEON_INFO_RING_WORKING, "UVD Ring working", &value)) - ws->info.has_uvd = value; + ws->info.has_hw_decode = value; value = RADEON_CS_RING_VCE; if (radeon_get_drm_value(ws->fd, RADEON_INFO_RING_WORKING, |