1From c26a8a44c1cbd13addfe0ece6702d0cf831c4640 Mon Sep 17 00:00:00 2001 2From: Jeffy Chen <jeffy.chen@rock-chips.com> 3Date: Thu, 6 Dec 2018 18:53:05 +0800 4Subject: [PATCH 10/93] HACK: gl-renderer: Workaround dmabuf import/attach for 5 old mali 6 7Tested on px3se with libmali-utgard-400-r7p0-r3p0-wayland.so, the 8mpp + waylandsink works. 9 10Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 11--- 12 libweston/renderer-gl/gl-renderer-internal.h | 2 ++ 13 libweston/renderer-gl/gl-renderer.c | 13 ++++++++++++- 14 2 files changed, 14 insertions(+), 1 deletion(-) 15 16diff --git a/libweston/renderer-gl/gl-renderer-internal.h b/libweston/renderer-gl/gl-renderer-internal.h 17index aae303e..c9d0b8a 100644 18--- a/libweston/renderer-gl/gl-renderer-internal.h 19+++ b/libweston/renderer-gl/gl-renderer-internal.h 20@@ -204,6 +204,8 @@ struct gl_renderer { 21 */ 22 struct wl_list shader_list; 23 struct weston_log_scope *shader_scope; 24+ 25+ bool is_mali_egl; 26 }; 27 28 static inline struct gl_renderer * 29diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c 30index edb2fba..448dcbb 100644 31--- a/libweston/renderer-gl/gl-renderer.c 32+++ b/libweston/renderer-gl/gl-renderer.c 33@@ -2303,6 +2303,14 @@ import_simple_dmabuf(struct gl_renderer *gr, 34 attribs[atti++] = EGL_IMAGE_PRESERVED_KHR; 35 attribs[atti++] = EGL_TRUE; 36 37+ /* Old mali needs extra attributes */ 38+ if (gr->is_mali_egl) { 39+ attribs[atti++] = EGL_YUV_COLOR_SPACE_HINT_EXT; 40+ attribs[atti++] = EGL_ITU_REC601_EXT; 41+ attribs[atti++] = EGL_SAMPLE_RANGE_HINT_EXT; 42+ attribs[atti++] = EGL_YUV_NARROW_RANGE_EXT; 43+ } 44+ 45 if (attributes->modifier[0] != DRM_FORMAT_MOD_INVALID) { 46 if (!gr->has_dmabuf_import_modifiers) 47 return NULL; 48@@ -2620,7 +2628,7 @@ gl_renderer_query_dmabuf_formats(struct weston_compositor *wc, 49 50 if (!gr->has_dmabuf_import_modifiers || 51 !gr->query_dmabuf_formats(gr->egl_display, 0, NULL, &num)) { 52- num = gr->has_gl_texture_rg ? ARRAY_LENGTH(fallback_formats) : 2; 53+ num = (gr->has_gl_texture_rg || gr->is_mali_egl) ? ARRAY_LENGTH(fallback_formats) : 2; 54 fallback = true; 55 } 56 57@@ -3230,6 +3238,9 @@ log_egl_info(struct gl_renderer *gr, EGLDisplay egldpy) 58 str = eglQueryString(egldpy, EGL_VENDOR); 59 weston_log("EGL vendor: %s\n", str ? str : "(null)"); 60 61+ if (!strcmp(str, "ARM")) 62+ gr->is_mali_egl = 1; 63+ 64 str = eglQueryString(egldpy, EGL_CLIENT_APIS); 65 weston_log("EGL client APIs: %s\n", str ? str : "(null)"); 66 67-- 682.20.1 69 70