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