<div dir="ltr"><div dir="ltr"><div dir="ltr">Hi,<div><br></div><div>With this commit, both radeonsi and radv fail to load for me with:</div><div><br></div><div>amdgpu: amdgpu_query_hw_ip_info(vcn_jpeg) failed.<br></div><div><br></div><div>If I comment out that query in ac_gpu_info.c, then they work again. I'm running kernel 4.18.7 with a Vega 64 - is the DRM version check on that correct?</div><div><br></div><div>Thanks,</div><div>Alex</div></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Wed, 17 Oct 2018 at 20:06, <<a href="mailto:boyuan.zhang@amd.com">boyuan.zhang@amd.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Boyuan Zhang <<a href="mailto:boyuan.zhang@amd.com" target="_blank">boyuan.zhang@amd.com</a>><br>
<br>
Signed-off-by: Boyuan Zhang <<a href="mailto:boyuan.zhang@amd.com" target="_blank">boyuan.zhang@amd.com</a>><br>
Reviewed-by: Leo Liu <<a href="mailto:leo.liu@amd.com" target="_blank">leo.liu@amd.com</a>><br>
---<br>
src/amd/common/ac_gpu_info.c | 14 ++++++++++++--<br>
1 file changed, 12 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c<br>
index 766ad83547..8c50738c3f 100644<br>
--- a/src/amd/common/ac_gpu_info.c<br>
+++ b/src/amd/common/ac_gpu_info.c<br>
@@ -99,7 +99,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,<br>
struct drm_amdgpu_info_device device_info = {};<br>
struct amdgpu_buffer_size_alignments alignment_info = {};<br>
struct drm_amdgpu_info_hw_ip dma = {}, compute = {}, uvd = {};<br>
- struct drm_amdgpu_info_hw_ip uvd_enc = {}, vce = {}, vcn_dec = {};<br>
+ struct drm_amdgpu_info_hw_ip uvd_enc = {}, vce = {}, vcn_dec = {}, vcn_jpeg = {};<br>
struct drm_amdgpu_info_hw_ip vcn_enc = {}, gfx = {};<br>
struct amdgpu_gds_resource_info gds = {};<br>
uint32_t vce_version = 0, vce_feature = 0, uvd_version = 0, uvd_feature = 0;<br>
@@ -186,6 +186,14 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,<br>
}<br>
}<br>
<br>
+ if (info->drm_major == 3 && info->drm_minor >= 17) {<br>
+ r = amdgpu_query_hw_ip_info(dev, AMDGPU_HW_IP_VCN_JPEG, 0, &vcn_jpeg);<br>
+ if (r) {<br>
+ fprintf(stderr, "amdgpu: amdgpu_query_hw_ip_info(vcn_jpeg) failed.\n");<br>
+ return false;<br>
+ }<br>
+ }<br>
+<br>
r = amdgpu_query_firmware_version(dev, AMDGPU_INFO_FW_GFX_ME, 0, 0,<br>
&info->me_fw_version,<br>
&info->me_fw_feature);<br>
@@ -340,7 +348,8 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,<br>
info->max_se = amdinfo->num_shader_engines;<br>
info->max_sh_per_se = amdinfo->num_shader_arrays_per_engine;<br>
info->has_hw_decode =<br>
- (uvd.available_rings != 0) || (vcn_dec.available_rings != 0);<br>
+ (uvd.available_rings != 0) || (vcn_dec.available_rings != 0) ||<br>
+ (vcn_jpeg.available_rings != 0);<br>
info->uvd_fw_version =<br>
uvd.available_rings ? uvd_version : 0;<br>
info->vce_fw_version =<br>
@@ -439,6 +448,7 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,<br>
ib_align = MAX2(ib_align, vce.ib_start_alignment);<br>
ib_align = MAX2(ib_align, vcn_dec.ib_start_alignment);<br>
ib_align = MAX2(ib_align, vcn_enc.ib_start_alignment);<br>
+ ib_align = MAX2(ib_align, vcn_jpeg.ib_start_alignment);<br>
assert(ib_align);<br>
info->ib_start_alignment = ib_align;<br>
<br>
-- <br>
2.17.1<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>