diff options
| author | Tormod Volden <debian.tormod@gmail.com> | 2013-02-06 22:14:59 +0100 |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2013-05-09 15:57:32 +0200 |
| commit | 44581aef5f878e7f2b34d5693d50ef75263b195c (patch) | |
| tree | 00fc00353fbd633ee5bbbf2ec2d5eaba9a7d0ca0 | |
| parent | 3425ddb4c5dd7bbd91068c7ba0b1c001719795a5 (diff) | |
Fix video window height on MX/IX/SuperSavage
Some copy-pasto caused the width to be written into the height register.
Thanks to Hans-Jürgen Mauser for pointing out a couple of more places this
was wrong.
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
| -rw-r--r-- | src/savage_video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/savage_video.c b/src/savage_video.c index 63958b7..81a5a82 100644 --- a/src/savage_video.c +++ b/src/savage_video.c @@ -1717,28 +1717,28 @@ SavageDisplayVideoNew( OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff ); OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); } else if (psav->IsPrimary) { OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15)) & (0x7ffffff & ~BASE_PAD)); OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff ); OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); } else { OUTREG(SEC_STREAM_FBUF_ADDR0, (offset + (x1>>15)) & (0x7ffffff & ~BASE_PAD)); OUTREG(SEC_STREAM_STRIDE, pitch & 0xfff ); OUTREG(SEC_STREAM_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); #if 0 OUTREG(SEC_STREAM2_FBUF_ADDR0, (offset + (x1>>15)) & (0x7ffffff & ~BASE_PAD)); OUTREG(SEC_STREAM2_STRIDE_LPB, pitch & 0xfff ); OUTREG(SEC_STREAM2_WINDOW_START, ((dstBox->x1+1) << 16) | (dstBox->y1+1) ); OUTREG(SEC_STREAM2_WINDOW_SZ, ((dstBox->x2-dstBox->x1) << 16) - | (dstBox->x2-dstBox->x1) ); + | (dstBox->y2 - dstBox->y1) ); #endif } |