xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 src/r600_textured_videofuncs.c |    2 +-
 src/radeon_driver.c            |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ff18595eace42ddfc931f4f948cb5adf59ebcf52
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Sep 26 06:04:51 2009 +1000

    r600/xv: fix dst bo write domain

diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
index c9df284..1798091 100644
--- a/src/r600_textured_videofuncs.c
+++ b/src/r600_textured_videofuncs.c
@@ -234,7 +234,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
 	radeon_cs_space_add_persistent_bo(info->cs, accel_state->src_bo[0],
 					  RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
 	radeon_cs_space_add_persistent_bo(info->cs, accel_state->dst_bo,
-					  RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM, 0);
+					  0, RADEON_GEM_DOMAIN_VRAM, 0);
 	if (radeon_cs_space_check(info->cs))
 	    return;
     } else
commit 718a611f3cc7f5eea95cd73a9dcc7913c922fcbc
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Sep 26 06:03:51 2009 +1000

    radeon: fix zaphod

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index a9aafd3..24ef513 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3746,6 +3746,8 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
     memset(info->FB + pScrn->fbOffset, 0,
            pScrn->virtualY * pScrn->displayWidth * info->CurrentLayout.pixel_bytes);
 
+    pScrn->pScreen = pScreen;
+
     /* set the modes with desired rotation, etc. */
     if (!xf86SetDesiredModes (pScrn))
 	return FALSE;