diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-06 23:00:29 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-06 23:00:29 -0500 |
| commit | a81406b4143ff07e586bbe03c50f089da94eefe1 (patch) | |
| tree | 57c5cf45059792b59212f23ec8874f3541f96056 /drivers/gpu/drm/radeon/rs600.c | |
| parent | 90520b78a4f8ba1faef75961eddd8192077e0ac2 (diff) | |
| parent | 43b19f161c7a9941e3aa7db0e3ee19b93980e3d7 (diff) | |
Merge remote branch 'korg/drm-radeon-next' into drm-linus
* korg/drm-radeon-next:
drm/radeon/kms: rs600: use correct mask for SW interrupt
gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
drm/radeon/radeon_device.c: move a dereference below a NULL test
drm/radeon/radeon_fence.c: move a dereference below the NULL test
drm/radeon/radeon_connectors.c: add a NULL test before dereference
drm/radeon/kms: fix memory leak
drm/radeon/kms: add missing breaks in i2c and ss lookups
drm/radeon/kms: add primary dac adj values table
drm/radeon/kms: fallback to default connector table
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 4f8ea4260572..4245218e954f 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
| @@ -396,7 +396,7 @@ int rs600_irq_process(struct radeon_device *rdev) | |||
| 396 | } | 396 | } |
| 397 | while (status || r500_disp_int) { | 397 | while (status || r500_disp_int) { |
| 398 | /* SW interrupt */ | 398 | /* SW interrupt */ |
| 399 | if (G_000040_SW_INT_EN(status)) | 399 | if (G_000044_SW_INT(status)) |
| 400 | radeon_fence_process(rdev); | 400 | radeon_fence_process(rdev); |
| 401 | /* Vertical blank interrupts */ | 401 | /* Vertical blank interrupts */ |
| 402 | if (G_007EDC_LB_D1_VBLANK_INTERRUPT(r500_disp_int)) | 402 | if (G_007EDC_LB_D1_VBLANK_INTERRUPT(r500_disp_int)) |