Commit b2ffa2c2 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/radeon: Track IRQ state in local device state

Replace usage of struct drm_device.irq_enabled with the driver's
own state field struct radeon_device.irq.installed. The field in
the DRM device structure is considered legacy and should not be
used by KMS drivers.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210625082222.3845-4-tzimmermann@suse.de
parent f4b62145
...@@ -288,7 +288,7 @@ static void radeon_fence_check_lockup(struct work_struct *work) ...@@ -288,7 +288,7 @@ static void radeon_fence_check_lockup(struct work_struct *work)
return; return;
} }
if (fence_drv->delayed_irq && rdev->ddev->irq_enabled) { if (fence_drv->delayed_irq && rdev->irq.installed) {
unsigned long irqflags; unsigned long irqflags;
fence_drv->delayed_irq = false; fence_drv->delayed_irq = false;
......
...@@ -357,7 +357,7 @@ void radeon_irq_kms_sw_irq_get(struct radeon_device *rdev, int ring) ...@@ -357,7 +357,7 @@ void radeon_irq_kms_sw_irq_get(struct radeon_device *rdev, int ring)
{ {
unsigned long irqflags; unsigned long irqflags;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
if (atomic_inc_return(&rdev->irq.ring_int[ring]) == 1) { if (atomic_inc_return(&rdev->irq.ring_int[ring]) == 1) {
...@@ -396,7 +396,7 @@ void radeon_irq_kms_sw_irq_put(struct radeon_device *rdev, int ring) ...@@ -396,7 +396,7 @@ void radeon_irq_kms_sw_irq_put(struct radeon_device *rdev, int ring)
{ {
unsigned long irqflags; unsigned long irqflags;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
if (atomic_dec_and_test(&rdev->irq.ring_int[ring])) { if (atomic_dec_and_test(&rdev->irq.ring_int[ring])) {
...@@ -422,7 +422,7 @@ void radeon_irq_kms_pflip_irq_get(struct radeon_device *rdev, int crtc) ...@@ -422,7 +422,7 @@ void radeon_irq_kms_pflip_irq_get(struct radeon_device *rdev, int crtc)
if (crtc < 0 || crtc >= rdev->num_crtc) if (crtc < 0 || crtc >= rdev->num_crtc)
return; return;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
if (atomic_inc_return(&rdev->irq.pflip[crtc]) == 1) { if (atomic_inc_return(&rdev->irq.pflip[crtc]) == 1) {
...@@ -448,7 +448,7 @@ void radeon_irq_kms_pflip_irq_put(struct radeon_device *rdev, int crtc) ...@@ -448,7 +448,7 @@ void radeon_irq_kms_pflip_irq_put(struct radeon_device *rdev, int crtc)
if (crtc < 0 || crtc >= rdev->num_crtc) if (crtc < 0 || crtc >= rdev->num_crtc)
return; return;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
if (atomic_dec_and_test(&rdev->irq.pflip[crtc])) { if (atomic_dec_and_test(&rdev->irq.pflip[crtc])) {
...@@ -470,7 +470,7 @@ void radeon_irq_kms_enable_afmt(struct radeon_device *rdev, int block) ...@@ -470,7 +470,7 @@ void radeon_irq_kms_enable_afmt(struct radeon_device *rdev, int block)
{ {
unsigned long irqflags; unsigned long irqflags;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
spin_lock_irqsave(&rdev->irq.lock, irqflags); spin_lock_irqsave(&rdev->irq.lock, irqflags);
...@@ -492,7 +492,7 @@ void radeon_irq_kms_disable_afmt(struct radeon_device *rdev, int block) ...@@ -492,7 +492,7 @@ void radeon_irq_kms_disable_afmt(struct radeon_device *rdev, int block)
{ {
unsigned long irqflags; unsigned long irqflags;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
spin_lock_irqsave(&rdev->irq.lock, irqflags); spin_lock_irqsave(&rdev->irq.lock, irqflags);
...@@ -514,7 +514,7 @@ void radeon_irq_kms_enable_hpd(struct radeon_device *rdev, unsigned hpd_mask) ...@@ -514,7 +514,7 @@ void radeon_irq_kms_enable_hpd(struct radeon_device *rdev, unsigned hpd_mask)
unsigned long irqflags; unsigned long irqflags;
int i; int i;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
spin_lock_irqsave(&rdev->irq.lock, irqflags); spin_lock_irqsave(&rdev->irq.lock, irqflags);
...@@ -537,7 +537,7 @@ void radeon_irq_kms_disable_hpd(struct radeon_device *rdev, unsigned hpd_mask) ...@@ -537,7 +537,7 @@ void radeon_irq_kms_disable_hpd(struct radeon_device *rdev, unsigned hpd_mask)
unsigned long irqflags; unsigned long irqflags;
int i; int i;
if (!rdev->ddev->irq_enabled) if (!rdev->irq.installed)
return; return;
spin_lock_irqsave(&rdev->irq.lock, irqflags); spin_lock_irqsave(&rdev->irq.lock, irqflags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment