summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2017-11-22 15:55:21 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-05 11:26:37 +0100
commit248b0ec5ad2501a35f2603384f1c7c7cee79eb02 (patch)
tree43507d14629699ccc7e641381f242f0943cf28f4 /drivers/gpu
parent802328da073a0ba36a1cde899c48a5f07732d4aa (diff)
downloadlinux-stable-248b0ec5ad2501a35f2603384f1c7c7cee79eb02.tar.gz
linux-stable-248b0ec5ad2501a35f2603384f1c7c7cee79eb02.tar.bz2
linux-stable-248b0ec5ad2501a35f2603384f1c7c7cee79eb02.zip
drm/amdgpu: Set adev->vcn.irq.num_types for VCN
commit 89ce6e0afee8eafa679093207dabd717af9d09c5 upstream. We were setting adev->uvd.irq.num_types instead. Fixes: 9b257116e784 ("drm/amdgpu: add vcn enc irq support") Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 21e7b88401e1..a098712bdd2f 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -1175,7 +1175,7 @@ static const struct amdgpu_irq_src_funcs vcn_v1_0_irq_funcs = {
static void vcn_v1_0_set_irq_funcs(struct amdgpu_device *adev)
{
- adev->uvd.irq.num_types = adev->vcn.num_enc_rings + 1;
+ adev->vcn.irq.num_types = adev->vcn.num_enc_rings + 1;
adev->vcn.irq.funcs = &vcn_v1_0_irq_funcs;
}