diff options
author | Ingo Molnar <mingo@kernel.org> | 2022-09-21 09:58:02 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2022-09-21 09:58:02 +0200 |
commit | 74656d03ac36fabb16b9df5221cf398ee3a9ca08 (patch) | |
tree | 0600e619ac817e2c016c148810814f55280316cc /drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | |
parent | 0d97db026509c1a13f732b22670ab1f0ac9d8d87 (diff) | |
parent | 521a547ced6477c54b4b0cc206000406c221b4d6 (diff) |
Merge tag 'v6.0-rc6' into locking/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/ih_v6_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c index 92dc60a9d209..085e613f3646 100644 --- a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c @@ -727,6 +727,7 @@ static const struct amd_ip_funcs ih_v6_0_ip_funcs = { static const struct amdgpu_ih_funcs ih_v6_0_funcs = { .get_wptr = ih_v6_0_get_wptr, .decode_iv = amdgpu_ih_decode_iv_helper, + .decode_iv_ts = amdgpu_ih_decode_iv_ts_helper, .set_rptr = ih_v6_0_set_rptr }; |