lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/radeon/kms: fix some bugs in vline reloc

Browse Source 
- fix offset of NOP packet for parsing
- fix p->idx increments
- fix bad mask when updating crtc vline info

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
Alex Deucher
2009-09-25 16:39:24 -04:00
committed by Dave Airlie
parent 974b16e33e
commit 90ebd0655a
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/radeon/r100.c
View File

@@ -968,13 +968,13 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
} }
/* jump over the NOP */ /* jump over the NOP */
r = r100_cs_packet_parse(p, &p3reloc, p->idx); r = r100_cs_packet_parse(p, &p3reloc, p->idx + waitreloc.count + 2);
if (r) if (r)
return r; return r;
h_idx = p->idx - 2; h_idx = p->idx - 2;
p->idx += waitreloc.count; p->idx += waitreloc.count + 2;
p->idx += p3reloc.count; p->idx += p3reloc.count + 2;
header = radeon_get_ib_value(p, h_idx); header = radeon_get_ib_value(p, h_idx);
crtc_id = radeon_get_ib_value(p, h_idx + 5); crtc_id = radeon_get_ib_value(p, h_idx + 5);
@@ -992,17 +992,16 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p)
if (!crtc->enabled) { if (!crtc->enabled) {
/* if the CRTC isn't enabled - we need to nop out the wait until */ /* if the CRTC isn't enabled - we need to nop out the wait until */
ib[h_idx + 2] = PACKET2(0); ib[h_idx + 2] = PACKET2(0);
ib[h_idx + 3] = PACKET2(0); ib[h_idx + 3] = PACKET2(0);
} else if (crtc_id == 1) { } else if (crtc_id == 1) {
switch (reg) { switch (reg) {
case AVIVO_D1MODE_VLINE_START_END: case AVIVO_D1MODE_VLINE_START_END:
header &= R300_CP_PACKET0_REG_MASK; header &= ~R300_CP_PACKET0_REG_MASK;
header |= AVIVO_D2MODE_VLINE_START_END >> 2; header |= AVIVO_D2MODE_VLINE_START_END >> 2;
break; break;
case RADEON_CRTC_GUI_TRIG_VLINE: case RADEON_CRTC_GUI_TRIG_VLINE:
header &= R300_CP_PACKET0_REG_MASK; header &= ~R300_CP_PACKET0_REG_MASK;
header |= RADEON_CRTC2_GUI_TRIG_VLINE >> 2; header |= RADEON_CRTC2_GUI_TRIG_VLINE >> 2;
break; break;
default: default: