diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 557b357a533..bc544693c31 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -876,7 +876,6 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info, = info->family >= CHIP_GFX1100 ? info->ip[AMD_IP_VCN_UNIFIED].num_queues != 0 : info->ip[AMD_IP_VCN_DEC].num_queues != 0; - info->has_video_hw.vce_encode = info->ip[AMD_IP_VCE].num_queues != 0; info->has_video_hw.vcn_encode = info->ip[AMD_IP_VCN_ENC].num_queues != 0; info->has_userptr = true; info->has_syncobj = has_syncobj(fd); @@ -1475,7 +1474,7 @@ void ac_print_gpu_info(struct radeon_info *info, FILE *f) fprintf(f, " pfp_fw_feature = %i\n", info->pfp_fw_feature); fprintf(f, "Multimedia info:\n"); - fprintf(f, " vce_encode = %u\n", info->has_video_hw.vce_encode); + fprintf(f, " vce_encode = %u\n", info->ip[AMD_IP_VCE].num_queues); if (info->family >= CHIP_GFX1100) fprintf(f, " vcn_unified = %u\n", info->has_video_hw.vcn_decode); diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index 3c6c0f2854d..68744d1f161 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -157,7 +157,6 @@ struct radeon_info { /* Multimedia info. */ struct { bool vcn_decode; - bool vce_encode; bool vcn_encode; } has_video_hw; diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index 57e740d7f62..149bfdbaa2c 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -578,7 +578,7 @@ static int si_get_video_param(struct pipe_screen *screen, enum pipe_video_profil enum pipe_video_format codec = u_reduce_video_profile(profile); if (entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) { - if (!(sscreen->info.has_video_hw.vce_encode || + if (!(sscreen->info.ip[AMD_IP_VCE].num_queues || sscreen->info.ip[AMD_IP_UVD_ENC].num_queues || sscreen->info.has_video_hw.vcn_encode)) return 0; @@ -1052,7 +1052,7 @@ void si_init_screen_get_functions(struct si_screen *sscreen) sscreen->b.get_disk_shader_cache = si_get_disk_shader_cache; if (sscreen->info.ip[AMD_IP_UVD].num_queues || sscreen->info.has_video_hw.vcn_decode || - sscreen->info.ip[AMD_IP_VCN_JPEG].num_queues || sscreen->info.has_video_hw.vce_encode || + sscreen->info.ip[AMD_IP_VCN_JPEG].num_queues || sscreen->info.ip[AMD_IP_VCE].num_queues || sscreen->info.ip[AMD_IP_UVD_ENC].num_queues || sscreen->info.has_video_hw.vcn_encode) { sscreen->b.get_video_param = si_get_video_param; sscreen->b.is_video_format_supported = si_vid_is_format_supported; diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 1bf9a4d177c..80191907f28 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -685,7 +685,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, unsign /* Initialize multimedia functions. */ if (sscreen->info.ip[AMD_IP_UVD].num_queues || sscreen->info.has_video_hw.vcn_decode || - sscreen->info.ip[AMD_IP_VCN_JPEG].num_queues || sscreen->info.has_video_hw.vce_encode || + sscreen->info.ip[AMD_IP_VCN_JPEG].num_queues || sscreen->info.ip[AMD_IP_VCE].num_queues || sscreen->info.ip[AMD_IP_UVD_ENC].num_queues || sscreen->info.has_video_hw.vcn_encode) { sctx->b.create_video_codec = si_uvd_create_decoder; sctx->b.create_video_buffer = si_video_buffer_create; diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 73510b582b4..a63f6fe8b0b 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -313,7 +313,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) } /* Check for UVD and VCE */ - ws->info.has_video_hw.vce_encode = false; ws->info.vce_fw_version = 0x00000000; if (ws->info.drm_minor >= 32) { uint32_t value = RADEON_CS_RING_UVD; @@ -330,7 +329,6 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) "VCE FW version", &value)) { ws->info.vce_fw_version = value; ws->info.ip[AMD_IP_VCE].num_queues = 1; - ws->info.has_video_hw.vce_encode = true; } } }