xf86-video-intel: src/sna/sna_driver.c

Chris Wilson ickle at kemper.freedesktop.org
Sat Aug 24 07:29:49 PDT 2013


 src/sna/sna_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4ca1953189d39741bcce659da0d6adcc548ab71
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Aug 24 15:09:06 2013 +0100

    sna: Fix reversed logic and loss of trust in the host
    
    The test for a hosted Xserver was backwards in
    
    commit 306c72cffbd8cd88e93871ee21fa85101198c1ac
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Sat Aug 24 14:02:23 2013 +0100
    
        sna: Trust the preferred-depth returned by the host
    
    so we failed to load the driver instead.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index dfd5b3e..1c98c87 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -457,7 +457,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 	case 16:
 	case 24:
 	case 30:
-		if ((sna->flags & SNA_IS_HOSTED) == 0 &&
+		if ((sna->flags & SNA_IS_HOSTED) ||
 		    fb_supports_depth(fd, scrn->depth))
 			break;
 	default:


More information about the xorg-commit mailing list