Message ID | 1459406803-1930-2-git-send-email-michel@daenzer.net (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Mar 31, 2016 at 2:46 AM, Michel Dänzer <michel@daenzer.net> wrote: > From: Michel Dänzer <michel.daenzer@amd.com> > > Without this, since the conversion from drm_vblank_pre/post_modeset to > drm_vblank_on/off, the vblank interrupt could never be disabled after > userspace triggered enabling it. > > Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Applied the series. Thanks, Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > index f594cfa..762cfdb 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; > > -- > 2.8.0.rc3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index f594cfa..762cfdb 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;