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

[Michel Dänzer]

 src/evergreen_textured_videofuncs.c |    1 +
 src/r600_exa.c                      |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 87f776b966f4200c97a989536d4b71822ae4c0b3
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Feb 8 11:10:27 2012 +0100

    Remove unused local variable 'height'.
    
    Pointed out by gcc -Wunused-variable.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 595248a..9ea39e7 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -627,8 +627,6 @@ R600PrepareCopy(PixmapPtr pSrc,   PixmapPtr pDst,
 
     if (accel_state->same_surface == TRUE) {
 #if defined(XF86DRM_MODE)
-	unsigned height = RADEON_ALIGN(pDst->drawable.height,
-				       drmmode_get_height_align(pScrn, accel_state->dst_obj.tiling_flags));
 	unsigned long size = accel_state->dst_obj.surface->bo_size;
 	unsigned long align = accel_state->dst_obj.surface->bo_alignment;
 #else
commit f63262e2f112a348c45f0dcecd891c8b6d9c5ee8
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Feb 8 10:28:45 2012 +0100

    evergreen: Initialize source surface member for textured video.
    
    Fixes crash reported by Ole Salscheider on IRC.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/evergreen_textured_videofuncs.c b/src/evergreen_textured_videofuncs.c
index 94cb7fc..8ca8e62 100644
--- a/src/evergreen_textured_videofuncs.c
+++ b/src/evergreen_textured_videofuncs.c
@@ -169,6 +169,7 @@ EVERGREENDisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
     src_obj.domain = RADEON_GEM_DOMAIN_VRAM | RADEON_GEM_DOMAIN_GTT;
     src_obj.bo = pPriv->src_bo[pPriv->currentBuffer];
     src_obj.tiling_flags = 0;
+    src_obj.surface = NULL;
 
     dst_obj.width = pPixmap->drawable.width;
     dst_obj.height = pPixmap->drawable.height;