aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <[email protected]>2014-08-24 12:22:08 +0200
committerEmil Velikov <[email protected]>2014-08-28 23:01:44 +0100
commit0c67167370bfbfee7d456812c13a87b239530dc9 (patch)
treeb524839e595a5e71e57c94288bd3bbbc0a4bb505
parent60f136eed9eb6d0622e44f6634162a702ba57c02 (diff)
radeon/uvd: fix field handling on R6XX style UVD
The first UVD generation can only do frame based output. Signed-off-by: Christian König <[email protected]> (cherry picked from commit 80771e47b6c1e47ab55f17311e1d4e227a9eb3d8) Nominated-by: Alex Deucher <[email protected]>
-rw-r--r--src/gallium/drivers/radeon/radeon_video.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c
index 17e9a59d81d..6dcee453348 100644
--- a/src/gallium/drivers/radeon/radeon_video.c
+++ b/src/gallium/drivers/radeon/radeon_video.c
@@ -251,8 +251,11 @@ int rvid_get_video_param(struct pipe_screen *screen,
profile != PIPE_VIDEO_PROFILE_VC1_MAIN;
case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
- /* and MPEG2 only with shaders */
- return codec != PIPE_VIDEO_FORMAT_MPEG12;
+ /* MPEG2 only with shaders and no support for
+ interlacing on R6xx style UVD */
+ return codec != PIPE_VIDEO_FORMAT_MPEG12 &&
+ /* TODO: RV770 might actually work */
+ rscreen->family > CHIP_RV770;
default:
break;
}