On 10/30/19 11:09 AM, Ruei, Eric wrote: > On 10/30/2019 11:01 AM, Andrew F. Davis wrote: >> On 10/30/19 10:41 AM, Ruei, Eric wrote: >>> On 10/29/2019 5:13 PM, Denys Dmytriyenko wrote: >>>> On Tue, Oct 29, 2019 at 09:53:45AM -0400, Eric Ruei wrote: >>>>> This hack is required tentatively until GBM_MODIFIERS is fully >>>>> supported >>>>> by Mesa-based EGL. >>>>> >>>>> Signed-off-by: Eric Ruei <[email protected]> >>>>> --- >>>>> ...mposito-drm-undef-HAVE_GBM_MODIFIERS.patch | 29 >>>>> +++++++++++++++++++ >>>>> .../wayland/weston_5.0.0.bbappend | 3 +- >>>>> 2 files changed, 31 insertions(+), 1 deletion(-) >>>>> create mode 100644 >>>>> meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch >>>>> >>>>> >>>>> >>>>> diff --git >>>>> a/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch >>>>> >>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch >>>>> >>>>> >>>>> new file mode 100644 >>>>> index 00000000..56a78e46 >>>>> --- /dev/null >>>>> +++ >>>>> b/meta-arago-distro/recipes-graphics/wayland/weston/0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch >>>>> >>>>> >>>>> @@ -0,0 +1,29 @@ >>>>> +From e406b4141c23fb762a14a09d565c363ebaccb5a4 Mon Sep 17 00:00:00 >>>>> 2001 >>>>> +From: Eric Ruei <[email protected]> >>>>> +Date: Sun, 1 Sep 2019 08:28:27 -0400 >>>>> +Subject: [PATCH] HACK: composito-drm: undef HAVE_GBM_MODIFIERS >>>>> + >>>>> +HAVE_GBM_MODIFIERS is defined, but not fully supported by the gbm >>>>> module >>>>> +yet. >>>> >>>> Upstream-Status: Inappropriate [reason] >>>> >>>> >>> >>> Denys: >>> >>> Thanks!This patch is no longer needed and I shall remove it at v2. >>> >> >> >> Why is this no longer needed? Last time I built this we still had >> failures without explicitly disabling GBM_MODIFIERS. >> >> Andrew >> >> > > The HAVE_GBM_MODIFIERS is no longer defined anywhere. Is it expected? > I am able to rebuild Weston without this patch. >
What version of Weston do you have? What keeps the code from trying to use gbm with modifiers? The build will work as the right functions are exposed (gbm_surface_create_with_modifiers(), etc..) but when used they will always return "not supported" and we won't get a surface back. I still see HAVE_GBM_MODIFIERS used in even the latest Weston[0]. [0] https://gitlab.freedesktop.org/wayland/weston/blob/master/libweston/backend-drm/drm-gbm.c Andrew > Best regards, > > Eric > > > >>> Eric >>> >>>>> +Signed-off-by: Eric Ruei <[email protected]> >>>>> +--- >>>>> + libweston/compositor-drm.c | 2 ++ >>>>> + 1 file changed, 2 insertions(+) >>>>> + >>>>> +diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c >>>>> +index d92ecfcd..88f845a8 100644 >>>>> +--- a/libweston/compositor-drm.c >>>>> ++++ b/libweston/compositor-drm.c >>>>> +@@ -68,6 +68,8 @@ >>>>> + #include "linux-dmabuf-unstable-v1-server-protocol.h" >>>>> + #include "linux-explicit-synchronization.h" >>>>> + >>>>> ++#undef HAVE_GBM_MODIFIERS >>>>> ++ >>>>> + #ifndef DRM_CLIENT_CAP_ASPECT_RATIO >>>>> + #define DRM_CLIENT_CAP_ASPECT_RATIO 4 >>>>> + #endif >>>>> +-- >>>>> +2.17.1 >>>>> + >>>>> diff --git >>>>> a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend >>>>> b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend >>>>> index 1bdcf7e4..94a5bc60 100644 >>>>> --- a/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend >>>>> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_5.0.0.bbappend >>>>> @@ -2,7 +2,7 @@ >>>>> PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor >>>>> WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev >>>>> >>>>> mtdev" >>>>> PACKAGECONFIG[kms] = >>>>> "--enable-drm-compositor,--disable-drm-compositor,drm udev >>>>> virtual/libgbm mtdev" >>>>> -PR_append = ".arago34" >>>>> +PR_append = ".arago35" >>>>> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" >>>>> @@ -26,6 +26,7 @@ SRC_URI += " \ >>>>> file://0011-compositor-Add-scene-graph-debug-scope.patch \ >>>>> >>>>> file://0012-compositor-drm-Add-backend-pointer-to-drm_output.patch \ >>>>> >>>>> file://0013-compositor-drm-Add-drm-backend-log-debug-scope.patch \ >>>>> + file://0001-HACK-composito-drm-undef-HAVE_GBM_MODIFIERS.patch \ >>>>> " >>>>> INHIBIT_PACKAGE_STRIP = "1" >>>>> -- >>>>> 2.17.1 >>>>> >>>>> _______________________________________________ >>>>> meta-arago mailing list >>>>> [email protected] >>>>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago >>> > _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
