xf86-video-intel: src/sna/sna_video.c src/sna/sna_video_textured.c
Chris Wilson
ickle at kemper.freedesktop.org
Fri Dec 21 13:42:04 PST 2012
src/sna/sna_video.c | 5 ++++-
src/sna/sna_video_textured.c | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 52fd223fc970118cbdcb31f9574414debc905e9c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Dec 21 21:36:30 2012 +0000
sna/video: Initialise alignment for video ports > 0
We repeatedly set the alignment value on the first port, rather than
once for each.
Reported-by: Jiri Slaby <jirislaby at gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47597
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 ebcf48d..d5b9c0f 100644
--- a/src/sna/sna_video.c
+++ b/src/sna/sna_video.c
@@ -200,6 +200,10 @@ sna_video_frame_init(struct sna *sna,
{
int align;
+ DBG(("%s: id=%d [planar? %d], width=%d, height=%d, align=%d\n",
+ __FUNCTION__, id, is_planar_fourcc(id), width, height, video->alignment));
+ assert(width && height);
+
frame->bo = NULL;
frame->id = id;
frame->width = width;
@@ -212,7 +216,6 @@ sna_video_frame_init(struct sna *sna,
align = 1024;
#endif
-
/* Determine the desired destination pitch (representing the chroma's pitch,
* in the planar case.
*/
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index c5947ed..e5cae85 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -453,7 +453,7 @@ XF86VideoAdaptorPtr sna_video_textured_setup(struct sna *sna,
struct sna_video *v = &video[i];
v->textured = true;
- video->alignment = 4;
+ v->alignment = 4;
v->rotation = RR_Rotate_0;
v->SyncToVblank = 1;
More information about the xorg-commit
mailing list