Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8960223d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon: fix correctness of irq_enabled check for radeon.
parents d519c8d9 077ebed5

drivers/gpu/drm/radeon/radeon_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state) 
	else

		dev_priv->irq_enable_reg &= ~mask;



	if (!dev->irq_enabled)

	if (dev->irq_enabled)

		RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);

}
@@ -57,7 +57,7 @@ static void r500_vbl_irq_set_state(struct drm_device *dev, u32 mask, int state) 
	else

		dev_priv->r500_disp_irq_reg &= ~mask;



	if (!dev->irq_enabled)

	if (dev->irq_enabled)

		RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);

}