Commit 68d0d264 authored by Xiang, Haihao's avatar Xiang, Haihao

i965_drv_video: don't support MPEG2/VC1/H264 without BSD support on SandyBridge.

Signed-off-by: default avatarXiang, Haihao <haihao.xiang@intel.com>
parent d145c3aa
...@@ -49,13 +49,15 @@ ...@@ -49,13 +49,15 @@
#define IMAGE_ID_OFFSET 0x0a000000 #define IMAGE_ID_OFFSET 0x0a000000
#define SUBPIC_ID_OFFSET 0x10000000 #define SUBPIC_ID_OFFSET 0x10000000
#define HAS_VC1(ctx) (IS_GEN6((ctx)->intel.device_id)) #define HAS_MPEG2(ctx) (IS_G4X((ctx)->intel.device_id) || \
IS_IRONLAKE((ctx)->intel.device_id) || \
(IS_GEN6((ctx)->intel.device_id) && (ctx)->intel.has_bsd))
/* Defined to 1 if GPU supports H.264 decoding */ #define HAS_H264(ctx) ((IS_GEN6((ctx)->intel.device_id) || \
/* XXX: drop IS_IRONLAKE(ctx) check once G4X support is available */ IS_IRONLAKE((ctx)->intel.device_id)) && \
#define HAS_H264(ctx) (IS_GEN6((ctx)->intel.device_id) || \ (ctx)->intel.has_bsd)
(IS_IRONLAKE((ctx)->intel.device_id) && \
(ctx)->intel.has_bsd)) #define HAS_VC1(ctx) (IS_GEN6((ctx)->intel.device_id) && (ctx)->intel.has_bsd)
#define HAS_TILED_SURFACE(ctx) (IS_GEN6((ctx)->intel.device_id)) #define HAS_TILED_SURFACE(ctx) (IS_GEN6((ctx)->intel.device_id))
...@@ -133,8 +135,10 @@ i965_QueryConfigProfiles(VADriverContextP ctx, ...@@ -133,8 +135,10 @@ i965_QueryConfigProfiles(VADriverContextP ctx,
struct i965_driver_data * const i965 = i965_driver_data(ctx); struct i965_driver_data * const i965 = i965_driver_data(ctx);
int i = 0; int i = 0;
profile_list[i++] = VAProfileMPEG2Simple; if (HAS_MPEG2(i965)) {
profile_list[i++] = VAProfileMPEG2Main; profile_list[i++] = VAProfileMPEG2Simple;
profile_list[i++] = VAProfileMPEG2Main;
}
if (HAS_H264(i965)) { if (HAS_H264(i965)) {
profile_list[i++] = VAProfileH264Baseline; profile_list[i++] = VAProfileH264Baseline;
...@@ -167,7 +171,8 @@ i965_QueryConfigEntrypoints(VADriverContextP ctx, ...@@ -167,7 +171,8 @@ i965_QueryConfigEntrypoints(VADriverContextP ctx,
switch (profile) { switch (profile) {
case VAProfileMPEG2Simple: case VAProfileMPEG2Simple:
case VAProfileMPEG2Main: case VAProfileMPEG2Main:
entrypoint_list[n++] = VAEntrypointVLD; if (HAS_MPEG2(i965))
entrypoint_list[n++] = VAEntrypointVLD;
break; break;
case VAProfileH264Baseline: case VAProfileH264Baseline:
...@@ -270,7 +275,7 @@ i965_CreateConfig(VADriverContextP ctx, ...@@ -270,7 +275,7 @@ i965_CreateConfig(VADriverContextP ctx,
switch (profile) { switch (profile) {
case VAProfileMPEG2Simple: case VAProfileMPEG2Simple:
case VAProfileMPEG2Main: case VAProfileMPEG2Main:
if (VAEntrypointVLD == entrypoint) { if (HAS_MPEG2(i965) && VAEntrypointVLD == entrypoint) {
vaStatus = VA_STATUS_SUCCESS; vaStatus = VA_STATUS_SUCCESS;
} else { } else {
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT; vaStatus = VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment