diff --git a/.pick_status.json b/.pick_status.json index a5c416e5288..c7e373535c3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -804,7 +804,7 @@ "description": "winsys/amdgpu: Fix userq job info log on PPC", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2547fd0f59d6340c7c85641a444504b33558dd89", "notes": null diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp index 12aa8b12071..678f15bc2b0 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp @@ -1650,8 +1650,8 @@ static int amdgpu_cs_submit_ib_userq(struct amdgpu_userq *userq, * given queue, cross process/queue fence dependency can be analyzed. */ mesa_logi("amdgpu: uq_log: %s: num_wait_fences=%d uq_va=%llx job=%llx\n", - amdgpu_userq_str[acs->queue_index], userq_wait_data.num_fences, fence_info[i].va, - fence_info[i].value); + amdgpu_userq_str[acs->queue_index], userq_wait_data.num_fences, + (long long)fence_info[i].va, (long long)fence_info[i].value); } }