xf86-video-ati: Branch 'master'

[Jerome Glisse]

 src/drmmode_display.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cdeb1949c820242f05a8897d3ddd0718f204dacf
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Thu Jul 15 16:21:41 2010 -0400

    kms: don't call cursor helper if using software cursor
    
    Fix :
    https://bugzilla.redhat.com/show_bug.cgi?id=601713
    https://bugzilla.redhat.com/show_bug.cgi?id=598358
    
    Signed-off-by: Jerome Glisse <jglisse at redhat.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 1366b36..e2d516b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -347,7 +347,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		}
 	}
 
-	if (pScrn->pScreen)
+	if (pScrn->pScreen &&
+		!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE))
 		xf86_reload_cursors(pScrn->pScreen);
 
 done: