On Wed, Sep 04, 2002 at 07:16:22PM +0200, Denis Oliver Kropp wrote:
> I just tried to apply the patch, but it fails. Could you regenerate one?
Attached.
--
Ville Syrj�l�
[EMAIL PROTECTED]
http://www.sci.fi/~syrjala/
diff -urN DirectFB-orig/gfxdrivers/matrox/matrox.c DirectFB/gfxdrivers/matrox/matrox.c
--- DirectFB-orig/gfxdrivers/matrox/matrox.c Wed Sep 4 20:56:52 2002
+++ DirectFB/gfxdrivers/matrox/matrox.c Wed Sep 4 21:15:29 2002
@@ -140,7 +140,9 @@
DSBLIT_BLEND_COLORALPHA | \
DSBLIT_COLORIZE | \
DSBLIT_DEINTERLACE) || \
- (state)->destination->format != (state)->source->format || \
+ ((state)->destination->format != (state)->source->format && \
+ (state)->destination->format != DSPF_I420 && \
+ (state)->destination->format != DSPF_YV12) || \
(accel) == DFXL_STRETCHBLIT)
@@ -150,6 +152,12 @@
{
/* FIXME: 24bit support */
switch (state->destination->format) {
+ case DSPF_I420:
+ case DSPF_YV12:
+ if (!DFB_BLITTING_FUNCTION( accel ) ||
+ (state->source->format != DSPF_I420 &&
+ state->source->format != DSPF_YV12))
+ return;
case DSPF_RGB332:
case DSPF_RGB15:
case DSPF_RGB16:
@@ -168,8 +176,16 @@
state->accel |= MATROX_OLD_DRAWING_FUNCTIONS;
}
else {
- if (state->source->format != state->destination->format)
- return;
+ switch (state->source->format) {
+ case DSPF_I420:
+ case DSPF_YV12:
+ if (state->destination->format == DSPF_I420 ||
+ state->destination->format == DSPF_YV12)
+ break;
+ default:
+ if (state->source->format != state->destination->format)
+ return;
+ }
if (state->blittingflags & ~MATROX_OLD_BLITTING_FLAGS)
return;
@@ -183,6 +199,12 @@
{
/* FIXME: 24bit support */
switch (state->destination->format) {
+ case DSPF_I420:
+ case DSPF_YV12:
+ if (!DFB_BLITTING_FUNCTION( accel ) ||
+ (state->source->format != DSPF_I420 &&
+ state->source->format != DSPF_YV12))
+ return;
case DSPF_RGB332:
case DSPF_RGB15:
case DSPF_RGB16:
@@ -236,6 +258,12 @@
{
/* FIXME: 24bit support */
switch (state->destination->format) {
+ case DSPF_I420:
+ case DSPF_YV12:
+ if (!DFB_BLITTING_FUNCTION( accel ) ||
+ (state->source->format != DSPF_I420 &&
+ state->source->format != DSPF_YV12))
+ return;
case DSPF_RGB332:
case DSPF_RGB15:
case DSPF_RGB16:
@@ -266,6 +294,11 @@
case DSPF_ARGB:
case DSPF_YUY2:
break;
+ case DSPF_I420:
+ case DSPF_YV12:
+ if (state->destination->format == DSPF_I420 ||
+ state->destination->format == DSPF_YV12)
+ break;
default:
return;
}
@@ -294,6 +327,12 @@
{
/* FIXME: 24bit support */
switch (state->destination->format) {
+ case DSPF_I420:
+ case DSPF_YV12:
+ if (!DFB_BLITTING_FUNCTION( accel ) ||
+ (state->source->format != DSPF_I420 &&
+ state->source->format != DSPF_YV12))
+ return;
case DSPF_RGB332:
case DSPF_RGB15:
case DSPF_RGB16:
@@ -326,6 +365,11 @@
case DSPF_YUY2:
case DSPF_UYVY:
break;
+ case DSPF_I420:
+ case DSPF_YV12:
+ if (state->destination->format == DSPF_I420 ||
+ state->destination->format == DSPF_YV12)
+ break;
default:
return;
}
@@ -445,8 +489,10 @@
state->modified |= SMF_CLIP;
}
- if (state->modified & SMF_CLIP)
+ if (state->modified & SMF_CLIP) {
matrox_set_clip( mdrv, mdev, &state->clip );
+ mdev->clip = state->clip;
+ }
state->modified = 0;
}
@@ -616,36 +662,39 @@
}
}
-static void matroxBlit2D( void *drv, void *dev,
- DFBRectangle *rect, int dx, int dy )
+static void matroxDoBlit2D_Old( MatroxDriverData *mdrv, MatroxDeviceData *mdev,
+ int sx, int sy,
+ int dx, int dy,
+ int w, int h,
+ int pitch, int offset )
{
- MatroxDriverData *mdrv = (MatroxDriverData*) drv;
- MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
- volatile __u8 *mmio = mdrv->mmio_base;
+ volatile __u8 *mmio = mdrv->mmio_base;
__u32 dwgctl = BLTMOD_BFCOL | BOP_COPY | SHFTZERO | ATYPE_RSTR | OP_BITBLT;
__u32 start, end;
__u32 sgn = 0;
- __s32 pixelpitch = mdev->src_pixelpitch;
+ __s32 pixelpitch = pitch;
- if (rect->x < dx)
+ if (sx < dx)
sgn |= BLIT_LEFT;
- if (rect->y < dy)
+ if (sy < dy)
sgn |= BLIT_UP;
if (sgn & BLIT_UP) {
- rect->y += rect->h - 1;
- dy += rect->h - 1;
+ sy += h - 1;
+ dy += h - 1;
}
- start = end = rect->y * pixelpitch + rect->x;
+ start = sy * pixelpitch + sx + offset;
- rect->w--;
+ w--;
- if (sgn & BLIT_LEFT)
- start += rect->w;
- else
- end += rect->w;
+ end = w;
+
+ if (sgn & BLIT_LEFT) {
+ start += w;
+ end = -end;
+ }
if (sgn & BLIT_UP)
pixelpitch = -pixelpitch;
@@ -657,10 +706,10 @@
mga_out32( mmio, dwgctl, DWGCTL );
mga_out32( mmio, pixelpitch & 0x3FFFFF, AR5 );
mga_out32( mmio, start & 0xFFFFFF, AR3 );
- mga_out32( mmio, end & 0x3FFFFF, AR0 );
+ mga_out32( mmio, end & 0x3FFFF, AR0 );
mga_out32( mmio, sgn, SGN );
- mga_out32( mmio, (RS16(dx+rect->w) << 16) | RS16(dx), FXBNDRY );
- mga_out32( mmio, (RS16(dy) << 16) | RS16(rect->h), YDSTLEN | EXECUTE );
+ mga_out32( mmio, (RS16(dx+w) << 16) | RS16(dx), FXBNDRY );
+ mga_out32( mmio, (RS16(dy) << 16) | RS16(h), YDSTLEN | EXECUTE );
}
static void matroxBlit2D_Old( void *drv, void *dev,
@@ -669,32 +718,103 @@
MatroxDriverData *mdrv = (MatroxDriverData*) drv;
MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
volatile __u8 *mmio = mdrv->mmio_base;
+ int src_cb_offset, src_cr_offset, dst_offset;
+
+ matroxDoBlit2D_Old( mdrv, mdev,
+ rect->x, rect->y,
+ dx, dy,
+ rect->w, rect->h,
+ mdev->src_pixelpitch,
+ mdev->src_pixeloffset );
+
+
+ if (mdev->src_format != DSPF_I420 && mdev->src_format != DSPF_YV12)
+ return;
+
+ rect->x /= 2; rect->y /= 2;
+ rect->w /= 2; rect->h /= 2;
+ dx /= 2; dy /= 2;
+
+ if (mdev->src_format == mdev->dst_format) {
+ src_cb_offset = mdev->src_pixeloffset + mdev->src_pixelpitch *
+mdev->src_height;
+ src_cr_offset = src_cb_offset + mdev->src_pixelpitch * mdev->src_height / 4;
+ } else {
+ src_cr_offset = mdev->src_pixeloffset + mdev->src_pixelpitch *
+mdev->src_height;
+ src_cb_offset = src_cr_offset + mdev->src_pixelpitch * mdev->src_height / 4;
+ }
+
+ /* Cb plane */
+ dst_offset = mdev->dst_pixeloffset + mdev->dst_pixelpitch * mdev->dst_height;
+ mga_waitfifo( mdrv, mdev, 5 );
+ mga_out32( mmio, mdev->dst_pixelpitch/2, PITCH );
+ mga_out32( mmio, dst_offset, YDSTORG );
+ mga_out32( mmio, (dst_offset + mdev->dst_pixelpitch * mdev->clip.y1 / 4) &
+0xFFFFFF, YTOP );
+ mga_out32( mmio, (dst_offset + mdev->dst_pixelpitch * mdev->clip.y2 / 4) &
+0xFFFFFF, YBOT );
+ mga_out32( mmio, ((mdev->clip.x2/2 & 0x0FFF) << 16) | (mdev->clip.x1/2 &
+0x0FFF), CXBNDRY );
+
+ matroxDoBlit2D_Old( mdrv, mdev,
+ rect->x, rect->y,
+ dx, dy,
+ rect->w, rect->h,
+ mdev->src_pixelpitch/2,
+ src_cb_offset );
+
+ /* Cr plane */
+ dst_offset += mdev->dst_pixelpitch * mdev->dst_height / 4;
+ mga_waitfifo( mdrv, mdev, 3 );
+ mga_out32( mmio, dst_offset, YDSTORG );
+ mga_out32( mmio, (dst_offset + mdev->dst_pixelpitch * mdev->clip.y1 / 4) &
+0xFFFFFF, YTOP );
+ mga_out32( mmio, (dst_offset + mdev->dst_pixelpitch * mdev->clip.y2 / 4) &
+0xFFFFFF, YBOT );
+
+ matroxDoBlit2D_Old( mdrv, mdev,
+ rect->x, rect->y,
+ dx, dy,
+ rect->w, rect->h,
+ mdev->src_pixelpitch/2,
+ src_cr_offset );
+
+ /* Restore resisters */
+ mga_waitfifo( mdrv, mdev, 5 );
+ mga_out32( mmio, (mdev->dst_pixeloffset + mdev->dst_pixelpitch * mdev->clip.y1)
+& 0xFFFFFF, YTOP );
+ mga_out32( mmio, (mdev->dst_pixeloffset + mdev->dst_pixelpitch * mdev->clip.y2)
+& 0xFFFFFF, YBOT );
+ mga_out32( mmio, ((mdev->clip.x2 & 0x0FFF) << 16) | (mdev->clip.x1 & 0x0FFF),
+CXBNDRY );
+
+ mga_out32( mmio, mdev->dst_pixeloffset, YDSTORG );
+ mga_out32( mmio, mdev->dst_pixelpitch, PITCH );
+}
+
+
+static void matroxDoBlit2D( MatroxDriverData *mdrv, MatroxDeviceData *mdev,
+ int sx, int sy,
+ int dx, int dy,
+ int w, int h,
+ int pitch )
+{
+ volatile __u8 *mmio = mdrv->mmio_base;
__u32 dwgctl = BLTMOD_BFCOL | BOP_COPY | SHFTZERO | ATYPE_RSTR | OP_BITBLT;
__u32 start, end;
__u32 sgn = 0;
- __s32 pixelpitch = mdev->src_pixelpitch;
+ __s32 pixelpitch = pitch;
- if (rect->x < dx)
+ if (sx < dx)
sgn |= BLIT_LEFT;
- if (rect->y < dy)
+ if (sy < dy)
sgn |= BLIT_UP;
if (sgn & BLIT_UP) {
- rect->y += rect->h - 1;
- dy += rect->h - 1;
+ sy += h - 1;
+ dy += h - 1;
}
- start = rect->y * pixelpitch + rect->x + mdev->src_pixeloffset;
-
- rect->w--;
+ start = end = sy * pixelpitch + sx;
- end = rect->w;
+ w--;
- if (sgn & BLIT_LEFT) {
- start += rect->w;
- end = -end;
- }
+ if (sgn & BLIT_LEFT)
+ start += w;
+ else
+ end += w;
if (sgn & BLIT_UP)
pixelpitch = -pixelpitch;
@@ -706,83 +826,283 @@
mga_out32( mmio, dwgctl, DWGCTL );
mga_out32( mmio, pixelpitch & 0x3FFFFF, AR5 );
mga_out32( mmio, start & 0xFFFFFF, AR3 );
- mga_out32( mmio, end & 0x3FFFF, AR0 );
+ mga_out32( mmio, end & 0x3FFFFF, AR0 );
mga_out32( mmio, sgn, SGN );
- mga_out32( mmio, (RS16(dx+rect->w) << 16) | RS16(dx), FXBNDRY );
- mga_out32( mmio, (RS16(dy) << 16) | RS16(rect->h), YDSTLEN | EXECUTE );
+ mga_out32( mmio, (RS16(dx+w) << 16) | RS16(dx), FXBNDRY );
+ mga_out32( mmio, (RS16(dy) << 16) | RS16(h), YDSTLEN | EXECUTE );
}
-static void matroxStretchBlit( void *drv, void *dev,
- DFBRectangle *srect, DFBRectangle *drect )
+static void matroxBlit2D( void *drv, void *dev,
+ DFBRectangle *rect, int dx, int dy )
{
MatroxDriverData *mdrv = (MatroxDriverData*) drv;
MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
volatile __u8 *mmio = mdrv->mmio_base;
+ int src_cb_offset, src_cr_offset, dst_offset;
+
+ mga_waitfifo( mdrv, mdev, 1 );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, mdev->src_byteoffset ) &
+0x1FFFFFF, SRCORG );
+
+ matroxDoBlit2D( mdrv, mdev,
+ rect->x, rect->y,
+ dx, dy,
+ rect->w, rect->h,
+ mdev->src_pixelpitch );
+
+
+ if (mdev->src_format != DSPF_I420 && mdev->src_format != DSPF_YV12)
+ return;
+
+ rect->x /= 2; rect->y /= 2;
+ rect->w /= 2; rect->h /= 2;
+ dx /= 2; dy /= 2;
+
+ if (mdev->src_format == mdev->dst_format) {
+ src_cb_offset = mdev->src_byteoffset + mdev->src_bytepitch *
+mdev->src_height;
+ src_cr_offset = src_cb_offset + mdev->src_bytepitch * mdev->src_height / 4;
+ } else {
+ src_cr_offset = mdev->src_byteoffset + mdev->src_bytepitch *
+mdev->src_height;
+ src_cb_offset = src_cr_offset + mdev->src_bytepitch * mdev->src_height / 4;
+ }
+
+ /* Cb plane */
+ dst_offset = mdev->dst_byteoffset + mdev->dst_bytepitch * mdev->dst_height;
+ mga_waitfifo( mdrv, mdev, 6 );
+ mga_out32( mmio, mdev->dst_pixelpitch/2, PITCH );
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y1 / 4) & 0xFFFFFF, YTOP );
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y2 / 4) & 0xFFFFFF, YBOT );
+ mga_out32( mmio, ((mdev->clip.x2/2 & 0x0FFF) << 16) | (mdev->clip.x1/2 &
+0x0FFF), CXBNDRY );
+
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, dst_offset ) & 0x1FFFFFF,
+DSTORG );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, src_cb_offset ) & 0x1FFFFFF,
+SRCORG );
+
+ matroxDoBlit2D( mdrv, mdev,
+ rect->x, rect->y,
+ dx, dy,
+ rect->w, rect->h,
+ mdev->src_pixelpitch/2 );
+
+ /* Cr plane */
+ dst_offset += mdev->dst_bytepitch * mdev->dst_height / 4;
+ mga_waitfifo( mdrv, mdev, 2 );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, dst_offset ) & 0x1FFFFFF,
+DSTORG );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, src_cr_offset ) & 0x1FFFFFF,
+SRCORG );
+
+ matroxDoBlit2D( mdrv, mdev,
+ rect->x, rect->y,
+ dx, dy,
+ rect->w, rect->h,
+ mdev->src_pixelpitch/2 );
+
+ /* Restore registers */
+ mga_waitfifo( mdrv, mdev, 5 );
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y1) & 0xFFFFFF, YTOP );
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y2) & 0xFFFFFF, YBOT );
+ mga_out32( mmio, ((mdev->clip.x2 & 0x0FFF) << 16) | (mdev->clip.x1 & 0x0FFF),
+CXBNDRY );
+
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, mdev->dst_byteoffset ) &
+0x1FFFFFF, DSTORG );
+ mga_out32( mmio, mdev->dst_pixelpitch, PITCH );
+}
+
+static void matroxDoBlitTMU( MatroxDriverData *mdrv, MatroxDeviceData *mdev,
+ int sx, int sy,
+ int dx, int dy,
+ int sw, int sh,
+ int dw, int dh,
+ int w2, int h2,
+ int filter )
+{
+ volatile __u8 *mmio = mdrv->mmio_base;
__s32 startx, starty, incx, incy;
if (mdev->blit_deinterlace) {
- srect->y >>= 1;
- srect->h >>= 1;
+ sy /= 2;
+ sh /= 2;
}
- incx = (srect->w << (20 - mdev->matrox_w2)) / drect->w;
- incy = (srect->h << (20 - mdev->matrox_h2)) / drect->h;
-
- startx = srect->x << (20 - mdev->matrox_w2);
- starty = srect->y << (20 - mdev->matrox_h2);
+ incx = (sw << (20 - w2)) / dw;
+ incy = (sh << (20 - h2)) / dh;
+ startx = sx << (20 - w2);
+ starty = sy << (20 - h2);
mga_waitfifo( mdrv, mdev, 8);
mga_out32( mmio, BOP_COPY | SHFTZERO | SGNZERO | ARZERO |
ATYPE_I | OP_TEXTURE_TRAP, DWGCTL );
- mga_out32( mmio, (0x10<<21) | MAG_BILIN | MIN_BILIN, TEXFILTER );
+ if (filter)
+ mga_out32( mmio, (0x10<<21) | MAG_BILIN | MIN_BILIN, TEXFILTER );
+ else
+ mga_out32( mmio, (0x10<<21) | MAG_NRST | MIN_NRST, TEXFILTER );
mga_out32( mmio, incx, TMR0 );
mga_out32( mmio, incy, TMR3 );
mga_out32( mmio, startx, TMR6 );
mga_out32( mmio, starty, TMR7 );
-
- mga_out32( mmio, (RS16(drect->x+drect->w) << 16) | RS16(drect->x), FXBNDRY );
- mga_out32( mmio, (RS16(drect->y) << 16) | RS16(drect->h), YDSTLEN | EXECUTE );
+ mga_out32( mmio, (RS16(dx+dw) << 16) | RS16(dx), FXBNDRY );
+ mga_out32( mmio, (RS16(dy) << 16) | RS16(dh), YDSTLEN | EXECUTE );
}
-static void matroxBlit3D( void *drv, void *dev,
- DFBRectangle *rect, int dx, int dy )
+static void matroxBlitTMU( MatroxDriverData *mdrv, MatroxDeviceData *mdev,
+ DFBRectangle *srect, DFBRectangle *drect,
+ int stretch )
{
- MatroxDriverData *mdrv = (MatroxDriverData*) drv;
- MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
-
+ volatile __u8 *mmio = mdrv->mmio_base;
+ int src_offset, src_cb_offset, src_cr_offset,
+ dst_offset, dst_pixeloffset;
+ int w, h, w2, h2, pitch;
+ __u32 texctl;
+
+ src_offset = mdev->src_byteoffset;
+ w = mdev->src_width;
+ h = mdev->src_height;
+ pitch = mdev->src_pixelpitch;
+ if (mdev->blit_deinterlace) {
+ h /= 2;
+ pitch *= 2;
+ if (mdev->field)
+ src_offset += mdev->src_bytepitch;
+ }
+ w2 = log2( w );
+ h2 = log2( h );
+ texctl = mdev->texctl & ~(0x7ff << 9);
+ texctl |= (pitch & 0x7ff) << 9;
+
+ mga_waitfifo( mdrv, mdev, 5 );
+ mga_out32( mmio, texctl, TEXCTL );
+ mga_out32( mmio, mdev->texctl2, TEXCTL2 );
+ mga_out32( mmio, (w-1)<<18 | ((8-w2)&63)<<9 | w2, TEXWIDTH );
+ mga_out32( mmio, (h-1)<<18 | ((8-h2)&63)<<9 | h2, TEXHEIGHT );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, src_offset ) & 0x1FFFFFF,
+TEXORG );
+
+ matroxDoBlitTMU( mdrv, mdev,
+ srect->x, srect->y,
+ drect->x, drect->y,
+ srect->w, srect->h,
+ drect->w, drect->h,
+ w2, h2,
+ mdev->src_format == DSPF_I420 || mdev->src_format == DSPF_YV12
+|| stretch );
+
+
+ if (mdev->src_format != DSPF_I420 && mdev->src_format != DSPF_YV12)
+ return;
+
+ srect->x /= 2; srect->y /= 2;
+ srect->w /= 2; srect->h /= 2;
+ drect->x /= 2; drect->y /= 2;
+ drect->w /= 2; drect->h /= 2;
+
+ if (mdev->src_format == mdev->dst_format) {
+ src_cb_offset = mdev->src_byteoffset + mdev->src_bytepitch *
+mdev->src_height;
+ src_cr_offset = src_cb_offset + mdev->src_bytepitch * mdev->src_height / 4;
+ } else {
+ src_cr_offset = mdev->src_byteoffset + mdev->src_bytepitch *
+mdev->src_height;
+ src_cb_offset = src_cr_offset + mdev->src_bytepitch * mdev->src_height / 4;
+ }
+
+ w = mdev->src_width / 2;
+ h = mdev->src_height / 2;
+ pitch = mdev->src_pixelpitch / 2;
if (mdev->blit_deinterlace) {
- DFBRectangle drect = { dx, dy, rect->w, rect->h };
+ h /= 2;
+ pitch *= 2;
+ if (mdev->field) {
+ src_cb_offset += mdev->src_bytepitch/2;
+ src_cr_offset += mdev->src_bytepitch/2;
+ }
+ }
+ w2 = log2( w );
+ h2 = log2( h );
+
+ texctl = mdev->texctl & ~(0x7ff << 9);
+ texctl |= (pitch & 0x7ff) << 9;
- matroxStretchBlit( drv, dev, rect, &drect );
+ /* Cb plane */
+ dst_offset = mdev->dst_byteoffset + mdev->dst_bytepitch * mdev->dst_height;
+ dst_pixeloffset = mdev->dst_pixeloffset + mdev->dst_pixelpitch *
+mdev->dst_height;
+
+ mga_waitfifo( mdrv, mdev, 10 );
+ mga_out32( mmio, texctl, TEXCTL );
+ mga_out32( mmio, mdev->texctl2, TEXCTL2 );
+ mga_out32( mmio, (w-1)<<18 | ((8-w2)&63)<<9 | w2, TEXWIDTH );
+ mga_out32( mmio, (h-1)<<18 | ((8-h2)&63)<<9 | h2, TEXHEIGHT );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, src_cb_offset ) & 0x1FFFFFF,
+TEXORG );
+
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, dst_offset ) & 0x1FFFFFF,
+DSTORG );
+ mga_out32( mmio, mdev->dst_pixelpitch/2, PITCH );
+
+ if (mdev->old_matrox) {
+ mga_out32( mmio, (dst_pixeloffset + mdev->dst_pixelpitch * mdev->clip.y1 /
+4) & 0xFFFFFF, YTOP );
+ mga_out32( mmio, (dst_pixeloffset + mdev->dst_pixelpitch * mdev->clip.y2 /
+4) & 0xFFFFFF, YBOT );
+ } else {
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y1 / 4) & 0xFFFFFF,
+YTOP );
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y2 / 4) & 0xFFFFFF,
+YBOT );
+ }
+ mga_out32( mmio, ((mdev->clip.x2/2 & 0x0FFF) << 16) | (mdev->clip.x1/2 &
+0x0FFF), CXBNDRY );
+
+ matroxDoBlitTMU( mdrv, mdev,
+ srect->x, srect->y,
+ drect->x, drect->y,
+ srect->w, srect->h,
+ drect->w, drect->h,
+ w2, h2, 1 );
+
+ /* Cr plane */
+ dst_offset += mdev->dst_bytepitch * mdev->dst_height / 4;
+ dst_pixeloffset += mdev->dst_pixelpitch * mdev->dst_height / 4;
+
+ mga_waitfifo( mdrv, mdev, 2 );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, src_cr_offset ) & 0x1FFFFFF,
+TEXORG );
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, dst_offset ) & 0x1FFFFFF,
+DSTORG );
+
+ if (mdev->old_matrox) {
+ mga_waitfifo( mdrv, mdev, 2 );
+ mga_out32( mmio, (dst_pixeloffset + mdev->dst_pixelpitch * mdev->clip.y1 /
+4) & 0xFFFFFF, YTOP );
+ mga_out32( mmio, (dst_pixeloffset + mdev->dst_pixelpitch * mdev->clip.y2 /
+4) & 0xFFFFFF, YBOT );
+ }
+
+ matroxDoBlitTMU( mdrv, mdev,
+ srect->x, srect->y,
+ drect->x, drect->y,
+ srect->w, srect->h,
+ drect->w, drect->h,
+ w2, h2, 1 );
+
+ /* Restore registers */
+ mga_waitfifo( mdrv, mdev, 5 );
+ if (mdev->old_matrox) {
+ mga_out32( mmio, (mdev->dst_pixeloffset + mdev->dst_pixelpitch *
+mdev->clip.y1) & 0xFFFFFF, YTOP );
+ mga_out32( mmio, (mdev->dst_pixeloffset + mdev->dst_pixelpitch *
+mdev->clip.y2) & 0xFFFFFF, YBOT );
+ } else {
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y1) & 0xFFFFFF, YTOP );
+ mga_out32( mmio, (mdev->dst_pixelpitch * mdev->clip.y2) & 0xFFFFFF, YBOT );
}
- else {
- volatile __u8 *mmio = mdrv->mmio_base;
-
- __s32 startx, starty;
+ mga_out32( mmio, ((mdev->clip.x2 & 0x0FFF) << 16) | (mdev->clip.x1 & 0x0FFF),
+CXBNDRY );
- startx = rect->x << (20 - mdev->matrox_w2);
- starty = rect->y << (20 - mdev->matrox_h2);
+ mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, mdev->dst_byteoffset ) &
+0x1FFFFFF, DSTORG );
+ mga_out32( mmio, mdev->dst_pixelpitch, PITCH );
+}
+static void matroxStretchBlit( void *drv, void *dev,
+ DFBRectangle *srect, DFBRectangle *drect )
+{
+ MatroxDriverData *mdrv = (MatroxDriverData*) drv;
+ MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
- mga_waitfifo( mdrv, mdev, 8);
+ matroxBlitTMU( mdrv, mdev, srect, drect, 1 );
+}
- mga_out32( mmio, BOP_COPY | SHFTZERO | SGNZERO |
- ARZERO | ATYPE_I | OP_TEXTURE_TRAP, DWGCTL );
+static void matroxBlit3D( void *drv, void *dev,
+ DFBRectangle *rect, int dx, int dy )
+{
+ MatroxDriverData *mdrv = (MatroxDriverData*) drv;
+ MatroxDeviceData *mdev = (MatroxDeviceData*) dev;
- mga_out32( mmio, (0x10<<21) | MAG_NRST | MIN_NRST, TEXFILTER );
+ DFBRectangle drect = { dx, dy, rect->w, rect->h };
- mga_out32( mmio, 0x100000 >> mdev->matrox_w2, TMR0 );
- mga_out32( mmio, 0x100000 >> mdev->matrox_h2, TMR3 );
- mga_out32( mmio, startx, TMR6 );
- mga_out32( mmio, starty, TMR7 );
- mga_out32( mmio, (RS16(dx+rect->w) << 16) | RS16(dx), FXBNDRY );
- mga_out32( mmio, (RS16(dy) << 16) | RS16(rect->h), YDSTLEN | EXECUTE );
- }
+ matroxBlitTMU( mdrv, mdev, rect, &drect, mdev->blit_deinterlace );
}
diff -urN DirectFB-orig/gfxdrivers/matrox/matrox.h DirectFB/gfxdrivers/matrox/matrox.h
--- DirectFB-orig/gfxdrivers/matrox/matrox.h Wed Sep 4 20:56:52 2002
+++ DirectFB/gfxdrivers/matrox/matrox.h Wed Sep 4 21:15:29 2002
@@ -76,16 +76,29 @@
/* Stored values */
int dst_pixelpitch;
int dst_pixeloffset;
+ int dst_bytepitch;
+ int dst_byteoffset;
+ int dst_height;
+ DFBSurfacePixelFormat dst_format;
+
int src_pixelpitch;
int src_pixeloffset;
+ int src_bytepitch;
+ int src_byteoffset;
+ int src_width;
+ int src_height;
+ DFBSurfacePixelFormat src_format;
int draw_blend;
int blit_src_colorkey;
int blit_deinterlace;
+ int field;
+
+ __u32 texctl;
+ __u32 texctl2;
- int matrox_w2;
- int matrox_h2;
+ DFBRegion clip;
} MatroxDeviceData;
extern DisplayLayerFuncs matroxBesFuncs;
diff -urN DirectFB-orig/gfxdrivers/matrox/matrox_state.c
DirectFB/gfxdrivers/matrox/matrox_state.c
--- DirectFB-orig/gfxdrivers/matrox/matrox_state.c Wed Sep 4 20:56:52 2002
+++ DirectFB/gfxdrivers/matrox/matrox_state.c Wed Sep 4 21:15:49 2002
@@ -52,8 +52,13 @@
SurfaceBuffer *buffer = destination->back_buffer;
int bytes_per_pixel = DFB_BYTES_PER_PIXEL(destination->format);
- mdev->dst_pixelpitch = buffer->video.pitch / bytes_per_pixel;
+ mdev->dst_height = destination->height;
+ mdev->dst_format = destination->format;
+
mdev->dst_pixeloffset = buffer->video.offset / bytes_per_pixel;
+ mdev->dst_pixelpitch = buffer->video.pitch / bytes_per_pixel;
+ mdev->dst_byteoffset = buffer->video.offset;
+ mdev->dst_bytepitch = buffer->video.pitch;
mga_waitfifo( mdrv, mdev, 3 );
@@ -83,6 +88,10 @@
case DSPF_ARGB:
mga_out32( mmio, PW32, MACCESS );
break;
+ case DSPF_I420:
+ case DSPF_YV12:
+ mga_out32( mmio, PW8 | BYPASS332 | NODITHER, MACCESS );
+ break;
default:
BUG( "unexpected pixelformat!" );
break;
@@ -313,32 +322,23 @@
MatroxDeviceData *mdev,
CardState *state )
{
- volatile __u8 *mmio = mdrv->mmio_base;
-
- __u32 texctl, texctl2, texorg;
CoreSurface *surface = state->source;
SurfaceBuffer *buffer = surface->front_buffer;
- int height = surface->height;
+ int bytes_per_pixel = DFB_BYTES_PER_PIXEL(surface->format);
+ __u32 texctl, texctl2;
if (MGA_IS_VALID( m_Source ))
return;
- mdev->src_pixelpitch = buffer->video.pitch /
- DFB_BYTES_PER_PIXEL(surface->format);
-
- texorg = dfb_gfxcard_memory_physical( NULL, buffer->video.offset );
-
- if (mdev->blit_deinterlace) {
- height >>= 1;
- mdev->src_pixelpitch <<= 1;
-
- if (surface->field)
- texorg += buffer->video.pitch;
- }
-
- mdev->matrox_w2 = log2( surface->width );
- mdev->matrox_h2 = log2( height );
+ mdev->src_pixelpitch = buffer->video.pitch / bytes_per_pixel;
+ mdev->src_byteoffset = buffer->video.offset;
+ mdev->src_bytepitch = buffer->video.pitch;
+
+ mdev->src_width = surface->width;
+ mdev->src_height = surface->height;
+ mdev->src_format = surface->format;
+ mdev->field = surface->field;
if (state->blittingflags & DSBLIT_BLEND_ALPHACHANNEL)
texctl = TAMASK;
@@ -352,6 +352,8 @@
case DSPF_UYVY:
texctl |= TW422UYVY;
break;
+ case DSPF_I420:
+ case DSPF_YV12:
case DSPF_A8:
texctl |= TW8A;
break;
@@ -385,15 +387,8 @@
if (surface->format == DSPF_A8)
texctl2 |= IDECAL;
- mga_waitfifo( mdrv, mdev, 5);
-
- mga_out32( mmio, texctl, TEXCTL );
- mga_out32( mmio, texctl2, TEXCTL2 );
- mga_out32( mmio, ((surface->width -1)<<18) |
- ((8-mdev->matrox_w2)&63)<<9 | mdev->matrox_w2, TEXWIDTH );
- mga_out32( mmio, ((height-1)<<18) |
- ((8-mdev->matrox_h2)&63)<<9 | mdev->matrox_h2, TEXHEIGHT );
- mga_out32( mmio, texorg & 0x1FFFFFF, TEXORG );
+ mdev->texctl = texctl;
+ mdev->texctl2 = texctl2;
MGA_VALIDATE( m_Source );
}
@@ -402,7 +397,6 @@
MatroxDeviceData *mdev,
CardState *state )
{
- volatile __u8 *mmio = mdrv->mmio_base;
CoreSurface *surface = state->source;
SurfaceBuffer *buffer = surface->front_buffer;
int bytes_per_pixel = DFB_BYTES_PER_PIXEL(surface->format);
@@ -410,15 +404,13 @@
if (MGA_IS_VALID( m_source ))
return;
- mdev->src_pixelpitch = buffer->video.pitch / bytes_per_pixel;
+ mdev->src_pixeloffset = buffer->video.offset / bytes_per_pixel;
+ mdev->src_pixelpitch = buffer->video.pitch / bytes_per_pixel;
+ mdev->src_byteoffset = buffer->video.offset;
+ mdev->src_bytepitch = buffer->video.pitch;
- if (mdev->old_matrox)
- mdev->src_pixeloffset = buffer->video.offset / bytes_per_pixel;
- else {
- mga_waitfifo( mdrv, mdev, 1);
- mga_out32( mmio, dfb_gfxcard_memory_physical( NULL, buffer->video.offset) &
- 0x1FFFFFF, SRCORG );
- }
+ mdev->src_height = surface->height;
+ mdev->src_format = surface->format;
MGA_VALIDATE( m_source );
}
diff -urN DirectFB-orig/gfxdrivers/matrox/regs.h DirectFB/gfxdrivers/matrox/regs.h
--- DirectFB-orig/gfxdrivers/matrox/regs.h Thu May 30 12:22:05 2002
+++ DirectFB/gfxdrivers/matrox/regs.h Wed Sep 4 21:15:29 2002
@@ -180,13 +180,14 @@
#define DSTORG 0x2cb8
#define SRCORG 0x2cb4
-#define MACCESS 0x1C04
-# define PW8 0x00000000
-# define PW16 0x00000001
-# define PW32 0x00000002
-# define PW24 0x00000003
-# define NODITHER 0x40000000
-# define DIT555 0x80000000
+#define MACCESS 0x1C04
+# define PW8 0x00000000
+# define PW16 0x00000001
+# define PW32 0x00000002
+# define PW24 0x00000003
+# define BYPASS332 0x10000000
+# define NODITHER 0x40000000
+# define DIT555 0x80000000
#define EXECUTE 0x100 /* or with register to execute a programmed
diff -urN DirectFB-orig/log DirectFB/log
--- DirectFB-orig/log Thu Jan 1 02:00:00 1970
+++ DirectFB/log Wed Sep 4 21:15:29 2002
@@ -0,0 +1,55 @@
+Hmm... Looks like a unified diff to me...
+The text leading up to this was:
+--------------------------
+|diff -urN DirectFB-orig/gfxdrivers/matrox/matrox.c
+DirectFB/gfxdrivers/matrox/matrox.c
+|--- DirectFB-orig/gfxdrivers/matrox/matrox.c Wed Sep 4 20:56:52 2002
+|+++ DirectFB/gfxdrivers/matrox/matrox.c Wed Sep 4 20:58:29 2002
+--------------------------
+Patching file gfxdrivers/matrox/matrox.c using Plan A...
+Hunk #1 succeeded at 140.
+Hunk #2 succeeded at 152.
+Hunk #3 succeeded at 176.
+Hunk #4 succeeded at 199.
+Hunk #5 succeeded at 258.
+Hunk #6 succeeded at 294.
+Hunk #7 succeeded at 327.
+Hunk #8 succeeded at 365.
+Hunk #9 succeeded at 489.
+Hunk #10 succeeded at 662.
+Hunk #11 succeeded at 706.
+Hunk #12 succeeded at 718.
+Hunk #13 succeeded at 826.
+Hmm... The next patch looks like a unified diff to me...
+The text leading up to this was:
+--------------------------
+|diff -urN DirectFB-orig/gfxdrivers/matrox/matrox.h
+DirectFB/gfxdrivers/matrox/matrox.h
+|--- DirectFB-orig/gfxdrivers/matrox/matrox.h Wed Sep 4 20:56:52 2002
+|+++ DirectFB/gfxdrivers/matrox/matrox.h Wed Sep 4 20:58:29 2002
+--------------------------
+Patching file gfxdrivers/matrox/matrox.h using Plan A...
+Hunk #1 succeeded at 76.
+Hmm... The next patch looks like a unified diff to me...
+The text leading up to this was:
+--------------------------
+|diff -urN DirectFB-orig/gfxdrivers/matrox/matrox_state.c
+DirectFB/gfxdrivers/matrox/matrox_state.c
+|--- DirectFB-orig/gfxdrivers/matrox/matrox_state.c Wed Sep 4 20:56:52 2002
+|+++ DirectFB/gfxdrivers/matrox/matrox_state.c Wed Sep 4 21:02:28 2002
+--------------------------
+Patching file gfxdrivers/matrox/matrox_state.c using Plan A...
+Hunk #1 succeeded at 52.
+Hunk #2 succeeded at 88.
+Hunk #3 succeeded at 322.
+Hunk #4 succeeded at 353.
+Hunk #5 succeeded at 388.
+Hunk #6 succeeded at 398.
+Hunk #7 succeeded at 405.
+Hmm... The next patch looks like a unified diff to me...
+The text leading up to this was:
+--------------------------
+|diff -urN DirectFB-orig/gfxdrivers/matrox/regs.h DirectFB/gfxdrivers/matrox/regs.h
+|--- DirectFB-orig/gfxdrivers/matrox/regs.h Thu May 30 12:22:05 2002
+|+++ DirectFB/gfxdrivers/matrox/regs.h Wed Sep 4 20:58:29 2002
+--------------------------
+Patching file gfxdrivers/matrox/regs.h using Plan A...
+Hunk #1 succeeded at 180.
+done
