Mesa (10.2): nouveau: fix MPEG4 hw decoding

[Emil Velikov]

Module: Mesa
Branch: 10.2
Commit: 4027062a3ce5fd4130b3a66498f69464170a276d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4027062a3ce5fd4130b3a66498f69464170a276d

Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date:   Wed Sep 10 13:18:54 2014 +0200

nouveau: fix MPEG4 hw decoding

Reorder some fields to make I-frame decoding work correctly.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Cc: "10.2 10.3" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 121ceb38f45daacc938349d9d5aa82776b78dbab)

---

 src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c b/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c
index 1dcb99c..06d7046 100644
--- a/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c
+++ b/src/gallium/drivers/nouveau/nouveau_vp3_video_vp.c
@@ -78,10 +78,10 @@ struct mpeg4_picparm_vp {
 	uint8_t top_field_first; // bool, written to vuc
 
 	uint8_t pad4[3]; // 59, 5a, 5b, contains garbage on blob
-	uint32_t pad5[0x10]; // 5c...9c non-inclusive, but WHY?
 
-	uint32_t intra[0x10]; // 9c
-	uint32_t non_intra[0x10]; // bc
+	uint32_t intra[0x10]; // 5c
+	uint32_t non_intra[0x10]; // 9c
+	uint32_t pad5[0x10]; // bc what does this do?
 	// udc..uff pad?
 };