xf86-video-intel: 3 commits - src/sna/sna_video.c src/sna/sna_video_overlay.c src/sna/sna_video_textured.c

[Chris Wilson]

 src/sna/sna_video.c          |    2 +-
 src/sna/sna_video_overlay.c  |   14 ++++++--------
 src/sna/sna_video_textured.c |   13 ++++++-------
 3 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit 7ad3b377a394c9342c3ab2f003d48b7cb3c0891d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 13 17:53:11 2011 +0000

    sna/video: Use the right pointer for unmapping
    
    Don't just deference any old random pointer, use the one we actually
    mapped in the first place!
    
    Reported-by: Matti Hamalainen <ccr at tnsp.org>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42880
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c
index d3788fd..068b803 100644
--- a/src/sna/sna_video.c
+++ b/src/sna/sna_video.c
@@ -481,7 +481,7 @@ sna_video_copy_data(struct sna *sna,
 	else
 		sna_copy_packed_data(video, frame, buf, dst);
 
-	munmap(dst, video->buf->size);
+	munmap(dst, frame->bo->size);
 	return TRUE;
 }
 
commit 8da8809d03734d92c3bcf478fe051077ce3caa29
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 13 17:49:23 2011 +0000

    sna/video: Simplify check for 915G[M] which is simply gen==30
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 55c78c9..8531fc6 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -241,7 +241,7 @@ sna_video_textured_put_image(ScrnInfoPtr scrn,
 		return Success;
 
 	if (xvmc_passthrough(id)) {
-		if (IS_I915G(sna) || IS_I915GM(sna)) {
+		if (sna->kgem.gen == 30) {
 			/* XXX: i915 is not support and needs some
 			 * serious care.  grep for KMS in i915_hwmc.c */
 			return BadAlloc;
commit cac335b979a95e31e201f9766d19d737361e09b2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 13 13:13:03 2011 +0000

    sna/video: Constify a couple of attribute arrays
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index 9ba78ef..ba6f671 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -70,13 +70,12 @@ static const XF86VideoEncodingRec DummyEncoding[1] = {
 };
 
 #define NUM_FORMATS 3
-
-static XF86VideoFormatRec Formats[NUM_FORMATS] = {
+static const XF86VideoFormatRec Formats[NUM_FORMATS] = {
 	{15, TrueColor}, {16, TrueColor}, {24, TrueColor}
 };
 
 #define NUM_ATTRIBUTES 5
-static XF86AttributeRec Attributes[NUM_ATTRIBUTES] = {
+static const XF86AttributeRec Attributes[NUM_ATTRIBUTES] = {
 	{XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
 	{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
 	{XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
@@ -85,7 +84,7 @@ static XF86AttributeRec Attributes[NUM_ATTRIBUTES] = {
 };
 
 #define GAMMA_ATTRIBUTES 6
-static XF86AttributeRec GammaAttributes[GAMMA_ATTRIBUTES] = {
+static const XF86AttributeRec GammaAttributes[GAMMA_ATTRIBUTES] = {
 	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA0"},
 	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA1"},
 	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA2"},
@@ -95,8 +94,7 @@ static XF86AttributeRec GammaAttributes[GAMMA_ATTRIBUTES] = {
 };
 
 #define NUM_IMAGES 4
-
-static XF86ImageRec Images[NUM_IMAGES] = {
+static const XF86ImageRec Images[NUM_IMAGES] = {
 	XVIMAGE_YUY2,
 	XVIMAGE_YV12,
 	XVIMAGE_I420,
@@ -660,7 +658,7 @@ XF86VideoAdaptorPtr sna_video_overlay_setup(struct sna *sna,
 		adaptor->pEncodings->height = IMAGE_MAX_HEIGHT_LEGACY;
 	}
 	adaptor->nFormats = NUM_FORMATS;
-	adaptor->pFormats = Formats;
+	adaptor->pFormats = (XF86VideoFormatPtr)Formats;
 	adaptor->nPorts = 1;
 	adaptor->pPortPrivates = (DevUnion *)&adaptor[1];
 
@@ -682,7 +680,7 @@ XF86VideoAdaptorPtr sna_video_overlay_setup(struct sna *sna,
 		att += GAMMA_ATTRIBUTES;
 	}
 	adaptor->nImages = NUM_IMAGES;
-	adaptor->pImages = Images;
+	adaptor->pImages = (XF86ImagePtr)Images;
 	adaptor->PutVideo = NULL;
 	adaptor->PutStill = NULL;
 	adaptor->GetVideo = NULL;
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 88a7368..55c78c9 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -49,14 +49,13 @@
 static Atom xvBrightness, xvContrast, xvSyncToVblank;
 
 #define NUM_FORMATS 3
-
-static XF86VideoFormatRec Formats[NUM_FORMATS] = {
+static const XF86VideoFormatRec Formats[NUM_FORMATS] = {
 	{15, TrueColor}, {16, TrueColor}, {24, TrueColor}
 };
 
 //#define NUM_TEXTURED_ATTRIBUTES 3
 #define NUM_TEXTURED_ATTRIBUTES 1
-static XF86AttributeRec TexturedAttributes[] = {
+static const XF86AttributeRec TexturedAttributes[] = {
 	{XvSettable | XvGettable, -1, 1, "XV_SYNC_TO_VBLANK"},
 	{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
 	{XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
@@ -70,7 +69,7 @@ static XF86AttributeRec TexturedAttributes[] = {
 #define XVMC_IMAGE 0
 #endif
 
-static XF86ImageRec Images[NUM_IMAGES] = {
+static const XF86ImageRec Images[NUM_IMAGES] = {
 	XVIMAGE_YUY2,
 	XVIMAGE_YV12,
 	XVIMAGE_I420,
@@ -406,7 +405,7 @@ XF86VideoAdaptorPtr sna_video_textured_setup(struct sna *sna,
 	adaptor->pEncodings[0].rate.numerator = 1;
 	adaptor->pEncodings[0].rate.denominator = 1;
 	adaptor->nFormats = NUM_FORMATS;
-	adaptor->pFormats = Formats;
+	adaptor->pFormats = (XF86VideoFormatPtr)Formats;
 	adaptor->nPorts = nports;
 	adaptor->pPortPrivates = devUnions;
 	adaptor->nAttributes = NUM_TEXTURED_ATTRIBUTES;
@@ -414,7 +413,7 @@ XF86VideoAdaptorPtr sna_video_textured_setup(struct sna *sna,
 	memcpy(attrs, TexturedAttributes,
 	       NUM_TEXTURED_ATTRIBUTES * sizeof(XF86AttributeRec));
 	adaptor->nImages = NUM_IMAGES;
-	adaptor->pImages = Images;
+	adaptor->pImages = (XF86ImagePtr)Images;
 	adaptor->PutVideo = NULL;
 	adaptor->PutStill = NULL;
 	adaptor->GetVideo = NULL;