diff options
| author | Dave Airlie | 2016-05-09 05:49:56 +0200 |
|---|---|---|
| committer | Dave Airlie | 2016-05-09 05:49:56 +0200 |
| commit | bafb86f5bc3173479002555dea7f31d943b12332 (patch) | |
| tree | 6ec94c96460faf782cdb8781339560e13e0918b0 /drivers/gpu/drm/amd/amdgpu/tonga_ih.c | |
| parent | drm/amdgpu: fix build on aarch64. (diff) | |
| parent | Linux 4.6-rc7 (diff) | |
| download | kernel-qcow2-linux-bafb86f5bc3173479002555dea7f31d943b12332.tar.gz kernel-qcow2-linux-bafb86f5bc3173479002555dea7f31d943b12332.tar.xz kernel-qcow2-linux-bafb86f5bc3173479002555dea7f31d943b12332.zip | |
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/tonga_ih.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c index dd9e5e36fec9..55cdab849089 100644 --- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c @@ -307,7 +307,7 @@ static int tonga_ih_sw_fini(void *handle) amdgpu_irq_fini(adev); amdgpu_ih_ring_fini(adev); - amdgpu_irq_add_domain(adev); + amdgpu_irq_remove_domain(adev); return 0; } |