Merge branch 'amlogic-vdec' of https://github.com/Elyotna/linux-firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
2020-02-04 07:25:07 -05:00 · 2020-02-04 07:25:07 -05:00 · c2df39a790
parent 6d9f399102 fb505a691b
commit c2df39a790
12 changed files with 4 additions and 0 deletions
--- a/4
+++ b/4
@ -4793,6 +4793,7 @@ Licence: Redistributable. See LICENCE.microchip for details
 Driver: meson-vdec - Amlogic video decoder

 File: meson/vdec/g12a_h264.bin
+File: meson/vdec/g12a_hevc_mmu.bin
 File: meson/vdec/g12a_vp9.bin
 File: meson/vdec/gxbb_h264.bin
 File: meson/vdec/gxl_h263.bin
@ -4802,7 +4803,10 @@ File: meson/vdec/gxl_hevc_mmu.bin
 File: meson/vdec/gxl_mjpeg.bin
 File: meson/vdec/gxl_mpeg12.bin
 File: meson/vdec/gxl_mpeg4_5.bin
+File: meson/vdec/gxl_vp9.bin
 File: meson/vdec/gxm_h264.bin
+File: meson/vdec/sm1_hevc_mmu.bin
+File: meson/vdec/sm1_vp9_mmu.bin

 Licence: Redistributable. See LICENSE.amlogic_vdec for details.

--- a/meson/vdec/g12a_hevc_mmu.bin
+++ b/meson/vdec/g12a_hevc_mmu.bin
--- a/meson/vdec/g12a_vp9.bin
+++ b/meson/vdec/g12a_vp9.bin
--- a/meson/vdec/gxl_h264.bin
+++ b/meson/vdec/gxl_h264.bin
--- a/meson/vdec/gxl_hevc.bin
+++ b/meson/vdec/gxl_hevc.bin
--- a/meson/vdec/gxl_hevc_mmu.bin
+++ b/meson/vdec/gxl_hevc_mmu.bin
--- a/meson/vdec/gxl_mjpeg.bin
+++ b/meson/vdec/gxl_mjpeg.bin
--- a/meson/vdec/gxl_mpeg12.bin
+++ b/meson/vdec/gxl_mpeg12.bin
--- a/meson/vdec/gxl_vp9.bin
+++ b/meson/vdec/gxl_vp9.bin
--- a/meson/vdec/gxm_h264.bin
+++ b/meson/vdec/gxm_h264.bin
--- a/meson/vdec/sm1_hevc_mmu.bin
+++ b/meson/vdec/sm1_hevc_mmu.bin
--- a/meson/vdec/sm1_vp9_mmu.bin
+++ b/meson/vdec/sm1_vp9_mmu.bin