xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_glamor.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 6e74aacc5e5da3b51744153dad1645caa6ea4ce3
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Mar 27 11:57:29 2013 +0100

    glamor: Only enable for depth >= 24
    
    It can't handle lower depths yet.
    
    Reported-by: Igor Vagulin <igor.vagulin at gmail.com>

diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
index 7bca67c..488593e 100644
--- a/src/radeon_glamor.c
+++ b/src/radeon_glamor.c
@@ -93,6 +93,12 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
 	if (s && strcasecmp(s, "glamor") != 0)
 		return FALSE;
 
+	if (scrn->depth < 24) {
+		xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
+			   "glamor requires depth >= 24, disabling.\n");
+		return FALSE;
+	}
+
 	if (!xf86LoaderCheckSymbol("glamor_egl_init")) {
 		xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
 			   "glamor requires Load \"glamoregl\" in "