summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_irq_kms.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-14 11:08:53 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-02-14 11:08:53 -0700
commitb214b7bbffca8ac6a6f1dad46408f7a9d4219098 (patch)
tree2ef03e062e2a04ea9f2d5439b0daea5274a1bc98 /drivers/gpu/drm/radeon/radeon_irq_kms.c
parent7d48ec3698e7b747efa744fd340b0f2d1dbfd3e0 (diff)
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
downloadtalos-obmc-linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.tar.gz
talos-obmc-linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.zip
Merge commit 'v2.6.38-rc4' into spi/next
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_irq_kms.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_irq_kms.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c
index a289646e8aa4..9ec830c77af0 100644
--- a/drivers/gpu/drm/radeon/radeon_irq_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c
@@ -110,11 +110,14 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev)
int radeon_irq_kms_init(struct radeon_device *rdev)
{
+ int i;
int r = 0;
INIT_WORK(&rdev->hotplug_work, radeon_hotplug_work_func);
spin_lock_init(&rdev->irq.sw_lock);
+ for (i = 0; i < rdev->num_crtc; i++)
+ spin_lock_init(&rdev->irq.pflip_lock[i]);
r = drm_vblank_init(rdev->ddev, rdev->num_crtc);
if (r) {
return r;
OpenPOWER on IntegriCloud