diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index 0b5575ed4f0..d07169f3c11 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.jpeg_decode = info->ip[AMD_IP_VCN_JPEG].num_queues != 0; info->has_video_hw.vce_encode = info->ip[AMD_IP_VCE].num_queues != 0; info->has_video_hw.uvd_encode = info->ip[AMD_IP_UVD_ENC].num_queues != 0; info->has_video_hw.vcn_encode = info->ip[AMD_IP_VCN_ENC].num_queues != 0; @@ -1477,7 +1476,6 @@ 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, " jpeg_decode = %u\n", info->has_video_hw.jpeg_decode); fprintf(f, " vce_encode = %u\n", info->has_video_hw.vce_encode); fprintf(f, " uvd_encode = %u\n", info->has_video_hw.uvd_encode); diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index ec116dcd6b7..48a0b15ae6e 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 jpeg_decode; bool vce_encode; bool uvd_encode; bool vcn_encode; diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c index e6fac220883..bc8d4dc4279 100644 --- a/src/gallium/drivers/radeonsi/si_get.c +++ b/src/gallium/drivers/radeonsi/si_get.c @@ -676,7 +676,7 @@ static int si_get_video_param(struct pipe_screen *screen, enum pipe_video_profil return false; case PIPE_VIDEO_FORMAT_JPEG: if (sscreen->info.family >= CHIP_RAVEN) { - if (!sscreen->info.has_video_hw.jpeg_decode) + if (!sscreen->info.ip[AMD_IP_VCN_JPEG].num_queues) return false; else return true; @@ -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.has_video_hw.jpeg_decode || sscreen->info.has_video_hw.vce_encode || + sscreen->info.ip[AMD_IP_VCN_JPEG].num_queues || sscreen->info.has_video_hw.vce_encode || sscreen->info.has_video_hw.uvd_encode || 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 03a8bc407e7..9ccb3e9fda9 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.has_video_hw.jpeg_decode || sscreen->info.has_video_hw.vce_encode || + sscreen->info.ip[AMD_IP_VCN_JPEG].num_queues || sscreen->info.has_video_hw.vce_encode || sscreen->info.has_video_hw.uvd_encode || 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;