aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
diff options
context:
space:
mode:
authorDmitry Torokhov <[email protected]>2016-06-18 17:25:08 -0700
committerDmitry Torokhov <[email protected]>2016-06-18 17:25:08 -0700
commit6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch)
treec5cd6113ed93854b1bc30cd471c366f080c4be2f /drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
parent540c26087bfbad6ea72758b76b16ae6282a73fea (diff)
parent488326947cd1f038da8d2c9068a0d07b913b7983 (diff)
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next merge window.
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;