summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-04-23 14:16:36 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-23 14:16:36 +0200
commit84eaae155a16d7864f0f814934e5062885cb0709 (patch)
treeafdbb8a4375a2d755f6e4d63767396bfc4124c50 /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
parentf454bfddf6ba557381d8bf5df50eff778602ff23 (diff)
parentc3b46c73264b03000d1e18b22f5caf63332547c9 (diff)
downloadlwn-84eaae155a16d7864f0f814934e5062885cb0709.tar.gz
lwn-84eaae155a16d7864f0f814934e5062885cb0709.zip
Merge tag 'v4.6-rc4' into sched/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index f594cfaa97e5..762cfdb85147 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -219,6 +219,8 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
if (r) {
return r;
}
+ adev->ddev->vblank_disable_allowed = true;
+
/* enable msi */
adev->irq.msi_enabled = false;