From 9255019a53506737210a25995f525986bec7b836 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 10 Aug 2013 17:51:01 -0400 Subject: [PATCH] nvc0: move firmware loading functions to nouveau Signed-off-by: Ilia Mirkin --- .../drivers/nouveau/nouveau_vp3_video.c | 101 ++++++++++++++++++ .../drivers/nouveau/nouveau_vp3_video.h | 5 + src/gallium/drivers/nvc0/nvc0_video.c | 92 +--------------- 3 files changed, 108 insertions(+), 90 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.c b/src/gallium/drivers/nouveau/nouveau_vp3_video.c index 6abc58193e8..a3387b3e565 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.c +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.c @@ -20,6 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include +#include +#include + #include "nouveau_screen.h" #include "nouveau_context.h" #include "nouveau_vp3_video.h" @@ -226,3 +230,100 @@ nouveau_vp3_decoder_init_common(struct pipe_video_decoder *dec) dec->begin_frame = nouveau_vp3_decoder_begin_frame; dec->end_frame = nouveau_vp3_decoder_end_frame; } + +static void vp4_getpath(enum pipe_video_profile profile, char *path) +{ + switch (u_reduce_video_profile(profile)) { + case PIPE_VIDEO_CODEC_MPEG12: { + sprintf(path, "/lib/firmware/nouveau/vuc-mpeg12-0"); + break; + } + case PIPE_VIDEO_CODEC_MPEG4: { + sprintf(path, "/lib/firmware/nouveau/vuc-mpeg4-0"); + break; + } + case PIPE_VIDEO_CODEC_VC1: { + sprintf(path, "/lib/firmware/nouveau/vuc-vc1-0"); + break; + } + case PIPE_VIDEO_CODEC_MPEG4_AVC: { + sprintf(path, "/lib/firmware/nouveau/vuc-h264-0"); + break; + } + default: assert(0); + } +} + +int +nouveau_vp3_load_firmware(struct nouveau_vp3_decoder *dec, + enum pipe_video_profile profile, + unsigned chipset) +{ + int fd; + char path[PATH_MAX]; + ssize_t r; + uint32_t *end, endval; + + vp4_getpath(profile, path); + + if (nouveau_bo_map(dec->fw_bo, NOUVEAU_BO_WR, dec->client)) + return 1; + + fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0) { + fprintf(stderr, "opening firmware file %s failed: %m\n", path); + return 1; + } + r = read(fd, dec->fw_bo->map, 0x4000); + close(fd); + + if (r < 0) { + fprintf(stderr, "reading firmware file %s failed: %m\n", path); + return 1; + } + + if (r == 0x4000) { + fprintf(stderr, "firmware file %s too large!\n", path); + return 1; + } + + if (r & 0xff) { + fprintf(stderr, "firmware file %s wrong size!\n", path); + return 1; + } + + end = dec->fw_bo->map + r - 4; + endval = *end; + while (endval == *end) + end--; + + r = (intptr_t)end - (intptr_t)dec->fw_bo->map + 4; + + switch (u_reduce_video_profile(profile)) { + case PIPE_VIDEO_CODEC_MPEG12: { + assert((r & 0xff) == 0xe0); + dec->fw_sizes = (0x2e0<<16) | (r - 0x2e0); + break; + } + case PIPE_VIDEO_CODEC_MPEG4: { + assert((r & 0xff) == 0xe0); + dec->fw_sizes = (0x2e0<<16) | (r - 0x2e0); + break; + } + case PIPE_VIDEO_CODEC_VC1: { + assert((r & 0xff) == 0xac); + dec->fw_sizes = (0x3ac<<16) | (r - 0x3ac); + break; + } + case PIPE_VIDEO_CODEC_MPEG4_AVC: { + assert((r & 0xff) == 0x70); + dec->fw_sizes = (0x370<<16) | (r - 0x370); + break; + } + default: + return 1; + } + munmap(dec->fw_bo->map, dec->fw_bo->size); + dec->fw_bo->map = NULL; + return 0; +} diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.h b/src/gallium/drivers/nouveau/nouveau_vp3_video.h index cb088fe69c9..5e40385ce45 100644 --- a/src/gallium/drivers/nouveau/nouveau_vp3_video.h +++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.h @@ -200,6 +200,11 @@ nouveau_vp3_video_buffer_create(struct pipe_context *pipe, void nouveau_vp3_decoder_init_common(struct pipe_video_decoder *decoder); +int +nouveau_vp3_load_firmware(struct nouveau_vp3_decoder *dec, + enum pipe_video_profile profile, + unsigned chipset); + uint32_t nouveau_vp3_bsp(struct nouveau_vp3_decoder *dec, union pipe_desc desc, struct nouveau_vp3_video_buffer *target, diff --git a/src/gallium/drivers/nvc0/nvc0_video.c b/src/gallium/drivers/nvc0/nvc0_video.c index 1a4a4574399..9f3710c922a 100644 --- a/src/gallium/drivers/nvc0/nvc0_video.c +++ b/src/gallium/drivers/nvc0/nvc0_video.c @@ -25,9 +25,6 @@ #include "util/u_sampler.h" #include "util/u_format.h" -#include -#include - int nvc0_screen_get_video_param(struct pipe_screen *pscreen, enum pipe_video_profile profile, @@ -110,29 +107,6 @@ nvc0_decoder_decode_bitstream(struct pipe_video_decoder *decoder, nvc0_decoder_ppp(dec, desc, target, comm_seq); } -static void nvc0_video_getpath(enum pipe_video_profile profile, char *path) -{ - switch (u_reduce_video_profile(profile)) { - case PIPE_VIDEO_CODEC_MPEG12: { - sprintf(path, "/lib/firmware/nouveau/vuc-mpeg12-0"); - break; - } - case PIPE_VIDEO_CODEC_MPEG4: { - sprintf(path, "/lib/firmware/nouveau/vuc-mpeg4-0"); - break; - } - case PIPE_VIDEO_CODEC_VC1: { - sprintf(path, "/lib/firmware/nouveau/vuc-vc1-0"); - break; - } - case PIPE_VIDEO_CODEC_MPEG4_AVC: { - sprintf(path, "/lib/firmware/nouveau/vuc-h264-0"); - break; - } - default: assert(0); - } -} - struct pipe_video_decoder * nvc0_create_decoder(struct pipe_context *context, enum pipe_video_profile profile, @@ -302,76 +276,14 @@ nvc0_create_decoder(struct pipe_context *context, } if (screen->device->chipset < 0xd0) { - int fd; - char path[PATH_MAX]; - ssize_t r; - uint32_t *end, endval; - ret = nouveau_bo_new(screen->device, NOUVEAU_BO_VRAM, 0, 0x4000, &cfg, &dec->fw_bo); - if (!ret) - ret = nouveau_bo_map(dec->fw_bo, NOUVEAU_BO_WR, dec->client); if (ret) goto fail; - nvc0_video_getpath(profile, path); - - fd = open(path, O_RDONLY | O_CLOEXEC); - if (fd < 0) { - fprintf(stderr, "opening firmware file %s failed: %m\n", path); - goto fw_fail; - } - r = read(fd, dec->fw_bo->map, 0x4000); - close(fd); - - if (r < 0) { - fprintf(stderr, "reading firmware file %s failed: %m\n", path); - goto fw_fail; - } - - if (r == 0x4000) { - fprintf(stderr, "firmware file %s too large!\n", path); - goto fw_fail; - } - - if (r & 0xff) { - fprintf(stderr, "firmware file %s wrong size!\n", path); - goto fw_fail; - } - - end = dec->fw_bo->map + r - 4; - endval = *end; - while (endval == *end) - end--; - - r = (intptr_t)end - (intptr_t)dec->fw_bo->map + 4; - - switch (u_reduce_video_profile(profile)) { - case PIPE_VIDEO_CODEC_MPEG12: { - assert((r & 0xff) == 0xe0); - dec->fw_sizes = (0x2e0<<16) | (r - 0x2e0); - break; - } - case PIPE_VIDEO_CODEC_MPEG4: { - assert((r & 0xff) == 0xe0); - dec->fw_sizes = (0x2e0<<16) | (r - 0x2e0); - break; - } - case PIPE_VIDEO_CODEC_VC1: { - assert((r & 0xff) == 0xac); - dec->fw_sizes = (0x3ac<<16) | (r - 0x3ac); - break; - } - case PIPE_VIDEO_CODEC_MPEG4_AVC: { - assert((r & 0xff) == 0x70); - dec->fw_sizes = (0x370<<16) | (r - 0x370); - break; - } - default: + ret = nouveau_vp3_load_firmware(dec, profile, screen->device->chipset); + if (ret) goto fw_fail; - } - munmap(dec->fw_bo->map, dec->fw_bo->size); - dec->fw_bo->map = NULL; } if (codec != 3) { -- 2.30.2