git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drm/radeon: Unbreak HPD handling for r600+
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
r600.c
diff --git
a/drivers/gpu/drm/radeon/r600.c
b/drivers/gpu/drm/radeon/r600.c
index 0a085176e79b35b2887c19f7b33091804b58e645..e06e2d8feab397822361ba18a3e4b420cc2f0c4d 100644
(file)
--- a/
drivers/gpu/drm/radeon/r600.c
+++ b/
drivers/gpu/drm/radeon/r600.c
@@
-3988,7
+3988,7
@@
static void r600_irq_ack(struct radeon_device *rdev)
WREG32(DC_HPD5_INT_CONTROL, tmp);
}
if (rdev->irq.stat_regs.r600.disp_int_cont2 & DC_HPD6_INTERRUPT) {
- tmp = RREG32(DC_HPD
5
_INT_CONTROL);
+ tmp = RREG32(DC_HPD
6
_INT_CONTROL);
tmp |= DC_HPDx_INT_ACK;
WREG32(DC_HPD6_INT_CONTROL, tmp);
}