| Message ID | 20170621082850.13224-2-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 21, 2017 at 4:28 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Both drivers shut down all crtc beforehand already, which will shut up > any pending vblank (the only thing vblank_cleanup really does is > disable the disable timer). Hence we don't need this here and can > remove it. > > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: Christian König <christian.koenig@amd.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Do you want me to pick this up or are you trying to land the whole series as one? > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - > drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > index 62da6c5c6095..2480273c1dca 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > @@ -263,7 +263,6 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) > { > unsigned i, j; > > - drm_vblank_cleanup(adev->ddev); > if (adev->irq.installed) { > drm_irq_uninstall(adev->ddev); > adev->irq.installed = false; > diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c > index 7aacb44df201..fff0d11b0600 100644 > --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c > +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c > @@ -324,7 +324,6 @@ int radeon_irq_kms_init(struct radeon_device *rdev) > */ > void radeon_irq_kms_fini(struct radeon_device *rdev) > { > - drm_vblank_cleanup(rdev->ddev); > if (rdev->irq.installed) { > drm_irq_uninstall(rdev->ddev); > rdev->irq.installed = false; > -- > 2.11.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Thu, Jun 22, 2017 at 08:54:51AM -0400, Alex Deucher wrote: > On Wed, Jun 21, 2017 at 4:28 AM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > Both drivers shut down all crtc beforehand already, which will shut up > > any pending vblank (the only thing vblank_cleanup really does is > > disable the disable timer). Hence we don't need this here and can > > remove it. > > > > Cc: Alex Deucher <alexander.deucher@amd.com> > > Cc: Christian König <christian.koenig@amd.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Acked-by: Alex Deucher <alexander.deucher@amd.com> > > Do you want me to pick this up or are you trying to land the whole > series as one? I'd like to get the final patch in soonish, so all going through drm-misc would be less coordination. Thanks for taking a look. -Daniel > > > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - > > drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - > > 2 files changed, 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > > index 62da6c5c6095..2480273c1dca 100644 > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > > @@ -263,7 +263,6 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) > > { > > unsigned i, j; > > > > - drm_vblank_cleanup(adev->ddev); > > if (adev->irq.installed) { > > drm_irq_uninstall(adev->ddev); > > adev->irq.installed = false; > > diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c > > index 7aacb44df201..fff0d11b0600 100644 > > --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c > > +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c > > @@ -324,7 +324,6 @@ int radeon_irq_kms_init(struct radeon_device *rdev) > > */ > > void radeon_irq_kms_fini(struct radeon_device *rdev) > > { > > - drm_vblank_cleanup(rdev->ddev); > > if (rdev->irq.installed) { > > drm_irq_uninstall(rdev->ddev); > > rdev->irq.installed = false; > > -- > > 2.11.0 > > > > _______________________________________________ > > 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 62da6c5c6095..2480273c1dca 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -263,7 +263,6 @@ void amdgpu_irq_fini(struct amdgpu_device *adev) { unsigned i, j; - drm_vblank_cleanup(adev->ddev); if (adev->irq.installed) { drm_irq_uninstall(adev->ddev); adev->irq.installed = false; diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index 7aacb44df201..fff0d11b0600 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -324,7 +324,6 @@ int radeon_irq_kms_init(struct radeon_device *rdev) */ void radeon_irq_kms_fini(struct radeon_device *rdev) { - drm_vblank_cleanup(rdev->ddev); if (rdev->irq.installed) { drm_irq_uninstall(rdev->ddev); rdev->irq.installed = false;
Both drivers shut down all crtc beforehand already, which will shut up any pending vblank (the only thing vblank_cleanup really does is disable the disable timer). Hence we don't need this here and can remove it. Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Christian König <christian.koenig@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - 2 files changed, 2 deletions(-)