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

[Michel Dänzer]

 src/radeon_dri2.c           |    1 +
 src/radeon_textured_video.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 83124426040bc1f2dba74c8eeb5a5a9c7c64e664
Author: Mario Kleiner <mario.kleiner.de at gmail.com>
Date:   Wed Jan 24 18:19:38 2018 +0100

    Make XvMC extension initialize at depth 30.
    
    Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 63631c99..23bdfd1d 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -499,11 +499,11 @@ static XF86VideoEncodingRec DummyEncodingEG[1] =
     }
 };
 
-#define NUM_FORMATS 3
+#define NUM_FORMATS 4
 
 static XF86VideoFormatRec Formats[NUM_FORMATS] =
 {
-    {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+    {15, TrueColor}, {16, TrueColor}, {24, TrueColor}, {30, TrueColor}
 };
 
 #define NUM_ATTRIBUTES 2
commit 2d171c892d373b45ef9f1ee068648437e2529a78
Author: Mario Kleiner <mario.kleiner.de at gmail.com>
Date:   Wed Jan 24 18:19:37 2018 +0100

    Add missing depth 30 -> cpp=4 handling for DRI2.
    
    Missing this apparently didn't cause any ill side effects, only a bit of
    confusion when looking at xtrace's of DRI2 clients.
    
    Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 8376848c..9f373589 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -125,6 +125,7 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
 	    cpp = 2;
 	    break;
 	case 24:
+	case 30:
 	    cpp = 4;
 	    break;
 	default: