diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2025-09-29 12:13:00 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2025-09-29 12:13:00 +0300 |
| commit | 996ad9cd3e1eee1183aba9c7c4d1ada4a62c6f9a (patch) | |
| tree | 4021ff1544533eb526d75bbdefd2cc598c45f6c3 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |
| parent | 924adb0bbdd8fef25fd229c76e3f602c3e8752ee (diff) | |
| parent | 62bea0e1d5c71a3d9c953d4bbbae79428d0ba05c (diff) | |
| download | linux-next-996ad9cd3e1eee1183aba9c7c4d1ada4a62c6f9a.tar.gz linux-next-996ad9cd3e1eee1183aba9c7c4d1ada4a62c6f9a.zip | |
Merge drm/drm-next into drm-intel-next
Backmerge to sync with drm/xe changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index b9060bcd4806..ce318f5de047 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -449,7 +449,7 @@ static int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle, r = amdgpu_job_alloc_with_ib(ring->adev, &ring->adev->vce.entity, AMDGPU_FENCE_OWNER_UNDEFINED, ib_size_dw * 4, AMDGPU_IB_POOL_DIRECT, - &job); + &job, AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; @@ -540,7 +540,8 @@ static int amdgpu_vce_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, AMDGPU_FENCE_OWNER_UNDEFINED, ib_size_dw * 4, direct ? AMDGPU_IB_POOL_DIRECT : - AMDGPU_IB_POOL_DELAYED, &job); + AMDGPU_IB_POOL_DELAYED, &job, + AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST); if (r) return r; |