xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon.h                |    1 +
 src/radeon_driver.c         |    2 ++
 src/radeon_textured_video.c |    4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 474eda02257152ced52364f38cbad24c20aebbc0
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sat Aug 1 16:06:52 2009 -0400

    radeon: reload bicubic Xv texture on VT switch
    
    fixed bicubic filtering after VT switch or suspend/resume

diff --git a/src/radeon.h b/src/radeon.h
index 3c62fd9..d5402b2 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -1264,6 +1264,7 @@ extern void RADEONUpdateHVPosition(xf86OutputPtr output, DisplayModePtr mode);
 /* radeon_video.c */
 extern void RADEONInitVideo(ScreenPtr pScreen);
 extern void RADEONResetVideo(ScrnInfoPtr pScrn);
+extern Bool radeon_load_bicubic_texture(ScrnInfoPtr pScrn);
 
 /* radeon_legacy_memory.c */
 extern uint32_t
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 049047a..3f79917 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5700,6 +5700,8 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 	DRIUnlock(pScrn->pScreen);
     }
 #endif
+    if (IS_R500_3D || IS_R300_3D)
+	radeon_load_bicubic_texture(pScrn);
 
     return TRUE;
 }
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 0f89b49..a9d6fc3 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -671,7 +671,7 @@ RADEONSetTexPortAttribute(ScrnInfoPtr  pScrn,
     return Success;
 }
 
-static Bool radeon_load_bicubic_texture(ScrnInfoPtr pScrn)
+Bool radeon_load_bicubic_texture(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr    info = RADEONPTR(pScrn);
 
@@ -706,6 +706,7 @@ static Bool radeon_load_bicubic_texture(ScrnInfoPtr pScrn)
     return TRUE;
 }
 
+#if 0
 /* XXX */
 static void radeon_unload_bicubic_texture(ScrnInfoPtr pScrn)
 {
@@ -717,6 +718,7 @@ static void radeon_unload_bicubic_texture(ScrnInfoPtr pScrn)
     }
 
 }
+#endif
 
 XF86VideoAdaptorPtr
 RADEONSetupImageTexturedVideo(ScreenPtr pScreen)