From 13f958fbe8420e406f24c01d320f29002ee860b7 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 10 Oct 2005 05:58:41 +0000 Subject: [PATCH] Add missing {Prepare,Finish}Access() wrappers for the tile pixmap in the fallback case --- exa/exa.c | 2 ++ exa/exa_accel.c | 2 ++ exa/exa_migration.c | 2 ++ hw/xfree86/exa/exa.c | 2 ++ hw/xfree86/exa/exa_accel.c | 2 ++ hw/xfree86/exa/exa_migration.c | 2 ++ 6 files changed, 12 insertions(+) diff --git a/exa/exa.c b/exa/exa.c index fb46f4449..e1b48427d 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -1279,7 +1279,9 @@ exaFillRegionTiled (DrawablePtr pDrawable, fallback: EXA_FALLBACK(("from 0x%lx to 0x%lx\n", (long)pTile, (long)pDrawable)); exaPrepareAccess (pDrawable, EXA_PREPARE_DEST); + exaPrepareAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); fbFillRegionTiled (pDrawable, pRegion, pTile); + exaFinishAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); exaFinishAccess (pDrawable, EXA_PREPARE_DEST); } diff --git a/exa/exa_accel.c b/exa/exa_accel.c index fb46f4449..e1b48427d 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -1279,7 +1279,9 @@ exaFillRegionTiled (DrawablePtr pDrawable, fallback: EXA_FALLBACK(("from 0x%lx to 0x%lx\n", (long)pTile, (long)pDrawable)); exaPrepareAccess (pDrawable, EXA_PREPARE_DEST); + exaPrepareAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); fbFillRegionTiled (pDrawable, pRegion, pTile); + exaFinishAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); exaFinishAccess (pDrawable, EXA_PREPARE_DEST); } diff --git a/exa/exa_migration.c b/exa/exa_migration.c index fb46f4449..e1b48427d 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -1279,7 +1279,9 @@ exaFillRegionTiled (DrawablePtr pDrawable, fallback: EXA_FALLBACK(("from 0x%lx to 0x%lx\n", (long)pTile, (long)pDrawable)); exaPrepareAccess (pDrawable, EXA_PREPARE_DEST); + exaPrepareAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); fbFillRegionTiled (pDrawable, pRegion, pTile); + exaFinishAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); exaFinishAccess (pDrawable, EXA_PREPARE_DEST); } diff --git a/hw/xfree86/exa/exa.c b/hw/xfree86/exa/exa.c index fb46f4449..e1b48427d 100644 --- a/hw/xfree86/exa/exa.c +++ b/hw/xfree86/exa/exa.c @@ -1279,7 +1279,9 @@ exaFillRegionTiled (DrawablePtr pDrawable, fallback: EXA_FALLBACK(("from 0x%lx to 0x%lx\n", (long)pTile, (long)pDrawable)); exaPrepareAccess (pDrawable, EXA_PREPARE_DEST); + exaPrepareAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); fbFillRegionTiled (pDrawable, pRegion, pTile); + exaFinishAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); exaFinishAccess (pDrawable, EXA_PREPARE_DEST); } diff --git a/hw/xfree86/exa/exa_accel.c b/hw/xfree86/exa/exa_accel.c index fb46f4449..e1b48427d 100644 --- a/hw/xfree86/exa/exa_accel.c +++ b/hw/xfree86/exa/exa_accel.c @@ -1279,7 +1279,9 @@ exaFillRegionTiled (DrawablePtr pDrawable, fallback: EXA_FALLBACK(("from 0x%lx to 0x%lx\n", (long)pTile, (long)pDrawable)); exaPrepareAccess (pDrawable, EXA_PREPARE_DEST); + exaPrepareAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); fbFillRegionTiled (pDrawable, pRegion, pTile); + exaFinishAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); exaFinishAccess (pDrawable, EXA_PREPARE_DEST); } diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c index fb46f4449..e1b48427d 100644 --- a/hw/xfree86/exa/exa_migration.c +++ b/hw/xfree86/exa/exa_migration.c @@ -1279,7 +1279,9 @@ exaFillRegionTiled (DrawablePtr pDrawable, fallback: EXA_FALLBACK(("from 0x%lx to 0x%lx\n", (long)pTile, (long)pDrawable)); exaPrepareAccess (pDrawable, EXA_PREPARE_DEST); + exaPrepareAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); fbFillRegionTiled (pDrawable, pRegion, pTile); + exaFinishAccess ((DrawablePtr)pTile, EXA_PREPARE_SRC); exaFinishAccess (pDrawable, EXA_PREPARE_DEST); }