소스 검색

nouveau/video: avoid overwriting base codec init with template

Commit 53e20b8b introduced the use of a template to initialize some
common fields. Move this copying of fields to before the common vp3
fields are initialized.

Reported-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Christian König <christian.koenig@amd.com>
tags/mesa-10.1-devel
Ilia Mirkin 12 년 전
부모
커밋
293fa4e559
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1
    1
      src/gallium/drivers/nv50/nv98_video.c
  2. 1
    1
      src/gallium/drivers/nvc0/nvc0_video.c

+ 1
- 1
src/gallium/drivers/nv50/nv98_video.c 파일 보기

@@ -86,6 +86,7 @@ nv98_create_decoder(struct pipe_context *context,
if (!dec)
return NULL;
dec->client = screen->client;
dec->base = *templ;
nouveau_vp3_decoder_init_common(&dec->base);

dec->bsp_idx = 5;
@@ -136,7 +137,6 @@ nv98_create_decoder(struct pipe_context *context,
for (i = 0; i < 5; i++)
PUSH_DATA (push[2], nv04_data.vram);

dec->base = *templ;
dec->base.context = context;
dec->base.decode_bitstream = nv98_decoder_decode_bitstream;


+ 1
- 1
src/gallium/drivers/nvc0/nvc0_video.c 파일 보기

@@ -86,6 +86,7 @@ nvc0_create_decoder(struct pipe_context *context,
if (!dec)
return NULL;
dec->client = screen->client;
dec->base = *templ;
nouveau_vp3_decoder_init_common(&dec->base);

if (!kepler) {
@@ -162,7 +163,6 @@ nvc0_create_decoder(struct pipe_context *context,
BEGIN_NVC0(push[2], SUBC_PPP(NV01_SUBCHAN_OBJECT), 1);
PUSH_DATA (push[2], dec->ppp->handle);

dec->base = *templ;
dec->base.context = context;
dec->base.decode_bitstream = nvc0_decoder_decode_bitstream;


Loading…
취소
저장