summaryrefslogtreecommitdiff
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@chown.ath.cx>2014-06-04 18:54:38 +0200
committerCarl Worth <cworth@cworth.org>2014-06-23 14:58:46 -0700
commit12fcbcde47e360e87c7f8525b271fd8d52c418bf (patch)
tree3d6060a5f80b650b8af8f63e398d7bcb4e8a567f /src/gallium/drivers
parentd8e3158a43813b8824652d61134f775d0bf9d071 (diff)
radeon/uvd: disable VC-1 simple/main on UVD 2.x
It's about as broken as on later UVD revisions. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66452 Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Christian König <christian.koenig@amd.com> (cherry picked from commit 6cd30f5d730c3c23251a8e72e17fe65810460764)
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/radeon/radeon_video.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c
index 63bd805be34..eae533e6f59 100644
--- a/src/gallium/drivers/radeon/radeon_video.c
+++ b/src/gallium/drivers/radeon/radeon_video.c
@@ -242,7 +242,10 @@ int rvid_get_video_param(struct pipe_screen *screen,
switch (param) {
case PIPE_VIDEO_CAP_SUPPORTED:
/* no support for MPEG4 */
- return codec != PIPE_VIDEO_FORMAT_MPEG4;
+ return codec != PIPE_VIDEO_FORMAT_MPEG4 &&
+ /* FIXME: VC-1 simple/main profile is broken */
+ profile != PIPE_VIDEO_PROFILE_VC1_SIMPLE &&
+ profile != PIPE_VIDEO_PROFILE_VC1_MAIN;
case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
/* and MPEG2 only with shaders */