firmware: Add support for EGL images allocated by VCSM

See: raspberrypi/userland#344 firmware: egl_client: Avoid missing return value warning firmware: debug_sym: Use pointer type for user address
raspberrypi · Nov 16, 2016 · 64996b0 · 64996b0
1 parent c37de45
commit 64996b0
Show file tree

Hide file tree

Showing 41 changed files with 16 additions and 0 deletions.
diff --git a/boot/fixup.dat b/boot/fixup.dat
diff --git a/boot/fixup_db.dat b/boot/fixup_db.dat
diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat
diff --git a/boot/start.elf b/boot/start.elf
diff --git a/boot/start_cd.elf b/boot/start_cd.elf
diff --git a/boot/start_db.elf b/boot/start_db.elf
diff --git a/boot/start_x.elf b/boot/start_x.elf
diff --git a/hardfp/opt/vc/bin/raspistill b/hardfp/opt/vc/bin/raspistill
diff --git a/hardfp/opt/vc/bin/vchiq_test b/hardfp/opt/vc/bin/vchiq_test
diff --git a/hardfp/opt/vc/include/EGL/eglext_brcm.h b/hardfp/opt/vc/include/EGL/eglext_brcm.h
@@ -45,6 +45,14 @@ extern "C" {
 #define EGL_IMAGE_BRCM_MULTIMEDIA_U      0x99930C1
 #define EGL_IMAGE_BRCM_MULTIMEDIA_V      0x99930C2
 
+/* EGL image buffer allocated in shared memory */
+#define EGL_IMAGE_BRCM_VCSM              0x99930C3
+struct egl_image_brcm_vcsm_info {
+   unsigned width;
+   unsigned height;
+   unsigned int vcsm_handle;
+};
+
 #ifndef EGL_BRCM_sane_choose_config
 #define EGL_BRCM_sane_choose_config 1
 #endif

diff --git a/hardfp/opt/vc/lib/libEGL.so b/hardfp/opt/vc/lib/libEGL.so
diff --git a/hardfp/opt/vc/lib/libEGL_static.a b/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/hardfp/opt/vc/lib/libGLESv2.so b/hardfp/opt/vc/lib/libGLESv2.so
diff --git a/hardfp/opt/vc/lib/libGLESv2_static.a b/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/hardfp/opt/vc/lib/libWFC.so b/hardfp/opt/vc/lib/libWFC.so
diff --git a/hardfp/opt/vc/lib/libbrcmEGL.so b/hardfp/opt/vc/lib/libbrcmEGL.so
diff --git a/hardfp/opt/vc/lib/libbrcmGLESv2.so b/hardfp/opt/vc/lib/libbrcmGLESv2.so
diff --git a/hardfp/opt/vc/lib/libbrcmWFC.so b/hardfp/opt/vc/lib/libbrcmWFC.so
diff --git a/hardfp/opt/vc/lib/libdebug_sym_static.a b/hardfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/hardfp/opt/vc/lib/libkhrn_client.a b/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/hardfp/opt/vc/lib/libkhrn_static.a b/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/hardfp/opt/vc/lib/libvcfiled_check.a b/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/hardfp/opt/vc/lib/libvchostif.a b/hardfp/opt/vc/lib/libvchostif.a
diff --git a/hardfp/opt/vc/lib/libvcilcs.a b/hardfp/opt/vc/lib/libvcilcs.a
diff --git a/opt/vc/bin/raspistill b/opt/vc/bin/raspistill
diff --git a/opt/vc/bin/vchiq_test b/opt/vc/bin/vchiq_test
diff --git a/opt/vc/include/EGL/eglext_brcm.h b/opt/vc/include/EGL/eglext_brcm.h
@@ -45,6 +45,14 @@ extern "C" {
 #define EGL_IMAGE_BRCM_MULTIMEDIA_U      0x99930C1
 #define EGL_IMAGE_BRCM_MULTIMEDIA_V      0x99930C2
 
+/* EGL image buffer allocated in shared memory */
+#define EGL_IMAGE_BRCM_VCSM              0x99930C3
+struct egl_image_brcm_vcsm_info {
+   unsigned width;
+   unsigned height;
+   unsigned int vcsm_handle;
+};
+
 #ifndef EGL_BRCM_sane_choose_config
 #define EGL_BRCM_sane_choose_config 1
 #endif

diff --git a/opt/vc/lib/libEGL.so b/opt/vc/lib/libEGL.so
diff --git a/opt/vc/lib/libEGL_static.a b/opt/vc/lib/libEGL_static.a
diff --git a/opt/vc/lib/libGLESv2.so b/opt/vc/lib/libGLESv2.so
diff --git a/opt/vc/lib/libGLESv2_static.a b/opt/vc/lib/libGLESv2_static.a
diff --git a/opt/vc/lib/libWFC.so b/opt/vc/lib/libWFC.so
diff --git a/opt/vc/lib/libbrcmEGL.so b/opt/vc/lib/libbrcmEGL.so
diff --git a/opt/vc/lib/libbrcmGLESv2.so b/opt/vc/lib/libbrcmGLESv2.so
diff --git a/opt/vc/lib/libbrcmWFC.so b/opt/vc/lib/libbrcmWFC.so
diff --git a/opt/vc/lib/libdebug_sym_static.a b/opt/vc/lib/libdebug_sym_static.a
diff --git a/opt/vc/lib/libkhrn_client.a b/opt/vc/lib/libkhrn_client.a
diff --git a/opt/vc/lib/libkhrn_static.a b/opt/vc/lib/libkhrn_static.a
diff --git a/opt/vc/lib/libvcfiled_check.a b/opt/vc/lib/libvcfiled_check.a
diff --git a/opt/vc/lib/libvchostif.a b/opt/vc/lib/libvchostif.a
diff --git a/opt/vc/lib/libvcilcs.a b/opt/vc/lib/libvcilcs.a