From patchwork Tue Mar 4 15:57:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001060 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AB3B0C282D9 for ; Tue, 4 Mar 2025 16:02:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EC6BC10E634; Tue, 4 Mar 2025 16:02:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="WYyVxY83"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 86AE310E62D for ; Tue, 4 Mar 2025 16:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104124; x=1741708924; i=info@metux.net; bh=8QTGXW4VwzyIsVibbSOgqJsT00gZ4wI+37H98Gk1UZw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=WYyVxY83KQ7bD8Dw3wzctw2R2Wu+WgOQTxHSzFiMs0KsjsgOuLSTS6ctf/q09gVT uX5PFwLSoOkPKNkCa8kMoUxvq3HPIY59bmySezlNtGxgdqNTDED/izFallwmSxwZ2 uDOwTOCjJP3t9KapjbWks1vcvTUfFTJqUB3hfI8xY2OHyjIolUZqyiGC30Z+AcNEV D2Ytwr0kmkQoisDFNXrzsTOKetE5rwN3NQzrYjXrv9F1h4xggeADdSIQbCaH0zc5F t5s5vZXKsD6Vi8+JjRBX69w8iDY9kwV535LufP0GGw5d52KSHMQNxT/eR+Ur+WPZi tFsBdZud+qilMhznyw== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M9nlN-1tsXZQ1FK9-00FxMi; Tue, 04 Mar 2025 16:56:29 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 01/16] meson.build: fix missing Xv dependencies Date: Tue, 4 Mar 2025 16:57:54 +0100 Message-Id: <20250304155809.30399-2-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:uPOpZYd4fqt0+lxgDCkloGPIi7/lzUf0m69GCCu6AWzJBobtjDm gRDo5c7MbOova/S8Cwwgt12RE3qxe+77A0H63EMyL1Iu0benRXg840HmpTZRk4CR86DkqHH 41Mb+ukq3ib8g1MWCkdroRRB6PeyK9zUtVxYAK9dVu9tUdtI27FDAemBDvJx+8uGuJKh8Rk 3mEilKdzIsGV9cSv1j6Hw== UI-OutboundReport: notjunk:1;M01:P0:Db2DT/SAc8A=;oHPqakQHWywHMe9iQPxeWW5yTzM UvwPgvrBUcYEOfxtjHFSa8EoKDL75Xx6CdTWNliXTN1nTHzIq3JMdC+mD2tu0K4GNfKdJYX3l 2CmO0CFX+d2vXUrv44BW6YWBP4n+Zp7E6cYSG8tr4XjY2iU5k5nRoAYDWPu+r0EFnkuk0f/ge 49tZqFi8n6XkHhnlFiCGZ/bKJPhK7oc1XfG6DaQyu4GshRP6AySm9jKua1secUXXEUPW3COig Ex2zZVo2ZHO3slD0uiIqMRDIlVVZJYfQmh5PThwwVoArkDKKtfQ9kYdFveoJA0z6zxbiQrcJ8 HcG5PV3C4oblvfF48W2wsBiVo3jisQsC/qhNO1vwgAYXF9KlmQJL47tfw6P3qioHNP7PsuUpY DvNzOLSXquwgEm0+f43EhUYFTxNMBGHS2jPJlgHFOpRvjiPOPcSOvrgwW5YEV+NCpmvzB/tju Pkpf6Y1K2cEY1FPrlw2shk5TPSKAiHH4tGSFxj0+E1ODVsWMz+RH/xh+RTFJxzTaSlg11bQ9e LZwhLQQq8EA4dQLY3sEh7aj8ous7HZNIeA2zBoeAPRGArTzT/b5DxoNAQKUHwobc3rNtQCQJ5 DP+7Dx3UqGkE3UAKhwoeW7Gvc1Z+JkeYg5MBaoaZ1S/mFREUGGVQMdget7pYGm4ajaIswTEoT 0Ku1xnEXztjUPzLqK4xE6zmDgZ2M2iJG31YYUKCn5kolzvSoShU2b4h1zK5YyGZIxNVYJh5rg 1u5OYD+kGP1r8r97T+Efpq9UrzPUvDeueYOZhyMCoCWCrweHq8UpPKijkVoEtiEAJMRcH5G6i s+7VImD5aQajNkJRYbHlH3oa1evA82GqfGg693ci7a87tN+k/lhlyksg4//W+R3HdFl4eiE06 /K0vlpuOB39n3jeHwdXq0QyyuEo3sUaA28kggqrMXBwAlXx/9SRyGGspX3vtGxLZg3buoMmFq CogC/Cgj+mpYlTVuXT3f3b1MdiBCWJXekPvQQxFug0GzLmqAhCXONNgrftu9xeccHJk5Gkajw XQjEuG36JG3UkPT1UuZC/Nf7mV9TGzkdlNc3JmN0vzIe0hyEsRNII08LGK8jrIe5LSrRLClEY Jxztd6EAkc4GiHuS2hbSEtV47GYnkC0BTyLfbEDen5tghyzsaJoshheKmSY5WlxzxhONjDhMy VZEqI3OmXCkc0MklMB8SPWc6Qnq+VR2ksGAogO/T3+0lGh6daeClxh6qyajEeFQkcdsokMpPx /xk0T3JohjQWL5AQTcAobMMi+1TnSxOeY79QAQ3q4fPApN7bYdzVWnXk8r1/CPYhN9lxUx2AL luCdtsgOFGX74EH4a0j0Yp77cfueo9JREN2OFs9ZY4kvlQzKItSmOORzQ3spw/RZkHEfNJzZ4 U7FPkXduGYLUG8qA== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" libXv needs be be explicitly linked, otherwise getting error: FAILED: xvmc/libIntelXvMC.so.1.0.0 cc -o xvmc/libIntelXvMC.so.1.0.0 xvmc/libIntelXvMC.so.1.0.0.p/intel_xvmc.c.o xvmc/libIntelXvMC.so.1.0.0.p/intel_xvmc_dump.c.o xvmc/libIntelXvMC.so.1.0.0.p/i915_xvmc.c.o xvmc/libIntelXvMC.so.1.0.0.p/i965_xvmc.c.o xvmc/libIntelXvMC.so.1.0.0.p/xvmc_vld.c.o xvmc/libIntelXvMC.so.1.0.0.p/intel_batchbuffer.c.o -Wl,--as-needed -Wl,--no-undefined -shared -fPIC -Wl,--start-group -Wl,-soname,libIntelXvMC.so.1 -pthread /usr/lib/x86_64-linux-gnu/libX11.so /usr/lib/x86_64-linux-gnu/libXvMC.so /usr/lib/x86_64-linux-gnu/libX11-xcb.so /usr/lib/x86_64-linux-gnu/libxcb.so /usr/lib/x86_64-linux-gnu/libxcb-util.so /usr/lib/x86_64-linux-gnu/libxcb-dri2.so /usr/lib/x86_64-linux-gnu/libdrm_intel.so /usr/lib/x86_64-linux-gnu/libdrm.so -Wl,--end-group /usr/bin/ld: xvmc/libIntelXvMC.so.1.0.0.p/intel_xvmc.c.o: in function `XvMCCreateSurface': /home/nekrad/src/xorg/drivers/xf86-video-intel/_build/../xvmc/intel_xvmc.c:432: undefined reference to `XvCreateImage' /usr/bin/ld: xvmc/libIntelXvMC.so.1.0.0.p/intel_xvmc.c.o: in function `XvMCPutSurface': /home/nekrad/src/xorg/drivers/xf86-video-intel/_build/../xvmc/intel_xvmc.c:666: undefined reference to `XvPutImage' collect2: error: ld returned 1 exit status Signed-off-by: Enrico Weigelt, metux IT consult --- src/legacy/i810/xvmc/meson.build | 1 + xvmc/meson.build | 1 + 2 files changed, 2 insertions(+) -- 2.39.5 diff --git a/src/legacy/i810/xvmc/meson.build b/src/legacy/i810/xvmc/meson.build index cd05f3ef..3505f15b 100644 --- a/src/legacy/i810/xvmc/meson.build +++ b/src/legacy/i810/xvmc/meson.build @@ -4,6 +4,7 @@ shared_library('I810XvMC', sources : 'I810XvMC.c', dependencies : [ dependency('x11', required : true), + dependency('xv', required : true), dependency('xvmc', required : true), dependency('xorg-server', required : true), dependency('libdrm', required : true), diff --git a/xvmc/meson.build b/xvmc/meson.build index 0ecc51e5..eeba2b66 100644 --- a/xvmc/meson.build +++ b/xvmc/meson.build @@ -14,6 +14,7 @@ shared_library('IntelXvMC', dependencies : [ dependency('threads', required : true), dependency('x11', required : true), + dependency('xv', required : true), dependency('xvmc', required : true), dependency('xorg-server', required : true), dependency('x11-xcb', required : true), From patchwork Tue Mar 4 15:57:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001056 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAC6AC021B8 for ; Tue, 4 Mar 2025 16:02:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D9AD10E323; Tue, 4 Mar 2025 16:02:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="AdAPQNfG"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B3B810E62D for ; Tue, 4 Mar 2025 16:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104123; x=1741708923; i=info@metux.net; bh=X/nFQJql+na/DqwwbynG0M7lUDIV3DZ4s+yKQ+ouU/0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=AdAPQNfGbmboidUZDzDDrfCP+dDI7RGkqPzA21dbYjBBCr9I62V85R8sapYfDkHC Le1k5OJfbOio2OwsbN8khHJLzuz9Taxx1uUg0IU3sg6KJcMS1xgnec6Ng+IEHyDFc RbE2492Y4q5h4CendzktYOhjqwxXGw+aic3usGfSih4XWNu95uYkLm2tqVxjxJ3Yo /g02vu2PMmM7AdHWTkzpgmLK7QOlMSJ1TS4+cx/eaKwca/kd7B6kC35jT5w7Le3oi mfvKlTGB7jev62rHRHiOnEWs/CtyC5UdsLajbTCTyPyu+yVeqJLqo2guZewPNGq6F 3sZGxHg8xYkHCctm0g== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MeTkC-1tFKvp2gzc-00lBNV; Tue, 04 Mar 2025 16:56:29 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 02/16] sna: stop using obsolete type aliases Date: Tue, 4 Mar 2025 16:57:55 +0100 Message-Id: <20250304155809.30399-3-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:Y7a2XpL5xzh5yXVg4vrPgGExH9JWE0rSkhEvrDopDjegZft0mAZ a4nmt+XUOAs5LMG/S3lwNBdmuucNxXj45gwTyumwXyFiDpiawFVqP9R3GAILw0PyhYq7Uca CL2Cdx9GAy70wdDgnVlMxl4lj9zxPmTDKEXaxx0mKHr60bB6HqZN7R49SXfHvVfvMrMr5Zq bmdsfhhP+GEEJXcyOAMUg== UI-OutboundReport: notjunk:1;M01:P0:6XQOeC/W7n0=;tQpSUFeIVa79lL4AeieQ8F7pZJz V2KIegE+MItBKLzvnsXnRMGcIDFE9nbczA+k9+PGlafSc0MEFjKiKrvVOYpFjC1SfiVPogVw9 6wyiMo68x6TbEMPtBcLa6vhOY+0NkUutRLQJCX9xpn2ZMDl7Xdz3YhaF+ClSfAppU5+Ysyv0I foE0wEq7ETMM+NHWZBHTUZG4KoH++lOoY8T90rrgLSPlY03zAQIr6Yyl7QUVCjN7UcEDntUWX /9EnTQm0OVyBwOOrBB6l+erLsXY3WdQHYjqAhWkqethbawnauG31Sqwq5+HnETwSby1po3xo1 MxYG21q00qhnyMoIqOKkyxW20HFA0x+763oASVT/f4vvP9KPOGkq3XxFIT0MocIx87wf5D3rP LiwheOVW7kQJgg106HncgeIpdVL5y+6EGzkwF52dVqsbChqsK9fY5fa+fufLlGF2oZQzFAjxP x7hG5AbToDDFAUKlk9umMk8TXoOvprn/WpZjFH3hgh8zUGQPTUt+yN/xnjY22TntxkHwhW8Gd tewEFn6E+DXeHm92MN/UVL1ioIYM+MhMO+LZ65LR6LgQk0t3vUIX3AeBsdV1AOC57E4zgpv2V 3611yw/Qd4P9CpOxh7xj9IzifFXlcpHEfJktnU4ZeaEbgcU6Pfr8VNYKDTpiIhvQX4t3AtyLn Fr0kVE7dzYkO+5r4n/k0L/sQ3dJLrsBCYdL61KOzOOxv/phoD7NDOVoeiht7NVGE75XfTtbL9 vqzhfY6ZSqkjo8I/AyfYZoTBamTgJcmBfUZjA2C+toA/6Sqej9Rs2/xFze2i+onT7gxTQ647x 8N62iprCEaW7pwP4aRzGWJJeQ1aA08jqNalW7elATc5jKuSgkv/BBFF5NALLdDsuIWlUN/XNM J+pY9KjCyMSg+vBZJk5Bac+MEq6AKC4rFrflCKkF4lw55WFVFLzhZoUcMZYtJNAQLMVxYqgqh VSo/Q7hkBV5gJRa01Ewycnd/d1ijjQYz6adqnTqwfUL735dTmPHyYrTPr1GIsLu/BDoFFHtC9 XVuDRRmDbsBUrDl4dGlpuUVfW00nGWdl4vdZENxSeexSjBmIdnR/o9I5sji/LgbgswXEYNhyF JB4+8OntCRO7ubtCfqz8OJ5RsuIUu9HTYLasKchjAp7pPeE/NSJ8Kp1TuksbqbBB6o3ScUjE+ YC8fJPkHCLixzW82xGUWM+E/8I670wTbG3ECtV19jn0tURFxC6A6XEQ3lgVHw+aTi9JD9w3Nb /NOsb1ilQypvuXJNanewhR3YErgY31YlMFsXeR5jvpxT+JRk3UqpCNkVL2hOCYLFBZ//N3faD S0WdGjhK+Q345f5ZghTjkIZKt+4n4qXb9GSlyHGjBoKbl92/xP7lKY7IBZWshdCr5DaWPIdiO QGEBv9zxneacdT+g== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The Xserver has been moved to using pixman for all matrix operations, back in 2008, but left some #define's so drivers still compile. Since 1.5 decades have passed now, it's time to fix remaining drivers still using the old name, so we can drop these #define's from the Xserver includes. Signed-off-by: Enrico Weigelt, metux IT consult --- src/sna/sna_display.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.39.5 diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index d4fa7b0b..d33a88af 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -208,7 +208,7 @@ struct sna_crtc { bool hwcursor; bool flip_pending; - struct pict_f_transform cursor_to_fb, fb_to_cursor; + struct pixman_f_transform cursor_to_fb, fb_to_cursor; RegionRec crtc_damage; uint16_t shadow_bo_width, shadow_bo_height; @@ -2383,7 +2383,7 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc) { RRTransformPtr transform; PictTransform crtc_to_fb; - struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc; + struct pixman_f_transform f_crtc_to_fb, f_fb_to_crtc; unsigned pitch_limit; BoxRec b; @@ -2853,7 +2853,7 @@ affine_is_pixel_exact(const struct pixman_f_transform *t) static void sna_crtc_randr(xf86CrtcPtr crtc) { struct sna_crtc *sna_crtc = to_sna_crtc(crtc); - struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc; + struct pixman_f_transform f_crtc_to_fb, f_fb_to_crtc; PictTransform crtc_to_fb; PictFilterPtr filter; xFixed *params; @@ -6674,7 +6674,7 @@ sna_set_cursor_position(ScrnInfoPtr scrn, int x, int y) if (crtc->transform_in_use) { int xhot = sna->cursor.ref->bits->xhot; int yhot = sna->cursor.ref->bits->yhot; - struct pict_f_vector v, hot; + struct pixman_f_vector v, hot; v.v[0] = x + xhot + .5; v.v[1] = y + yhot + .5; From patchwork Tue Mar 4 15:57:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E19DEC282D6 for ; Tue, 4 Mar 2025 16:02:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 59B7910E641; Tue, 4 Mar 2025 16:02:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="lWtFvcYe"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41A0B10E639 for ; Tue, 4 Mar 2025 16:02:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104127; x=1741708927; i=info@metux.net; bh=D6cWD8znevIInIEZcXpDwfXug77mfV1HLdsF9rVzKqY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=lWtFvcYeVWpW38J3ZhE9jN0Gitiz2FXp4a5KlxkwaMqFFPFO7Aed4KD8cJENGR9q HYvUteNy7WF8CDifKZW7aCZuA0UakYOn5cgA4J1/a6ufLBa15HEKlNfOf/gu6spe4 12JTtNqvg/I4mW0HP8pGxrGdf8bA0zkQjWgagiBYj9hQ7K0jteG2lvNap3ly+XXWF ds/HKzDHo5GJxvXbtwk7qf7SYeQawPOp8or7KJ87BizLkrz4tWWam3kPuWkVoJVew tYHjWR0XbLsnOAu1EKpoZ1Jw4NJ26IucQsI3TqCXLs5kawiT0UhOIDM4Z1NvZJgLf jniC3f4ExR22hqA0gg== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M6UuX-1tvqQG48PB-00ErRA; Tue, 04 Mar 2025 16:56:30 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 03/16] tools: fix FTBS on FreeBSD Date: Tue, 4 Mar 2025 16:57:56 +0100 Message-Id: <20250304155809.30399-4-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:WrIIr5figTgT9W0YyJ+sAQZ0KLY8ygKJqhiqf2gkJGfG0g6FoB4 5+3mXRxv7ZanJEF5iAYjXMFcv6um6h4S7BMs0sYtYWFErwEWqdu2IlB0Gv1G2YPmRBtmMgu 1GdH2RGrk3XxD4SjRiPm44IJBOJX397Dl3NIJX/OwFt/uw53Vm1i80mDemNNYtmTZ01Atqc mi5JoX0Nn2zCCpAvOsNRA== UI-OutboundReport: notjunk:1;M01:P0:dOz4WBCIqZc=;dEWd2SFw86LwXwJx/72UcMRfxUV IsPCVskxMPu3nMMtdkVDalXVlRcsltHvFYARkNUQe2OnwF+XGAZpfM0BDOJ89Zd/ISkMwayqb bc+9V6r9fLcCiwbYfnW8cMFsLXGqKkUnMAQZ7dHw525Q9xIin9ihyPTLe/SUrG6XdGxXkAcaz hVbL+hmj9pPISnPIPsS8VqbtkYngiqKcikS0NkPSc0RhhXtaYRROysJAKw6LxXYTw7VLxk85Q 6S7RJieNqf0EtG+5miWTge5kpi/kpTIRo4X4wvecz8gp0Mpq15PWHQ1VbdkvHJFrAspapgZrg MoikOFevEigWtyNBv7rtLxwm4QAEV+/Qq3M8t9Qql87f2V3PFcxikv/ohXmtjtROiJjk07UK1 ElzLCyI5Cpu5T7qrye2te7GxPwGQsa9kdFXCWIe2WGTvz37PbbGi5TTT18MD681tUiGdM4x03 MWrqE/6WQkt/k43GUWvbpCd36ssgu+E2oN9+VYa79nu1lM/lGNdUoAL92CAI1jzh3hk30g1FP 6V6h/qT3eo95GXgxPOEJ1F9enjfl57RYKPdLoFjDDBncUq10ajptMzmOLcsVH+IhG5FrLyBCg e0IVq+5kqGDbYcHlO6YrEnjuAFmWAPvtad9Z0rWYtXaq+EKGwYb8qIekwRjOHoS9cgrPCOr74 OfAAhpbfyCPJJXJslXVI3DWojE4rIEyUuuvSGYn05U3IRcmSOGwfQwtcEtWcnk9DnI/wCP+k+ qr9jC5fWVpXH5Tjz3XYxJxTCw5v/UKh1Feq7Ksi9o8ZPwqQusPfkEjYXUUhRonV6xQIJT9Alh OPChgdjRbva5klt+MVqrxhJ80y3f/rvZSz+MIWPDGkIzuulZX4leIIYcBR9HykwbkN3r4WmMd DZl9AwQhaN0k8gzQKowiEXG1ls1+kSrDBvLX9dDdlQtcIxBRiTntcCk6ltFh1z7h76wGQBFXv QeeuDJS8CzpuHVgQRWFjDhiKDjiLX+2SUTEfH3s0pzvRitkZsyt7V2h4inrf09UcsZ0ZC7yJB JzG0BNH8hmZRkQjgvAG9WpS3MJQWus0g1fKycXxl+gi/lDf0mjkZGiWCF/wq9HMUrcP36HTgh e7cBIj0AwvNDQUxyln35JC4EhbmRSihmfJK9kFzCWbPTKU4+MJHRjEw2rg0uTrekFHV6H/stQ aHKjbPh0EYM0ELnGgamNrM+7DnGz2YiggmX1ZRqO7qGzRu2pr2PzRs1JpHlmTferSvHjYdcde frhklA2J0xY8LamDhup9YuZHHzhlkZf/6Ak0redKDIRqe4J6k090oV9QpntaupXFxFO8/PLxk ZO8MNoi/2+VLJCqP/1wIGbM+GN/FDE5XdCxs//7tpzWCSFsklY6PLSOI3afO2R5fOERXXTo76 7BUOtm7iXB24zp9A== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" ETIME seems to be missing, so just alias it to ETIMEDOUT It's just used by internal functions of the tools. Signed-off-by: Enrico Weigelt, metux IT consult --- tools/virtual.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.39.5 diff --git a/tools/virtual.c b/tools/virtual.c index 010a3aab..9a4dde8e 100644 --- a/tools/virtual.c +++ b/tools/virtual.c @@ -69,6 +69,11 @@ #include #include +// for FreeBSD +#ifndef ETIME +#define ETIME ETIMEDOUT +#endif + #define FORCE_FULL_REDRAW 0 #define FORCE_16BIT_XFER 0 From patchwork Tue Mar 4 15:57:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001062 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 814A0C282E3 for ; Tue, 4 Mar 2025 16:02:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5DE910E63F; Tue, 4 Mar 2025 16:02:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="U9Ub4MK7"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) by gabe.freedesktop.org (Postfix) with ESMTPS id F366010E635 for ; Tue, 4 Mar 2025 16:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104127; x=1741708927; i=info@metux.net; bh=0/4LYSFXCHRlnccxC4lB3FyQtQOmkvqt50MAkhbGm0E=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=U9Ub4MK7CaoKdW/oUsSFooVFLOqewRUjNrkYNrJQ8h/+CHWigfKZr28fAYQfzLP+ gZTHfOJt8fw8SwMhXnHn8zOoASgi3FuuPlNaK5RNL/7qeif/EVsFi+4J9f6K01Que HnRQwwtitsnfLxZ5zjrZwEhVD3n66le3oA3BnKFS7xPw00BB/L/doUrl5Y1/PrpEA C+tI9Mx4QCdEAo2SeU/7h9kXlnpTvgt7Q3k8ZxpyNoozV2JG8TtiUvC//9ufjdde1 z7tcQ8yA6we+pmka29AQttwUFxXYiEHaRgM3GQnxombGzK88H80xP4LHMY2yOXkT4 0iyk7V2Q3BXwsMpqXg== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M9FX5-1trzL71iMR-00FP8Q; Tue, 04 Mar 2025 16:56:30 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 04/16] backlight: use system() instead of System() Date: Tue, 4 Mar 2025 16:57:57 +0100 Message-Id: <20250304155809.30399-5-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:Td6rlONSHKN9KP1eePV3X2xMgQ2etcWabfqOaNx5331LdmikD4L f0hEpDjLrpVMuoAktjMn5r7aECoyuVDkq0KnCKXDfk7kP+Lc1jbIyZ5x/M95fxQQ9F6dAIE /eNx3DPDhPS3C5ivav73M4bYNV5eJks6AUpsaUhlGvQoZng8b2ILMCwSZEwo726+hvVSFO5 gaGFEVCk7PNZgSztgwL6A== UI-OutboundReport: notjunk:1;M01:P0:VXdWaoM6jq8=;ndnr6rv09JLsumfvqy3wA8O2fNE BwOiiBJHKx9OjhLHcDmT7MuNKOzp2ayPZZGF8x2F4vlAYDdTQJmnz9NbGH722CBTo/B74i/zh LaP5EkFr7VbzXcfPr/kkmIrJo4mN0A3uZ5oOGKgA1Lu4COYgCy1a8kmUNgF18V1KzciLQt3iX 0qYjvxmDa5YT2B6xHrDkI3SA0pcAjECjKvO6td+DWEUKikN/MHv6UK1841lkK9KpbXPku3da1 iBNDEHN6ej8kdu2P8lktpR8CWu7ho1bpYor2tDfguLIW6KJXWR/egyK1LR5nBTIXVvcXnynff 2oj9ChACq7C9MStHlIwwp1NecsHISyFvTaK+4QfkX/ZY6LWXfGJhsaWPFucHgSMeYJ6Ds0q5R EMeDlHcC2hI3snzTe4Bhezu2Yq7XV9s+iaIUP6XVBV5s2OPjw7mjfHr5e8Q6CljNRb+LbxX5u tIeIpNz+05NG+0Dd2o5HBuE9YE+B4g/nQoVRJLH2oXIegIxo6jirCQFSoLQJkbiaMa93JcEvF /QYVm9QbAtGfyvEDzUp2dV+PNdOCapBAzAh0UacY5Hdib0X0PsXzTgWmyD1tOHclXmV1TraxZ r1d6GJY5IZDUMD0kyr42kyLO4n1hWO3zxsOCDF454+6gVGPZWrRNiZ+RDiXyWyfJJF4b5zU2+ 0Ku2yI72RGumtQTyhnFgpYtyGb8S1FWdi0XGaQJ6x328U8Sj+WG9cI5+soAC9mjyA1zf5QLv5 IrU5sV2rvgqG07hl10kOwLrZhbVc2qUzMtLhWLO8M+voHA9S66C5za2wZxnjPkTwzgzD/6mlw NRKdYnyEuJ9/M902iEKW/WmFlX7UjjUyuc/ZBFURpHe+pe2/LolGMxyzMnkHVUgmiZ1bHGvvH I3SJ3iUx793IAZJWPZuM9WGm3oQVpyiQeQ2AkiuYV1J1o73VU1st9MYj5wspGsvMiku9XVIVu dipoZFjXiIxMm38L7Lni1/SByWGflhMuER71fZ13JR7Ci1xgiiXsyE2QtKWxsBrQx4mSmAYaq JxC2I4ax7wcUXQWjdRS5ZAfW/REpodfySddKx1Z4iyGobdvSgJlhBVUsMe7oRh8kilERH8xe4 3FJWIIcCwWzcYP2v4UH029VogtXNuA38xol/wt7UgJ98LXGDpsN6xSvZCqHrEj0AeRDLgEWFJ 1irhvoSFk1WjKXvW+HZuZviDsMicd6WZI3A+KPwFYJU+ER60yFiuVoApeBLacZV6J5z5JRJgj 2UAGLA7sU9h7cFmvJQ3dz89RsD2uydshJBbaNK1spzuuAYl01dgy8B6GzPVwVH3cnT7/ZSSeA u/Fl1x57dvivfdtEmNrLmWiNFBvk9QbZHWwXbUs5LPtCmKWd3VPdJkaqnrl19XXH5SS5r9hBX fuznQaE9oHZrsAvw== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The Xserver's System() function is a special wrapper for calling a program (xkbcomp) as an unprivileged user, when the Xserver is running as suid-root. (which today only needed on a few platforms, eg. Solaris). Therefore it's not suited for being called by arbitrary drivers. In this specific context it doesn't even much sense, since it's just used for checking whether pkexec command is present at all (and just should be used), while the actual exec'ing of the helper is done directly by fork() and exec() syscalls. Thus we can safely use standard system() call instead - clearing the road for dropping System() from Xserver's public/driver API. Signed-off-by: Enrico Weigelt, metux IT consult --- src/backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.5 diff --git a/src/backlight.c b/src/backlight.c index fcbb279f..f416f2a4 100644 --- a/src/backlight.c +++ b/src/backlight.c @@ -366,7 +366,7 @@ static int __backlight_helper_init(struct backlight *b, char *iface) return 0; if ((st.st_mode & (S_IFREG | S_ISUID | S_IXUSR)) != (S_IFREG | S_ISUID | S_IXUSR)) { - if (System("pkexec --version")) + if (system("pkexec --version")) return 0; use_pkexec = 1; From patchwork Tue Mar 4 15:57:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5B1CC282E5 for ; Tue, 4 Mar 2025 16:02:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6520E10E639; Tue, 4 Mar 2025 16:02:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="Kw7ktF49"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D7A910E638 for ; Tue, 4 Mar 2025 16:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104127; x=1741708927; i=info@metux.net; bh=mV7LYIvux7lkOo9+YJw8SBJ51ypU+ahKZHzcn2DB628=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Kw7ktF49/HzEQKKA6pOYILsZkhOT3nhOdDxD4UYVzkSzw/fr7lM6fUnLi5DiYoYJ iP6FJKl6veZ+cgmSNvUmsNMA6jjLl3uMjg7HnceAYiWutJAuhUsW2SxwU08ZuFdER P0t7WtGLICVsTeb4nYIFlCGRsUcnQSo5p+47HFbIvXZp0qAMEML9Kfokg/c6X1xa5 28fwrsE32FMTxJtXjTCkFJ8cEkLc7HC024NLnYqKCQ+ftJoj539JKjsKxte/ppH6v mjfMGn7dFGDTHHeICvnsGn+1ZYVbBvZ6y+zBjNs5kRnTUqVpv9y7No2nj3E2+8A6U vj7CXuj68YHCqfwQTg== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M1q4e-1trhYM3IFs-00AkhN; Tue, 04 Mar 2025 16:56:30 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 05/16] sna: use GCPtr instead of GC * Date: Tue, 4 Mar 2025 16:57:58 +0100 Message-Id: <20250304155809.30399-6-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:4aZehfUbiMSmFv+rPNk92uzlD9gBEVfb7yeVXSUy3ouH0FYovcx x4nypgczurE0Ysf8G+m/fxE5dRNs+j7N8ize44GL17ytD5KdcocC499gIkm6uai/bB+Zdy7 r4r8/G5VJ0CK7+o/AhzgDDBfVA8oqyLh5DPG1zRL9K2S0a7eOS085phK/40KF3tDT9BkyEz lUayrbZ4gdMEjlbGNZivA== UI-OutboundReport: notjunk:1;M01:P0:KUQvlTtGWVE=;YxsDlNFYHh4jPm+CBmWvCD2nVGR wBWn4LeJts1QZqXg9R/dvw7MsHW6gb8sjdxbOb8AqXReiGqB/kN7+bTGi6tHDlwgkbdRelPDl Zq2FxwJy8YIep1Pnjx8TP9e7nAnmCRBoqB8s3qm05mIwFZratLTskpYcjrhsIaUV+QsqxHQcw ZeILvVbYwg75SZ0pVA6WUTgSErvdL8dzOMDuXTKI5tzIfgjvZ6DTC9MIRbQf/YWK+IPZ3fHZf J5xoyrlUmaOsOTf+JPGaCiWmYsU0u7JyryhX58ofDlWxvF7HOrEdkGSfUaSYpo0Am7FRxnAvh yf7y1U1kMYWP6EZedgMML3WDG0iHgBsmzKIK+BTOoT7vcGxUSevxMZZn3OCUDcWTd/nKbdlMf qhxJPZtNrvi1co000DxelnjH8EoZ7v0SLqV1B4Nuat+ThDApGSO61klpJRBpFQO1mV7A31fsM bWa7vcsZRtEcN7CxrpWJAJ6H1R8zUcodkVT7IcLPPv+QI1q7JrSGwuqHIQRcvqXtnO4P3TMsW 35TlYUY9++20mDzXdbkckVOYaQJQiX5/DeU81hPrsQFyJy2WfFDuIqqWblEh+NTzH0F6uC3tm S/DPRHiYUodIYbTMaVx01CzBAEzGwhmj09+InEN74NaQLT7YUxnblW405iaktc59p52M00Q3Z eUL2CwpdSqB/rAQEuYpO50erGYxsKGltyL/YvY0ljwO3AhetrxwD/Ydd4kyy0p9HRfsXwbjW4 WgRr1DpbDNmdFx9oo9k8G2B12yhTsKs6QPuamI2nidruIN+yKlIn3+3+8ZoIZ9aLUzz2DbGgH jYAeAzfV1gOPvMsvhhd7YlIpfGB1GeJ2rOxYajnvOF9A2toT4C4CjZmVioXJNlQ8tQXhj54eB OEs3spl1BXwcaQurQSiEuwImi5XVpnZG5Ad1PMU71qg1XLkpcM0JWWrP9Zg+UxR3kSMMrfVBj SQ3pG3b7M7TdINWnelivlF78+r2cSof1cJwcTKZwyDmYPPeD88To6g739qWkhtV+wIP3VKkJ8 XaI44h9Xzx+P3UX1X5oXc1/l2zx/d2xsFDHntF9bRUfZTgQ5evVRrRRJTLceK0zvFyRI7WLlN wQHMXmVcY4q5QS0zfFV1o3z4YvKrtAfIL6xDYcMipQMzxhEAa3z2jCfqBiETZ96xZMEIrGkTd gKzCymF7F9i/upHyB59BTj+WO1suQzcfCjCxRsf0STsij8MrsYVZt71MHIoQXkkYs279D8QPK fLPby84UXrFE9ug0bakO+5ne/P/NG0wpQI2s94v6CergR1Yj856qpiSbNg11jXwij4bXC1iVk UP1rfsvzQZlr3Htvr3gadgnN9SYFi245BDHVTyyskbV+u+CidKkWyIWJ+NlecwZdXaJxjUOo5 MEQV3bBwGWOy0Xvw== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Xserver includes have explicit pointer types for quite all kind of structs (at least those used by drivers), which are used all over the Xserver. Thus it's much cleaner to use those everywhere. This commit also clears the road to fix a horrible nightmare of hacks just needed to circumvent naming clashes between Xserver and Xlib (affecting all DDXes that are painting on another Xserver): we can simply rename Xserver's own "GC" type to "GCRec" (the usual naming convention here) and so no trouble with Xlib's "GC" type anymore. Once this has landed, we're free to do that without breaking this driver. Signed-off-by: Enrico Weigelt, metux IT consult --- src/sna/sna_accel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.39.5 diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 89b82afa..90a61ab3 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -14300,7 +14300,7 @@ static void sna_poly_fill_rect_stippled_n_box__imm(struct sna *sna, struct kgem_bo *bo, uint32_t br00, uint32_t br13, - const GC *gc, + const GCPtr gc, const BoxRec *box, const DDXPointRec *origin) { @@ -14412,7 +14412,7 @@ sna_poly_fill_rect_stippled_n_box(struct sna *sna, struct kgem_bo *bo, struct kgem_bo **tile, uint32_t br00, uint32_t br13, - const GC *gc, + const GCPtr gc, const BoxRec *box, const DDXPointRec *origin) { From patchwork Tue Mar 4 15:57:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001064 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 378FDC282DC for ; Tue, 4 Mar 2025 16:02:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D536210E632; Tue, 4 Mar 2025 16:02:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="k8OueO6m"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by gabe.freedesktop.org (Postfix) with ESMTPS id AEA1610E323 for ; Tue, 4 Mar 2025 16:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104123; x=1741708923; i=info@metux.net; bh=1rUsdXevASwdBe+PD8ktH8/+FGV91+bM2SpQqpi1/H8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=k8OueO6ms8aonFYIeTzr8UTrWc5xn5FALW6iX5ul3kVllKj6JER5msZkKI7DRhJ6 HnSaUybxEplVWXY7pjTxCw2faYwO2sdM6ZO7whhOUqW7WFP8WB/uWGlyhsCzI30tM fTPJXiLkrtlNBCR4JgiERLYDqdZU0/hSPBQOFKN6knzk7ijbPAPtT5y5HgIIkjmn1 EfR9kpSPuTe//dbQtm8HsQXX3cpA0tlkUaOrJoTxzhu7ChGuRLevcEa+QUKWstD6O Fq/kbEmoIDlHQzBBH71bD/wOhAceTahUuOUXRPMBFBABrAAH18GYbFpKC74bGTl+N JPe+BgzfYJdhOazjCA== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYvoW-1tl93f0cBk-00QED3; Tue, 04 Mar 2025 16:56:31 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 06/16] gitlab CI: common scripts for driver builds Date: Tue, 4 Mar 2025 16:57:59 +0100 Message-Id: <20250304155809.30399-7-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:t3MvdnfJ+phenwwD88zmONdE1Sli4x6ix0OxV/RLN3zZVIHOSAE tKCAROSDYGqQquiX258KW/4SrLLHNpFXkYApNLbX+vdsdU/iCZtDUowDwMkw1dAhJdNH6OU 6yoKV5yiQgc/J0sBqQj9vthpc9ijP9zOFPF0w8FZHvWtW2z+t0jGsirny+KN52VLtkww7sy IMFbtvV++w02nzv1ce7YQ== UI-OutboundReport: notjunk:1;M01:P0:fz7/k6UeGlU=;NSPGltG+2sTUrjBxyP0aLYZZp79 f6kfrPhkEdecO//7Pt9LrdaXBjMADsEXr4lIYRGd25Y5zyemuCNhta5NzU/Ziik7XsdlaVXO7 d7Yt8SIo0hZs4yy3aYncqCQ8mX+t8v0mvJ7jBFaomWKZvpPIsB7K1XMxw/uTaTpezljlj9flh C7J4ttgbPfotuCkVJWFIPflLMD2esllTC9vnHYLz787jRnKzn2kJJ52kwW/xy3mNwMVe7Ib6s 77RfJ9zq1KBakLDpYCxWgGw3BaHwyCBO1ONsQdA0Ey1fhJDiltEjktVi5O7t3XwrXZ5Cgx/Ne rUtPIwyUaRY3jPGs2L2Wlq2GUDzAR0osLLD5RCcfxfvntVHYWNUOSwNva3IDI+zHPacp9ljtA o7gM/tRNFsnPdTn/8pMGHH/lFtC1f69lzYL5tgIPOzHlju9kKegOOuFCtrK/4dYlYmGehvjpl QJTeDstmxHXOs7z0HcpxXRqcv2gUskmQoOk2mN3mBmRy2kgCwyINr4CbsCcwGPKo2RH2kN7HB 1EVBrwRCeK2oaFfz/kbdB5bn7nCyhyoxmG9Y5Qp5dgKYJo0RxFCWrq2/1m8dHSyr9ys/AfiFv bZdyS3hq0IVShaSKMyECZREtLGkx7pfYh5hn6pMCcFvjiV7VDW4zOmF1X5JaPHT729DCBQlOt sQSa2EwAoDmDkdxOdcIP/OlXIvAav78r+2mWlbN+o/MAqghbQb6YJN1h6ljNDk+gtDHXtMQJz 8O7icrOl3EGxDGGGSTCk+9AhR1JCc2ScyWR8iVY/YOqSbwBHLl4/uocjL48zgNbmMhpqtsT4v /0Iff9enWfLGYQscbZSPic+fkraCaCSmxKmbWzGB1AHzqMbD37fAJiA4oLi7Bw6N5Z8SWHHoV wkT3eYWQNC+kYpxk0/TO+aFhtNoZQnK4c0oDa0LjudhU45S4iBvq2ULBYCRgx5Vb2iAsdAKaw bMWpa07Wzg7kmJCZzTR6+xIR8oJns8/yikFq/6XuMgDxbbqlSsp8EBKK3ScMvOyN3+HP7pQN0 1NgABcZK2Kksbc8iS+UYN4hpTNz07t+dI3g65ey/VuwqirDTF8DSRqpHxvDeb+lpfGNqETFVD SjWrCqKERS29/B+2PdurU04ct27A8/zVwW9DcUNVWZIYXBDFVWjGSI/G44kU0YMGiv3lcfj0f Jk8oE1pV9VV/Ng+Xn7RHhtvFHdFid2nffG5ObTshmwpWeLq4pOIPhBtoSVn/pVNOV3D1mTyAG UZJ4rixrG5SaGVcMvEbyUB5vBxwYKeOjT9OgviAJnaKBLJ+9MZ1s4oactOOqX8gFAdypDHjF9 0ubAeXmZm3bHxJolG+PQSQGJtqIBjvSIQbkcaocRLJUY9x7oDCMxHDqlCvD/Q4OHjVUieaxm8 oh9DdA0N2dTIeaCA== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Adding a bunch of common scripts for building xorg drivers on different platforms (for now Debian and FreeBSD) against different server versions. Also designed to be executed locally (eg. within a VM), so one doesn't always have to employ f.d.o gitlab. For now, these are synced manually across various driver repos, until we've found a viable solution for a central place. Signed-off-by: Enrico Weigelt, metux IT consult --- .gitlab-ci/common/README.md | 20 ++ .gitlab-ci/common/build-driver.sh | 61 +++++ .gitlab-ci/common/build-xserver.sh | 71 ++++++ .gitlab-ci/common/debian/image-install.sh | 91 ++++++++ .gitlab-ci/common/freebsd/FreeBSD.conf | 8 + .gitlab-ci/common/freebsd/image-install.sh | 59 +++++ .../common/freebsd/libdrm-2.4.116.patch | 109 +++++++++ .gitlab-ci/common/xorg-driver.yml | 216 ++++++++++++++++++ 8 files changed, 635 insertions(+) create mode 100644 .gitlab-ci/common/README.md create mode 100755 .gitlab-ci/common/build-driver.sh create mode 100755 .gitlab-ci/common/build-xserver.sh create mode 100755 .gitlab-ci/common/debian/image-install.sh create mode 100644 .gitlab-ci/common/freebsd/FreeBSD.conf create mode 100755 .gitlab-ci/common/freebsd/image-install.sh create mode 100644 .gitlab-ci/common/freebsd/libdrm-2.4.116.patch create mode 100644 .gitlab-ci/common/xorg-driver.yml -- 2.39.5 diff --git a/.gitlab-ci/common/README.md b/.gitlab-ci/common/README.md new file mode 100644 index 00000000..1f2dbd87 --- /dev/null +++ b/.gitlab-ci/common/README.md @@ -0,0 +1,20 @@ +common CI stuff - supposed to be synced across all drivers + +moving this to a dedicated CI component is left for a later exercise. + +Some scripts can also be used locally, eg. in a VM: + +Prepare the image: + + .gitlab-ci/common/debian/image-install.sh + .gitlab-ci/common/freebsd/image-install.sh + +Build the xserver + driver: + + .gitlab-ci/common/build-driver.sh debian + .gitlab-ci/common/build-driver.sh freebsd + +Build just the xserver: + + .gitlab-ci/common/build-xserver.sh debian + .gitlab-ci/common/build-xserver.sh freebsd diff --git a/.gitlab-ci/common/build-driver.sh b/.gitlab-ci/common/build-driver.sh new file mode 100755 index 00000000..384d7636 --- /dev/null +++ b/.gitlab-ci/common/build-driver.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env bash + +set -e + +PLATFORM="$1" +XSERVER_REF="$2" + +if [ ! "$PLATFORM" ]; then + echo "missing PLATFORM" >&2 + exit 1 +fi + +if [ ! "$XSERVER_REF" ]; then + echo "missing XSERVER_REF" >&2 + exit 1 +fi + +.gitlab-ci/common/build-xserver.sh "$PLATFORM" "$XSERVER_REF" + +MACH=`gcc -dumpmachine` +echo "Building on machine $MACH" + +case "$PLATFORM" in + freebsd) + export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/libdata/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/libdata/pkgconfig" + export ACLOCAL_PATH="/usr/share/aclocal:/usr/local/share/aclocal" + export CFLAGS="$CFLAGS -I/usr/local/include" + export UDEV_CFLAGS=" " + export UDEV_LIBS=" " + ;; + debian) + export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" + ;; + *) + echo "unknown platform $PLATFORM" >&2 + ;; +esac + +if [ -f autogen.sh ]; then + ( + echo "building driver via autotools" + rm -Rf _builddir + mkdir -p _builddir + cd _builddir + ../autogen.sh --disable-silent-rules + make + make check + make distcheck + ) +elif [ -f meson.build ]; then + ( + echo "building driver via meson" + meson setup _build + cd _build + meson compile + meson install + ) +else + echo "failed detecting build system" + exit 1 +fi diff --git a/.gitlab-ci/common/build-xserver.sh b/.gitlab-ci/common/build-xserver.sh new file mode 100755 index 00000000..7e21580e --- /dev/null +++ b/.gitlab-ci/common/build-xserver.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash + +set -e +set -x + +PLATFORM="$1" +XSERVER_REF="$2" + +if [ ! "$XSERVER_REF" ]; then + echo "missing XSERVER_REF variable" >&2 + exit 1 +fi + +XSERVER_CLONE=/tmp/xserver +XSERVER_BUILD=$XSERVER_CLONE/_builddir +XSERVER_REPO=https://gitlab.freedesktop.org/xorg/xserver.git + +MACH=`gcc -dumpmachine` + +export PKG_CONFIG_PATH="/usr/lib/$MACH/pkgconfig:/usr/share/pkgconfig:$PKG_CONFIG_PATH" +export PKG_CONFIG_PATH="/usr/local/lib/$MACH/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:$PKG_CONFIG_PATH" + +echo "cloning xserver" +rm -Rf $XSERVER_CLONE +git clone --depth=1 -b $XSERVER_REF $XSERVER_REPO $XSERVER_CLONE + +echo "checking platform: $PLATFORM" +case "$PLATFORM" in + freebsd) + echo "Building on FreeBSD" + XSERVER_OS_AUTOCONF_FLAGS="--without-dtrace" + XSERVER_MESON_DISABLE="glx udev udev_kms" + ;; + debian) + echo "Building on Debian" + ;; + *) + echo "unknown platform $PLATFORM" >&2 + exit 1 + ;; +esac + +if [ -f $XSERVER_CLONE/meson.build ]; then + ( + echo "Building Xserver via meson" + for opt in $XSERVER_MESON_DISABLE ; do + if grep "'$opt'" $XSERVER_CLONE/meson_options.txt ; then + echo "disable $opt" + XSERVER_MESON_FLAGS="$XSERVER_MESON_FLAGS -D$opt=false" + else + echo "no option $opt" + fi + done + mkdir -p $XSERVER_BUILD + cd $XSERVER_BUILD + meson setup --prefix=/usr $XSERVER_MESON_FLAGS + meson compile + meson install + ) +else + ( + echo "Building Xserver via autotools" + cd $XSERVER_CLONE + # Workaround glvnd having reset the version in gl.pc from what Mesa used + # similar to xserver commit e6ef2b12404dfec7f23592a3524d2a63d9d25802 + sed -i -e 's/gl >= [79].[12].0/gl >= 1.2/' configure.ac + ./autogen.sh --prefix=/usr $XSERVER_AUTOCONF_FLAGS $XSERVER_OS_AUTOCONF_FLAGS + make -j`nproc` + make -j`nproc` install + ) +fi diff --git a/.gitlab-ci/common/debian/image-install.sh b/.gitlab-ci/common/debian/image-install.sh new file mode 100755 index 00000000..f0e98f0c --- /dev/null +++ b/.gitlab-ci/common/debian/image-install.sh @@ -0,0 +1,91 @@ +#!/bin/bash + +set -e +set -o xtrace + +echo 'deb-src https://deb.debian.org/debian bullseye main' >>/etc/apt/sources.list.d/deb-src.list +echo 'deb-src https://deb.debian.org/debian bullseye-updates main' >>/etc/apt/sources.list.d/deb-src.list +echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list + +apt-get update + +apt-get autoremove -y --purge + +apt-get install -y --no-remove \ + autoconf \ + automake \ + build-essential \ + libtool \ + pkg-config \ + ca-certificates \ + git \ + debian-archive-keyring \ + python3 python3-setuptools libxshmfence-dev \ + clang \ + libxcb-icccm4-dev libxcb-xkb-dev \ + libxvmc-dev libxcb1-dev libx11-xcb-dev libxcb-dri2-0-dev libxcb-util-dev \ + libxfixes-dev libxcb-xfixes0-dev libxrender-dev libxdamage-dev libxrandr-dev \ + libxcursor-dev libxss-dev libxinerama-dev libxtst-dev libpng-dev libssl-dev \ + libxcb-dri3-dev libxxf86vm-dev libxfont-dev libxkbfile-dev libdrm-dev \ + libgbm-dev libgl1-mesa-dev libpciaccess-dev libpixman-1-dev libudev-dev \ + libgcrypt-dev libepoxy-dev libevdev-dev libmtdev-dev libinput-dev \ + mesa-common-dev libspice-protocol-dev libspice-server-dev \ + meson/bullseye-backports \ + nettle-dev \ + pkg-config \ + valgrind \ + x11-xkb-utils xfonts-utils xutils-dev x11proto-dev + +build_autoconf() { + local subdir="$1" + shift + ( + cd $subdir + ./autogen.sh "$@" + make -j${FDO_CI_CONCURRENT:-4} + make -j${FDO_CI_CONCURRENT:-4} install + ) +} + +build_meson() { + local subdir="$1" + shift + ( + cd $subdir + meson _build -Dprefix=/usr "$@" + ninja -C _build -j${FDO_CI_CONCURRENT:-4} install + ) +} + +do_clone() { + git clone "$1" --depth 1 --branch="$2" +} + +mkdir -p /tmp/build-deps +cd /tmp/build-deps + +# xserver 1.18 and older branches require libXfont 1.5 instead of 2.0 +echo "Installing libXfont 1.5" +do_clone https://gitlab.freedesktop.org/xorg/lib/libXfont.git libXfont-1.5-branch +build_autoconf libXfont + +echo "Installing font-util" +do_clone https://gitlab.freedesktop.org/xorg/font/util.git font-util-1.4.1 +build_autoconf util --prefix=/usr + +echo "Installing libxcvt" +do_clone https://gitlab.freedesktop.org/xorg/lib/libxcvt.git libxcvt-0.1.0 +build_meson libxcvt + +# xserver requires xorgproto >= 2024.1 for XWAYLAND +echo "Installing xorgproto" +do_clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git xorgproto-2024.1 +build_autoconf xorgproto + +# Xwayland requires drm 2.4.116 for drmSyncobjEventfd +# xf86-video-freedreno and xf86-video-omap need extra features +echo "Installing libdrm" +do_clone https://gitlab.freedesktop.org/mesa/drm libdrm-2.4.116 +build_meson drm -Dfreedreno=enabled -Dnouveau=enabled -Domap=enabled + +rm -Rf /tmp/build-deps diff --git a/.gitlab-ci/common/freebsd/FreeBSD.conf b/.gitlab-ci/common/freebsd/FreeBSD.conf new file mode 100644 index 00000000..50a9bce1 --- /dev/null +++ b/.gitlab-ci/common/freebsd/FreeBSD.conf @@ -0,0 +1,8 @@ +# using the latest branch +FreeBSD: { + url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest", + mirror_type: "srv", + signature_type: "fingerprints", + fingerprints: "/usr/share/keys/pkg", + enabled: yes +} diff --git a/.gitlab-ci/common/freebsd/image-install.sh b/.gitlab-ci/common/freebsd/image-install.sh new file mode 100755 index 00000000..758e90fc --- /dev/null +++ b/.gitlab-ci/common/freebsd/image-install.sh @@ -0,0 +1,59 @@ +#!/usr/bin/env bash + +set -e + +# note: really wanna install to /usr/local, since that's explicitly searched first, +# so we always catch the locally installed before any system/ports provided one +# otherwise we might run into trouble like trying to use outdated xorgproto +build_autoconf() { + local subdir="$1" + shift + ( + cd $subdir + ./autogen.sh --prefix=/usr/local "$@" + make -j${FDO_CI_CONCURRENT:-4} + make -j${FDO_CI_CONCURRENT:-4} install + ) +} + +build_meson() { + local subdir="$1" + shift + ( + cd $subdir + meson _build -Dprefix=/usr/local "$@" + ninja -C _build -j${FDO_CI_CONCURRENT:-4} install + ) +} + +do_clone() { + git clone "$1" --depth 1 --branch="$2" +} + +cp .gitlab-ci/common/freebsd/FreeBSD.conf /etc/pkg + +pkg upgrade -f -y + +pkg install -y \ + git gcc pkgconf autoconf automake libtool xorg-macros xorgproto meson \ + ninja pixman xtrans libXau libXdmcp libXfont libXfont2 libxkbfile libxcvt \ + libpciaccess font-util libepoll-shim libdrm mesa-libs libdrm libglu mesa-dri \ + libepoxy nettle xkbcomp libXvMC xcb-util valgrind libXcursor libXScrnSaver \ + libXinerama libXtst evdev-proto libevdev libmtdev libinput spice-protocol \ + libspice-server xcb-util xcb-util-wm + +[ -f /bin/bash ] || ln -sf /usr/local/bin/bash /bin/bash + +# Xwayland requires drm 2.4.116 for drmSyncobjEventfd +# xf86-video-freedreno and xf86-video-omap need extra features +echo "Installing libdrm" +do_clone https://gitlab.freedesktop.org/mesa/drm libdrm-2.4.116 +( + cd drm + git config user.email "buildbot@freebsd" + git config user.name "FreeBSD build bot" + git am ../.gitlab-ci/common/freebsd/libdrm-2.4.116.patch +) +build_meson drm -Dfreedreno=enabled -Dnouveau=enabled -Domap=enabled + +echo "=== post-install script END" diff --git a/.gitlab-ci/common/freebsd/libdrm-2.4.116.patch b/.gitlab-ci/common/freebsd/libdrm-2.4.116.patch new file mode 100644 index 00000000..820ea279 --- /dev/null +++ b/.gitlab-ci/common/freebsd/libdrm-2.4.116.patch @@ -0,0 +1,109 @@ +From a87432dbb281ddf1c50a5e78091d38f0dac79416 Mon Sep 17 00:00:00 2001 +From: "Enrico Weigelt, metux IT consult" +Date: Fri, 7 Jun 2024 15:18:47 +0200 +Subject: [PATCH 1/2] fix FTBS on FreeBSD (or non-Linux in general) + +Several drivers still including , but not using anything +from it, thus breaking build on non-Linux platforms (eg. FreeBSD). +Since not needed at all, just stop including it. + +Signed-off-by: Enrico Weigelt, metux IT consult +--- + etnaviv/etnaviv_device.c | 1 - + exynos/exynos_drm.c | 1 - + exynos/exynos_fimg2d.c | 1 - + omap/omap_drm.c | 1 - + tests/exynos/exynos_fimg2d_test.c | 1 - + 5 files changed, 5 deletions(-) + +diff --git a/etnaviv/etnaviv_device.c b/etnaviv/etnaviv_device.c +index 699df256..a63bd15d 100644 +--- a/etnaviv/etnaviv_device.c ++++ b/etnaviv/etnaviv_device.c +@@ -25,7 +25,6 @@ + */ + + #include +-#include + #include + #include + #include +diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c +index 3e322a17..fb4cd8de 100644 +--- a/exynos/exynos_drm.c ++++ b/exynos/exynos_drm.c +@@ -31,7 +31,6 @@ + #include + + #include +-#include + + #include + +diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c +index ac6fa687..f0aee962 100644 +--- a/exynos/exynos_fimg2d.c ++++ b/exynos/exynos_fimg2d.c +@@ -30,7 +30,6 @@ + #include + + #include +-#include + + #include + +diff --git a/omap/omap_drm.c b/omap/omap_drm.c +index aa273660..42d35ef7 100644 +--- a/omap/omap_drm.c ++++ b/omap/omap_drm.c +@@ -27,7 +27,6 @@ + */ + + #include +-#include + #include + #include + #include +diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c +index d85e2f6b..b1baa503 100644 +--- a/tests/exynos/exynos_fimg2d_test.c ++++ b/tests/exynos/exynos_fimg2d_test.c +@@ -31,7 +31,6 @@ + #include + + #include +-#include + + #include + #include +-- +2.39.2 + +From 79123db12c6c5f42747fae02068b482055e8c376 Mon Sep 17 00:00:00 2001 +From: "Enrico Weigelt, metux IT consult" +Date: Fri, 7 Jun 2024 15:43:13 +0200 +Subject: [PATCH 2/2] omap: fix FTBS on FreeBSD and drop unneeded include + +No need to explicitly include , since drm.h already does that, +but conditionally only Linux only. + +Signed-off-by: Enrico Weigelt, metux IT consult +--- + omap/omap_drm.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/omap/omap_drm.c b/omap/omap_drm.c +index 42d35ef7..93d2207f 100644 +--- a/omap/omap_drm.c ++++ b/omap/omap_drm.c +@@ -27,7 +27,6 @@ + */ + + #include +-#include + #include + #include + #include +-- +2.39.2 + diff --git a/.gitlab-ci/common/xorg-driver.yml b/.gitlab-ci/common/xorg-driver.yml new file mode 100644 index 00000000..3e63bc48 --- /dev/null +++ b/.gitlab-ci/common/xorg-driver.yml @@ -0,0 +1,216 @@ +# version 0.1.19 +variables: + DEBIAN_VERSION: 'bullseye-slim' + DEBIAN_TAG: "2024-10-01.03" + DEBIAN_EXEC: 'bash .gitlab-ci/common/debian/image-install.sh' + DEBIAN_SKIP: "false" # to enable, it has to be litterally "true" + + FREEBSD_TAG: '2024-10-01.01' + FREEBSD_VERSION: '14.0' +# image is yet too small for that - need a more complicated way :( +# FREEBSD_EXEC: "bash .gitlab-ci/common/freebsd/image-install.sh" + FREEBSD_SKIP: "false" # to enable, it has to be litterally "true" + +.templates_sha: &template_sha bc70242ffb8402243e934659ecc1a2d1c89eca2b # see https://docs.gitlab.com/ee/ci/yaml/#includefile + +include: + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/debian.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/freebsd.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' + - template: Security/SAST.gitlab-ci.yml + +stages: + - images + - build + - test + +# standard commits quality check +check-commits: + extends: + - .fdo.ci-fairy + stage: test + script: + - ci-fairy check-commits --junit-xml=results.xml + except: + - master@$FDO_UPSTREAM_REPO + variables: + GIT_DEPTH: 100 + artifacts: + reports: + junit: results.xml + allow_failure: true + needs: + +# standard merge request quality checks +check-merge-request: + extends: + - .fdo.ci-fairy + stage: test + script: + - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml + artifacts: + when: on_failure + reports: + junit: results.xml + allow_failure: true + needs: + +# create debian build image +image@debian@amd64: + extends: + - .xorg.distro@debian@amd64 + - .fdo.container-build@debian + stage: images + variables: + GIT_STRATEGY: none + rules: + - if: $DEBIAN_SKIP != "true" + when: always + needs: + +image@debian@i386: + extends: + - .xorg.distro@debian@i386 + - .fdo.container-build@debian + stage: images + variables: + GIT_STRATEGY: none + rules: + - if: $DEBIAN_SKIP != "true" + when: always + needs: + +# inherit this to define FDO_DISTRIBUTION_* variables for Debian +.xorg.distro@debian@amd64: + variables: + FDO_DISTRIBUTION_VERSION: "$DEBIAN_VERSION" + FDO_DISTRIBUTION_EXEC: "$DEBIAN_EXEC" + FDO_DISTRIBUTION_TAG: "amd64-$DEBIAN_TAG" + FDO_BASE_IMAGE: "amd64/debian:$DEBIAN_VERSION" + +.xorg.distro@debian@i386: + variables: + FDO_DISTRIBUTION_VERSION: "$DEBIAN_VERSION" + FDO_DISTRIBUTION_EXEC: "$DEBIAN_EXEC" + FDO_DISTRIBUTION_TAG: "i386-$DEBIAN_TAG" + FDO_BASE_IMAGE: "i386/debian:$DEBIAN_VERSION" + +# overwrite this one if another matrix is needed +.xorg.driver_matrix@debian: + parallel: + matrix: + - CC: [ "gcc", "clang" ] + XSERVER_REF: [ +# these break on Debian +# "xorg-server-1.18.4", +# "xorg-server-1.19.7", + "xorg-server-1.20.14", + "xorg-server-21.1.13", + "master" + ] + +# default build with meson on Debian +.xorg.driver_common@debian: + needs: + - image@debian@i386 + - image@debian@amd64 + extends: + - .fdo.distribution-image@debian + stage: build + script: + - .gitlab-ci/common/build-driver.sh "debian" "$XSERVER_REF" + variables: + CFLAGS: "-pipe -g -O2" + rules: + - if: $DEBIAN_SKIP != "true" + when: always + +# overwrite this when you need some special Debian build +build@debian@amd64: + extends: + - .xorg.driver_matrix@debian + - .xorg.driver_common@debian + - .xorg.distro@debian@amd64 + +build@debian@i386: + extends: + - .xorg.driver_matrix@debian + - .xorg.driver_common@debian + - .xorg.distro@debian@i386 + +# inherit this to define FDO_DISTRIBUTION_* variables for FreeBSD +.xorg.distro@freebsd: + variables: + FDO_DISTRIBUTION_VERSION: "$FREEBSD_VERSION" + FDO_DISTRIBUTION_EXEC: "$FREEBSD_EXEC" + FDO_DISTRIBUTION_TAG: "$FREEBSD_TAG" + +# create base image for FreeBSD +image@freebsd: + extends: + - .xorg.distro@freebsd + - .fdo.qemu-build@freebsd@x86_64 + stage: images + variables: + GIT_STRATEGY: none + rules: + - if: $FREEBSD_SKIP != "true" + when: always + +# inherit this to get the default build matrix +.xorg.driver_matrix@freebsd: + parallel: + matrix: + - CC: [ "gcc", "clang" ] + XSERVER_REF: [ +# "xorg-server-1.18.4", # this breaks due name clash on "bool" +# "xorg-server-1.19.7", +# "xorg-server-1.20.14", # breaks meson ... see: 331850ce6f0c48a1cfc489da2a27ca0220997a2f -- server-1.20-branch + "xorg-server-21.0.99.1", + "xorg-server-21.1.13", + "master" + ] + +# common build for driver on FreeBSD. meson and autoconf are both handled by this +.xorg.driver_common@freebsd: + needs: + - image@freebsd + stage: build + extends: + - .fdo.distribution-image@freebsd + - .xorg.distro@freebsd + script: + # FIXME: increasing image and running image-install.sh should be done + # at container image build time, but would have to replicate too much + # of the cbuild script here. better wait until CI folks have increased + # the image size or provide hooks for that + - xz -d -T0 /app/image.raw.xz + - rm -f /app/image.raw.xz + - truncate -s +5G /app/image.raw + - /app/vmctl start + - set +e + - /app/vmctl exec "service growfs onestart" + - scp -r $PWD "vm:" + - /app/vmctl exec "cd $CI_PROJECT_NAME && .gitlab-ci/common/freebsd/image-install.sh" + - /app/vmctl exec "cd $CI_PROJECT_NAME && .gitlab-ci/common/build-driver.sh freebsd $XSERVER_REF" && touch .success + # copy any test results from the VM to our container so we can + # save them as artifacts + - scp -r vm:$CI_PROJECT_NAME/test-results.xml . || true # this is allowed to fail + - /app/vmctl stop + - set -e + - test -e .success || exit 1 + rules: + - if: $FREEBSD_SKIP != "true" + when: always + +# overwrite this if you need some special FreeBSD build +build@freebsd: + extends: + - .xorg.driver_matrix@freebsd + - .xorg.driver_common@freebsd From patchwork Tue Mar 4 15:58:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001059 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C29D1C282DE for ; Tue, 4 Mar 2025 16:02:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF64F10E62D; Tue, 4 Mar 2025 16:02:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="b91wZVmU"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71CBB10E2C0 for ; Tue, 4 Mar 2025 16:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104122; x=1741708922; i=info@metux.net; bh=PjiZJyuEuf8/ACqZBkxdQvi+n60spUFhl+lBEZXmhCM=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=b91wZVmUERXd+Hzv7lMVpHlBkeLxUcG404hbjfvJBmd32ybhCa2yKhb/lRHHo9We Q2etmcW/HfVyibWQ/lI1sOBRjTpRbl/l8hdMsdVixPfhJbxBTd7+ijgSoCsw3PMlL qBTm98cMxu0CXBDdIf/qS8V4Bey6fsbI4E+9FeqvHGKVORiUmYjvuOM919+fd906K v3wTicnsGd25fk2DsBvIPsjXSfladWuJIoT68/8bKIdOwWzsrsZbEwWapcd7ry9kl FjI5zI9tcWRseCtiJ0wU3/MiR3BpQJh3GX9PImG0lp6XmtsJCx01c5fMR7dCCaFZj rpls54BC+Kwkpjf37Q== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MeTkC-1tFKvr3T4m-00lBNV; Tue, 04 Mar 2025 16:56:31 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 07/16] gitlab CI: add pipeline for building against various Xserver releases Date: Tue, 4 Mar 2025 16:58:00 +0100 Message-Id: <20250304155809.30399-8-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:TdEdbqVrplfGBW2ExiZbIV6nibLdWxeA90zDJG+Eiwu+qd68uLW cVFUSKMfX1We82bCsC5pxVAWWTTmvWUtS82Fv+TfBcbA1bHzzjERbYhfbzzveVzy1PjDxIT y3rIEnl4hfSvhBpD3nCnRMJwX+A0if8b7qoEj/1ZHlIushYF8HLr3UshC+/WXilZ7RsnAoU fsPf9IgH7ZFAOD7IOqucw== UI-OutboundReport: notjunk:1;M01:P0:HxDi+LRa/Vw=;W2ky/h4Ic6Mslozhq7YsM2Ou3OI hToAK6AsbTyVfd/da4JhgUZPn6vfktYSdkFSn093D6SVLLg2X3ymE+NQvZ2pzQnkySLhDdPV7 yiADgkJvYysgwDCuWOxv2UQW88WjAjor1i/G7gCiQQcoKQTVrAq/6X+bEiXw4nTqCyUU9h89Q r1sAGq6EfoCZTMxo4XqnWaj4OJlgWUtK/jY9NaGcOl0mD5J8HGBhNLziD34EDivYpBAqulIzT 2cFA33waoJ5fZmDLk1UxD1v5kGpw18nU6C49jJX0YQtGzK9LE5hUGqIMZ7sylNEiS0X05Et37 ybFsQ4v78xyxzMthj7lpybOyc8irMWwVRZUstJ+87Q1Gm9DiF78kZexifj9j7iQiMQRmV9PEg YVrMa/O7TQra/kFMWdDRKarFDbPBDRgKwHEwuozN0vn9w85nGhzAJrk6hOPqUBv5sPtB6p0Py TH+EtvBauksVHY77hOAmjKjlsJhnK+njUaD117fjY+BlCIedsh58lQ60BjWfnPBhO+OORLQ57 3l7RPqzlpMTT6WqRfkVLJSiuF4E8apYzigaw6WUToKK2ZUQD+A4LvgK4lWXkav3hImdfUNBL3 G/gX8avjSyKfQACkqYM0j3q0T2HNwYr2T4y53Cf9jnhVoce9qVfEisdbVi98N/0VW0qaf824n 24GTJzUrXcnSy268+iMX16jJplDwgQUPJgxjkNzT0kLJ/+jItFPcL5oDWo0HgPZPu4ZZEhtik Rdn2+5OYJb5kqFXVaDMe3ovs4MukHEJqXNGZlq6idKhtfJbSKZ1SxYceyBEPoq2hcVLZwYFp7 28ngLZjyCbgtIg+8BA/F6JT1NshTx1at4R0/14zr67B08YCbDCEOl3wFR8siK2kwE09WMy1pv tJBaoi9TnN3zy57tvZ1qC/9wTJnMPFMthEIJS98CDvIJc5gZ3C51wCws744ujFLamNZ5wu9Fj O7krLR7CqdMzMQhLHmUiLredZkicL399vNg7oLMY+cpmbLfxVMCSHCn0aE23SoPEiFdtKIwvv Qt4IbVQhvc6r5vezoIABvepB53EibYU/K2zdafnZc8IxJh2WQNOufgpOyRgVhiyIgYXV56Wgy JWd/mKlpaN0ixR3X/kUtYPmejtbcxNGSWFEu5rKfoyf44j87rklw+/GwGXDWAQe89usG8sxVf j8IKCL1VfPteDf4j3fMrTht3pBIG5se4E9B89Cze5rpFaYOaY3DQ7FSS0DHUokjamc/iQRp/M Q6tDoB7PoYane/eJNyc8pgSgbLFKndbL+EUapm+qYMA0mL1McZbG2MyYqzSJKRA8V4UN3dYmn bXOLmLH5FhBO8OXlgRuetsniMrouTT5xTfIlQtBSzZ+XgcHfZO2cPDtbP2Az2u5J2aAFOoaqo mjZN8ACFlm43y2hg== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Adding a gitlab pipeline building this driver against Xserver major releases since 1.18, including current master branch, on Debian as well as FreeBSD. Signed-off-by: Enrico Weigelt, metux IT consult --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitlab-ci.yml -- 2.39.5 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..5521ff67 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,5 @@ +variables: + FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-intel' + +include: + - local: '.gitlab-ci/common/xorg-driver.yml' From patchwork Tue Mar 4 15:58:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001065 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2E086C282DE for ; Tue, 4 Mar 2025 16:02:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8E8810E640; Tue, 4 Mar 2025 16:02:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="rZBAm30o"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0EEBA10E62D for ; Tue, 4 Mar 2025 16:02:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104126; x=1741708926; i=info@metux.net; bh=nb2RJHdrTPEX8LgXovvHO6bnzkmbFSVoGcisLUP+Vjk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=rZBAm30o0iyKd1t0BTa3ZsTBnh4X9QfmT+3jCxdCJ3ULDuu9yBqDpcS+RXp4s8U9 aPV+o3h14XUxfLKGySvRJZ7UQe3i2VOiIpBve3Xb6C4xWcJgYawa/CaMRqEOJSphw qbwrOIqFvvuH/buH6zVNHxtM2t2kCbg567mXnOvC7JRSc2xjSBFi31FOlUtBsalrU WHAdEhZvC8oCd16NtpNk8ELxp60S+AmrygQEYYtbUHZWj6zw08MQ8ZgRwKwXK9x8w ++RozV5VP4iVkFP++HOoFYo7scdBa90K7VIqYgEfeseln1usPGuPwOBPD6j9wdxmA AsKpQirsik+NSUQSUg== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MLiPA-1tXxmS1CbY-00Ubvl; Tue, 04 Mar 2025 16:56:32 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 08/16] stop using obsolete xf86BlockSIGIO() and xf86UnblockSIGIO() Date: Tue, 4 Mar 2025 16:58:01 +0100 Message-Id: <20250304155809.30399-9-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:ZcqVmi8V5dnfLC3aRy270i3Wh90HR4/hiIHXVdjujM+KbUoOxXC vGJc1M7GHEKHClu7WDuIWxga/Wtiz+Bz5QS3RWVAcUECEmZEEBBjwKWlHMYkEbDgiHa4XBx BiXV7Zp8h2MJpu/YAqzUNxpcz24CILohU/vAMD7Y1TvDxN6eloKvegYluhdOgtwU7Fei85+ Rmqrkqjrv9ZC2uEQ67rhg== UI-OutboundReport: notjunk:1;M01:P0:iHorvyMW6BM=;H/f9Q+5bwDyJvG/2R+MyxJutVYx 7W55gMY1QrAe51KjX0lhtijE4rxHuEr7bse2N1AJ52QCN1d/5D0QG9U5V5DlplnNBtaQJQZfZ W6iqXQ0SxsvzXYnNKZqk2oIVaTnGwIsazE0CKinXI3Vf9BqSXnWmVXjTIGe8JyCnN3FEz1klD Yh7SRl3A1FIuVeITPy3kAFsKW30WLst7Jr/g+rbCBbF3w3tt0pFNT2+3v1uNpCkZ8WxBgN/bM 3kkfSBzhyQmTTwt8K2mcPtiMqzm6/SY64SYj+YBVkvM1+Rxop+/Np/ZtOw+bRgflkPGhBLn2j Xi3ZWJJl5K+uelG8RC6MyYeZeiAFCT6rCgVeC7obLc+kqCh8B1maTBdWYkKGN8vQ/lulf3V9X CLrxrTAYuuCxcKW25dZo73OuJIOmxkTCu0IlKOXohsP2os9qkQe9ghRKTVy5tUUTh9yJYWIhr OaLya0woVicGQnkuiEW6HSlzRbIIoT7F7sOdqp5EAaXYGYSHs2iXyIXCuvvlj6aiP9epCl4z/ jnADGtn+YQW+m3QzBOooCfKVeMN1gd7bY63JPFL/vA8wdrsRwe/SEMhLxGdo5ndl1IS3vhLQ3 +LwSyaEdqCpCmGTyawcH8YuL5MHio/6/L8LP7W+T/4WJHoThYisSznuArx7UmnqhxWr8jna7R NUkr5ajrzwe9AjJv3wCzSvh/ejHNKpQnEnrg+//iVLLB1I1gquHsaPWsZB3of7xp0w0MW3Ltc Fhjx8c93U9kk0YKq03fpbwqiQqzGNUQGWFIWLb/N016O5bCqlO/XOBYhL8VuIOSfutlQp+663 g5gg627fbHgJMyh+BSxazljDQVU+DUMTwwUy3//WX5T+P/CgdEnbPgtDzxlTvbgKu9s5zLI1A IRBIvHZMaaPVat6EF2H8AFVg9LwK4NuJnagEiCPJx0/PdYdevNnFC83PzdNr9hQceVEXBN820 pLs44tEbjQ5ouwV4o7k45U7cxYMWYo5URUQimqSD6yMGEAJ3AY0PHE04l1kHziv8wPNJjcJCz /OdT7NaBOwdj9b/L3FQEWfoX9QjZfvIzjIA2/GxU2/U6zLLIESOhTX7o1CFl3HZ/IlxRMWtOy B5OT0LXkSojNNBG66+9ePKuBsX7jC/2jaRAvYCvKidX524UJhAraVxM/4LoLdeSqgZW1GLHx4 vhlosV8bmkGlwq28ZnyTQJGIaSikGfYsDe0xFQAnSaHT9PjdJ+h+29JEil3AWcql/Vao87L19 lqxa8ndpDOOD4EaMBR7HwEmi7rOxe5BzNbAXVtRvlt1zyxxfbe3i2s2TP/xXMrL+8QwOzKa0e 5+poYLdxZBgZ3d+QfNhXBtF5Smg7DVn7/D79AWWq/wV1RIKPZMJi4akTn1J67p1BTq47piL7V 2Wkl5AADjzxPVQvw== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" These are just wrappers for calling input_lock()/input_unlock() and marked deprecated for quite a while now. Signed-off-by: Enrico Weigelt, metux IT consult --- src/sna/sna_display.c | 5 +++-- src/uxa/intel_driver.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) -- 2.39.5 diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index d33a88af..d4adf34f 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -1161,11 +1161,12 @@ static inline void sigio_unblock(int was_blocked) #include static inline int sigio_block(void) { - return xf86BlockSIGIO(); + input_lock(); + return 0; } static inline void sigio_unblock(int was_blocked) { - xf86UnblockSIGIO(was_blocked); + input_unlock(); } #endif diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index 9c3fe85f..79105b89 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -641,10 +641,10 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) intel_flush(intel); if (!intel->has_prime_vmap_flush) { drm_intel_bo *bo = intel_uxa_get_pixmap_bo(PixmapDirtyPrimary(dirty)); - was_blocked = xf86BlockSIGIO(); + input_lock(); drm_intel_bo_map(bo, FALSE); drm_intel_bo_unmap(bo); - xf86UnblockSIGIO(was_blocked); + input_unlock(); } DamageRegionProcessPending(&PixmapDirtyDst(dirty)->drawable); From patchwork Tue Mar 4 15:58:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001055 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE580C282DC for ; Tue, 4 Mar 2025 16:02:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5532910E62B; Tue, 4 Mar 2025 16:02:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="Pe0ZDQI1"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1EB1210E62B for ; Tue, 4 Mar 2025 16:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104122; x=1741708922; i=info@metux.net; bh=No8rrnHlsF6Exi7GV8ZHFoOvVwyz1bjgxTYjAnXM7pI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Pe0ZDQI1Jn1h887TEKMwQOlxTbi77zajBdw30SBp5VzUXN51mxIOVPKV+XQG+ez9 j0y0MpV+Rpd55NQifaHncPmtMJ9pnXJUJUjtlu5HINSVn8UDAaWW+vEGdfsC+SugK 5QVHK4pCABAI9zIKn8aYaUPAsRw+axOokREgfN0dtRNfpSBVfq4XdUeBq0Vu5fZNp hz9vqoVkhth6O9syMurmAbZiAzuqD4dqSe2iz2H/+Y/3PYS3XEP6GhmSjF/NxWoyQ 9nFOL7mte7tVpI+uFeVMkkdwjtVTduOacrYDVazQNyJg7xvxXXT9yiSghNdxg8Btr jQ2NBiz+riWqFowjGw== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MOz8O-1tdUce2tAa-00Vhrp; Tue, 04 Mar 2025 16:56:32 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 09/16] uxa: stop calling deprecated xf86_reload_cursors() Date: Tue, 4 Mar 2025 16:58:02 +0100 Message-Id: <20250304155809.30399-10-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:TNcVK3RRJaKdZI8ofGEfDok1QafFo3g4zv7WsWDxH/LdGLeAvvT CRp0/uKnahVKz1jI2EPYhkZet0ac6r1zUL/Rrhixd2ygDtL/qdma5iISVlYuPLSp4z2SyKn jI3BsvZVvM3QPo054CF9LzDTesKc4/T826Bqe6sQx9Nmf2KqDMOvE+zataMbC1XVqC2f4uu /6/r5POP3d0oSLC7kuicw== UI-OutboundReport: notjunk:1;M01:P0:B7Gs4pzeKzc=;IupwpG6z6IwPsB2/JilppxZb1d8 QehFHx+QpV0tZhbiVrtGagxz7h6Btcnspp8WUK1ACNHhNL/Gviw8UCgVhrp7tAcRJV3R8NR// vqV3fDFwsOp3ogzCa+1Lu+RDo7dYPM8C21CQYYWtCAir6AgY9LNHdT39gWFBLGY1FbpM7BJSu ADDPwTwSi2oNfnOrlN25T7ksuK8C28PF18/QTVNXSitW9syJfv00osTjHRy1XxIJAE62PjkLu budquQTxelb1CNacC6Odz2ISW/tFtZnxnTWpqGmfkc3ny8z7JrhtM67+if3w8Fu5piSx+bmJb 3/rclJfFPD/jZZpMrZKkIXV+EOBi4grlBw4A3PB3cBT0PfDT9I1Lm3VyfZXICs7bzybN3n/jY aJdLC9/mNN+CBPaVhtun+8yIE+ZB4qXjTn8GZ44ZD0usPHyZUbYikCsmzhJvEWsyj+zVnH6QL EZvTUr0/9Jw/3y/sz4wxBq0+oMrSmHsmcGYABQaMNjLx9d3FPQsfCihOUrJMXognWdqsJu+UF /aaTpy6hciRyoc76DbPfyHgJ4/yFhu1rn3EvkClumQw0LAt+xH2a0vIipLlyD1QF15ztFNoXg deCWjyCze6A28U8WmI9SOPZsxOP8X8OrgPfgbAEBaXOYzBMNxvn0NGdB3tPEZ3sFle6r0zRyq LQALfJyEdFbBBn3UDHLNVHpklnRyRlCAxCKtqqwZrnRf0sFheX+zPrHZArwHU2FTPywzp5BN4 dO3ZSekjsaJAj0BrWTYM11VEMGdpJdvubNCE7+llnWQVjor6IB5CiJGwolQ5wZyFGkPoDHDi2 jn+7BzDQeN68Zrybt1+A6zdyNMxdlyYGyifxZFXiFDydf6tmyJdYuJvXF+hWEAgOMapCiJ3p+ mWxgQYcfSmp1+dgMbI2Jnr8FQQa3KoljPO8lSHx+p48dlsfiLYwMEs+JGNXUeytSfle9hP3sz u8j8XqR5viwAEoN8BUbzj/4lxHDjXamg1opWI/NjzusaxyPY16SR+FM47d/lQEbTN3HsjDq9S +80BFOlTMTh+6r+WitOFuO1+I7BUEv0dDWLh5xm74I9lUlun+2oUgPkXuiS8t3rdCk4di+SPE SmUOB9MBHbAMkACwQxe9HG6OsObYCQ+aqKxK47fL1I10SKMNAYC8IGrQ8DI/L2yBn28b8dxlH FOACwyJMgsZWsLYJvLt3YsHsDkdIK3qBvXqQNn/k50zZVcMQEAN+H/OPTyg3MLXdnsWPbMBZQ jfzsAoRNHsIVc+XYSzZEFjr2hKChFbnuLLtMmHnOY1QGasACoBRO518D1i7mkgwMjdvjN9+Xt vEp5uKpAi/xssdJhLp5SwerDpP7ExP906MDQJy/Ewm2sgirGTW1D3FJaQ1gTbFuG3Kd9XrVWM J1F7jUAl0e6KQavA== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" the function has become a no-op, it's former duties are done automatically. Signed-off-by: Enrico Weigelt, metux IT consult --- src/uxa/intel_display.c | 3 --- 1 file changed, 3 deletions(-) -- 2.39.5 diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index 409cbbcf..2a544779 100644 --- a/src/uxa/intel_display.c +++ b/src/uxa/intel_display.c @@ -394,9 +394,6 @@ intel_crtc_apply(xf86CrtcPtr crtc) } } - if (scrn->pScreen) - xf86_reload_cursors(scrn->pScreen); - done: free(output_ids); return ret; From patchwork Tue Mar 4 15:58:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001058 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91B7FC282D2 for ; Tue, 4 Mar 2025 16:02:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9094D10E631; Tue, 4 Mar 2025 16:02:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="DW0f62sz"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.135]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFC7A10E2C0 for ; Tue, 4 Mar 2025 16:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104122; x=1741708922; i=info@metux.net; bh=zalcM5vW0g63hpfjf7PAH4NChq2Q9vGyt70xSL4yk2U=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=DW0f62szdJaSb1Uy4mnatGG4L3G0XczTRUEJ0hwc3mokszdbY/7PVP3GCOLJy7xl +c+NAx1/p/ehNaS5GV6oRn/uEOj3XkH0dbhquwIPWqRiMfcN79VwDeanqWvLe2emF +iOnaTpBR8Ys0lw2rsNwtlQuCiJCJa5gpYA2DThi+QLF7CO+x87/XHOEE4yb86EGT plRhNf2QmbMwM7b89B2UcaRb//XtV3ffZAYmvjqKINmuln06R9kxL9vLTy/ONXiTB F/x9XDLwJ/ylEtrdjdlSjB+w24j71dACmcBtT1YHJNS7h250M0bv/UcgIiKM7+x6H f99d/La/+B6rwegavA== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MGQWr-1u3Vuu1lhV-00504C; Tue, 04 Mar 2025 16:56:33 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 10/16] use XNFalloc() instead of xnfalloc Date: Tue, 4 Mar 2025 16:58:03 +0100 Message-Id: <20250304155809.30399-11-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:eXpWTM71deySlmffsPrEiX1r0YgHtZklikPuXxU4s+NkYkbFLIT pUbSywka7W8thbYdGgu39fc4olzMvI+JrL/pon3J2wTbCqeYgCc31rOd76Qf9q+CT+badY8 ZEQ4TOwLnf/3g/MmTW06TuTmJjfRPDWkEml09Ga+B3eNErnrF/7FiV/gjfIOmtfYijG3o5R i4W9ARnTY1ljHnQnu6pGA== UI-OutboundReport: notjunk:1;M01:P0:Ld2tNX4fjL8=;ZnOu49Ih0DeLAebEqogUmPfwTyw ehP+2AA9gyyXVlFlk/2UbAbpRL66qb4aReamx4mFMZ1/6G2gRA0VGY2Zl/zqmtxPLvkJE6Kcv X1Cfuh6PD6pvD2v/34F4GgcDFWkTZbNRDYoCIQBw2gv+teHLXu+WJqOKvFvrWuUtr5LchW6Pn EuWIw4Q+FuO2Xi57sSW4YWeJqBWfX++qvRYVt5vinQ3IR707H8R7VtYsPI6muLGXBPI+8ty0o uHtNxxTG4gSIsbfW/y0xwB5jL72yGEUSZvS8ibA0eFDSDpzygQdCiETzYjEPnDbZAWlX1BQc6 rSsfuQ4nTlACKZKw3dT7iAJ6zPSVevTgf/JCs2pnCCTg1On042+2YlSDU6s79K0Eo7gEGHHHe qwunoagqZt3rmtzQEYYsNEaVnjDrQ+JH2o2ZvKGOLnbgt8vBG8XiVqdYcUN/uP+OT2TYiY39l ervPLPTPk5pDovRDHWV6vkD0sF24nSrm0WSmq9bmO+RLeRQLwAxINlPyHN+YgKr73Mm6Nz6zl QXTwDQ1ZiMEgPRPu5hv4PmCzDeL80RAx811LWHHj1Xz32kjZPJud3URu304LKIaQ/yb2DGBj4 GMsJLE3WzLdd9mqyhVzzG57Svu1xEQfjr3CGdvTgX2MEYwnHS5qepgZKvIiSjkaqAIzml/qO5 wXO30VYNDwXbc92lGW9LwfE2mnWRKvODWq19VXXcUkjXdrj7E+hXNmxGTxcnuFjhNtKvKqgtP x2/OlOGuPl2zmO1vhmJgAPOCF/FGGFpnGZT/n1L4W7cACC5qGk6WA0I/YTEP5LhJViiVEYYFo GfcIBDnaIKh5bYF3h+J9xDyXryuSPPMC2bq7Zn5IzcwtQgG8lMtCqs6wP3ZsHYA6hPuZsaIlx TAwHkBRhXB245mv9fnAE8xLyk6Dbjv5zwzWpykChoVQXBXg0F2DYQeJB+8gkLgG6pyxr2ZFQy bYU+h4Kjl2rb4kJpPXpufK8b4BKF3msWMR+1TZaWCTDjVUc2BVz6yRYXaLRW+1s1lDJgCJuzi bOGBmFlq2dSfmXohGE0IxPYyGplp6fzWoh/t4KzwIxNn0TdaHdADdU5uA5O3tzCNKZcnKyKeP iRieP/F43nyxpriT0tn8SpGQz0/FWPn47jeYTjdXdWYRmApxvPwyQoczp9bB6fYq6MhiR23ka bODxxPgwfISVgCNOfAvxrt4Vs8PpaheU8bnkAOKyAOnETg+ZKq9TibfyQKqO2CPfGCKsJzCxd G7YRAlcWONk+xNODr9aenCnp+wTRtK7z3JFrQIX1elnl9enTE7V8oDYZOA7e6wCqeoKOCRtbU Yc3hX/TBu9QvtI3hoc+HMKAr/GD5aQHpbk5BPkkQyy7zPB8zj/FPlRIF+AfzOKl1fRDt+AWJg 6vn3QYPpLLAWWhuQ== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" xnfalloc is just an alias for XNFalloc() that doesn't seem to serve any practical purpose, so it can go away once all drivers stopped using it. Signed-off-by: Enrico Weigelt, metux IT consult --- src/sna/sna_video_overlay.c | 2 +- src/sna/sna_video_sprite.c | 2 +- src/sna/sna_video_textured.c | 2 +- src/uxa/intel_uxa_video.c | 2 +- src/uxa/intel_video_overlay.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) -- 2.39.5 diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c index 07964871..5989b261 100644 --- a/src/sna/sna_video_overlay.c +++ b/src/sna/sna_video_overlay.c @@ -723,7 +723,7 @@ void sna_video_overlay_setup(struct sna *sna, ScreenPtr screen) adaptor->pScreen = screen; adaptor->name = (char *)"Intel(R) Video Overlay"; adaptor->nEncodings = 1; - adaptor->pEncodings = xnfalloc(sizeof(XvEncodingRec)); + adaptor->pEncodings = XNFalloc(sizeof(XvEncodingRec)); adaptor->pEncodings[0].id = 0; adaptor->pEncodings[0].pScreen = screen; adaptor->pEncodings[0].name = (char *)"XV_IMAGE"; diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c index db3865b9..2d012b95 100644 --- a/src/sna/sna_video_sprite.c +++ b/src/sna/sna_video_sprite.c @@ -854,7 +854,7 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->pScreen = screen; adaptor->name = (char *)"Intel(R) Video Sprite"; adaptor->nEncodings = 1; - adaptor->pEncodings = xnfalloc(sizeof(XvEncodingRec)); + adaptor->pEncodings = XNFalloc(sizeof(XvEncodingRec)); adaptor->pEncodings[0].id = 0; adaptor->pEncodings[0].pScreen = screen; adaptor->pEncodings[0].name = (char *)"XV_IMAGE"; diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c index 6e30461d..0b3330f2 100644 --- a/src/sna/sna_video_textured.c +++ b/src/sna/sna_video_textured.c @@ -414,7 +414,7 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) adaptor->pScreen = screen; adaptor->name = (char *)"Intel(R) Textured Video"; adaptor->nEncodings = 1; - adaptor->pEncodings = xnfalloc(sizeof(XvEncodingRec)); + adaptor->pEncodings = XNFalloc(sizeof(XvEncodingRec)); adaptor->pEncodings[0].id = 0; adaptor->pEncodings[0].pScreen = screen; adaptor->pEncodings[0].name = (char *)"XV_IMAGE"; diff --git a/src/uxa/intel_uxa_video.c b/src/uxa/intel_uxa_video.c index 8287be4b..8e0eb4a2 100644 --- a/src/uxa/intel_uxa_video.c +++ b/src/uxa/intel_uxa_video.c @@ -339,7 +339,7 @@ XF86VideoAdaptorPtr intel_uxa_video_setup_image_textured(ScreenPtr screen) adapt->flags = 0; adapt->name = "Intel(R) Textured Video"; adapt->nEncodings = 1; - adapt->pEncodings = xnfalloc(sizeof(intel_xv_dummy_encoding)); + adapt->pEncodings = XNFalloc(sizeof(intel_xv_dummy_encoding)); memcpy(adapt->pEncodings, intel_xv_dummy_encoding, sizeof(intel_xv_dummy_encoding)); adapt->nFormats = NUM_FORMATS; adapt->pFormats = intel_xv_formats; diff --git a/src/uxa/intel_video_overlay.c b/src/uxa/intel_video_overlay.c index 8e0eb7af..35f615c2 100644 --- a/src/uxa/intel_video_overlay.c +++ b/src/uxa/intel_video_overlay.c @@ -465,7 +465,7 @@ XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen) adapt->flags = VIDEO_OVERLAID_IMAGES /*| VIDEO_CLIP_TO_VIEWPORT */ ; adapt->name = "Intel(R) Video Overlay"; adapt->nEncodings = 1; - adapt->pEncodings = xnfalloc(sizeof(intel_xv_dummy_encoding)); + adapt->pEncodings = XNFalloc(sizeof(intel_xv_dummy_encoding)); memcpy(adapt->pEncodings, intel_xv_dummy_encoding, sizeof(intel_xv_dummy_encoding)); if (IS_845G(intel) || IS_I830(intel)) { adapt->pEncodings->width = IMAGE_MAX_WIDTH_LEGACY; @@ -483,7 +483,7 @@ XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen) if (INTEL_INFO(intel)->gen >= 030) adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */ adapt->pAttributes = - xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes); + XNFalloc(sizeof(XF86AttributeRec) * adapt->nAttributes); /* Now copy the attributes */ att = adapt->pAttributes; memcpy((char *)att, (char *)intel_xv_attributes, From patchwork Tue Mar 4 15:58:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7DC6C021B8 for ; Tue, 4 Mar 2025 16:02:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 45E1A10E2C0; Tue, 4 Mar 2025 16:02:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="j0Q5Qo9N"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.135]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9207410E323 for ; Tue, 4 Mar 2025 16:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104122; x=1741708922; i=info@metux.net; bh=PMClv+WlpOWQnt92nIIgloM/GwBm5NGn8jiulksTyOw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=j0Q5Qo9NQULz+lsl6ziz8ihIyg7aJoOMbFLnRh3mtP+r9sQdfX0AL9+M2WXuEF57 KD/mWA2V5Hwuo1s8OejkiD+vKCvLibzs/C5xSdCmaNivPID28EYpM5l5cYhKEXbmC Ot5e2f89ZgKHV3ih11uNSSNwxESUso5vqrMGtMNf4VQhINDU68wyxMpNK3Ga6iENg fbzO5BBHVyZyJlliyEp8SfolYqyXTdeQW7D5poK0QY3hoDcEu9GDu3RZoDxzRSu8c R6rAnAudrfchEb7JSfK2mbP60VnLnrdYYwUUwwoNYLugI0/467hMe0VxgCaniICLz 2cZ2555UmhrX1ZvPLg== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N63i4-1tEICv3ASW-00xN6X; Tue, 04 Mar 2025 16:56:33 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 11/16] use XNFcallocarray() instead of xnfcalloc macro Date: Tue, 4 Mar 2025 16:58:04 +0100 Message-Id: <20250304155809.30399-12-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:H0Co3RSOIZTDsnO4hhDE+GCRe/B2An45WPL1KklWbH6yjRm0IXT mo3D46utQWsTUJ1WbF13OSwE3SHKlTGmLXwZ46/6y9qmBppdURKWe4ciC7BEiHoy5pK254y hin/jYHelDIHhhUuCTvrbPa7/KX/ud+A9MuMxCuiSfPHArQjB0ht2Skh2ei/h66YUiaXCLt WHcvf+K5tbORFcZPYdbFA== UI-OutboundReport: notjunk:1;M01:P0:r7Yf5ys8nn4=;QUrJ82QWy5Yj1l1SmoKwtgBSkSa UfBgYH63wHbE/YYFzR5FhRIukwKoZ6Ts2JqEJsQh/28kopNGAqMEQcJglbRtXDm2/8bet0RGP Wt+9zMgEaN5wNUZUs7gQOOd6kyhy4QfL9P3ZefrwmavFF98Tzzf2CFa1sTIhVlNcdly1B2Unu ra3DWmqI8hxONhsiGNJNQHpPg4rAIzsT4aJwbJYNE/TrEi+zgqw+XaLOVI/OEBPZkjEG7UkKl kaoGyc3VDIDUeyuEfrkEh5cKoBgP8TMYwBEodyxAX96zGZ0I6oW6ffAFMHRDiu2ysBqLdHocl qI8cvcVe+CtaN3Tl2l3W2+sbI31V948FmjSfx671fJ2N7qAT8P8IpQ4TsTAdgHK12b32L4yHr IeE+1T4BmdPodkMwh+fAi8yP8W0wBGjnnpDGAD40ZHX7qA8KUjQ1wPrj4MVvnXWp+SaBWzRrl 1483Ml3DW3mC7lPJ8YoTg2JjjORSIcrNXNvn7aBjT+g9INOP5uiqgDgQrKQrWtwhkziVP9RTS NIY+bNkEt1cte5Rz2Kj+H4BAMKzklfaimHUXh7dUNJnw4wRGXgXvvue4qQMDBx2kYo/vijcBf w/DKIiWfyNijUxxe6AZ1VCIPMmWziwNH6/2a7MhPwaF49PuE4w3kdW89SYWcLzlYm/MvF3WKU ZQAqKL6Kt1FfdqaSvbPXqvFw7zO7NriVZvRbiD9d3nA8ePw+laHrd9Il+CHxM1sMAMTSyqkIw wFwVwbbQJ1s47YsSqhqTUeF7r4o+D5JNEhlHB7+fLJVDODzeMdaobDAY+yws3ZZxjJYK6Bsa1 bFBQ3Y71DEIBf99ts6Tf8VZjJiajrihy0BZSt/PrHG0PY0oVrSHLojG1Fbsnw7Hq26T9xguka yBrenn3uwqysN2jgaF0I4hPq4IAEBthR/IMPnUdIGRKlzvsSiYHV8kCazTouB1N3mYPdK/viW 56buM+OJyrhb3MyajQmmuo57XhvvteL7HzeEZUN8cdJxXSMl0zzGw0DEY1jpZ1xs6kR7Dpzdf uLZEiLiW9FXg+1ywL2gBLWrCjQFHlu3NsHskhEA4fSAKKu4t0soQQGeLbagpbT7mbgStHBaDf ta2hv3N+grxvcfMc+CSbO7dObHwS6TpwWa7IdRSu4EfOVcVUdHyiIpEibm3glXwoY6ngz4lrN Ja/zhh+x9aWEQs2v0w8uqn9V63cfYmx7/LrcaczLNIblTZLH72oT9tIngBVKIihQEUPj0q2Qg KjGBRdf2IlJeMA+u/GPcfUCk45/QH3jzoysxIufz+t02S3M5MGX/4MEsgCzDcCqMuMHyivUxT teUMk4xQTkBGIWg2L25/6Ppuma5aqIMrb1EjxsQlbphnhwytsHetBcKwo7zcEdZxDdtoccftJ lBKU0dBHOFSA2SBA== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" xnfcalloc is just an alias for XNFcallocarray() that doesn't seem to serve any practical purpose, so it can go away once all drivers stopped using it. Signed-off-by: Enrico Weigelt, metux IT consult --- src/legacy/i810/i810_driver.c | 4 ++-- src/legacy/i810/i810_xaa.c | 4 ++-- src/uxa/intel_driver.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.39.5 diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c index 778b1a41..e24d3f8b 100644 --- a/src/legacy/i810/i810_driver.c +++ b/src/legacy/i810/i810_driver.c @@ -155,7 +155,7 @@ I810GetRec(ScrnInfoPtr scrn) if (((uintptr_t)scrn->driverPrivate & 3) == 0) return TRUE; - scrn->driverPrivate = xnfcalloc(sizeof(I810Rec), 1); + scrn->driverPrivate = XNFcallocarray(sizeof(I810Rec), 1); return TRUE; } @@ -503,7 +503,7 @@ I810PreInit(ScrnInfoPtr scrn, int flags) pI810->MaxClock = 86000; } } - clockRanges = xnfcalloc(sizeof(ClockRange), 1); + clockRanges = XNFcallocarray(sizeof(ClockRange), 1); clockRanges->next = NULL; /* 9.4MHz appears to be the smallest that works. */ clockRanges->minClock = 9500; diff --git a/src/legacy/i810/i810_xaa.c b/src/legacy/i810/i810_xaa.c index ea03441b..1e0a8527 100644 --- a/src/legacy/i810/i810_xaa.c +++ b/src/legacy/i810/i810_xaa.c @@ -284,7 +284,7 @@ I810AccelInit(ScreenPtr pScreen) pI810->NumScanlineColorExpandBuffers = nr_buffers; pI810->ScanlineColorExpandBuffers = (unsigned char **) - xnfcalloc(nr_buffers, sizeof(unsigned char *)); + XNFcallocarray(nr_buffers, sizeof(unsigned char *)); for (i = 0; i < nr_buffers; i++, ptr += width) pI810->ScanlineColorExpandBuffers[i] = ptr; @@ -295,7 +295,7 @@ I810AccelInit(ScreenPtr pScreen) | 0); infoPtr->ScanlineColorExpandBuffers = (unsigned char **) - xnfcalloc(1, sizeof(unsigned char *)); + XNFcallocarray(1, sizeof(unsigned char *)); infoPtr->NumScanlineColorExpandBuffers = 1; infoPtr->ScanlineColorExpandBuffers[0] = diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index 79105b89..24783492 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -460,7 +460,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) return TRUE; if (((uintptr_t)scrn->driverPrivate) & 3) { - intel = xnfcalloc(sizeof(*intel), 1); + intel = XNFcallocarray(sizeof(*intel), 1); if (intel == NULL) return FALSE; From patchwork Tue Mar 4 15:58:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001057 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 268D5C282D6 for ; Tue, 4 Mar 2025 16:02:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8834810E62E; Tue, 4 Mar 2025 16:02:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="02p/pp6c"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4898E10E62D for ; Tue, 4 Mar 2025 16:02:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104125; x=1741708925; i=info@metux.net; bh=KdZuWN9Fp65+jiAwqR607ECfZ0trNaC2EeK2Rsd0PNk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=02p/pp6cRhi1T9LD3XU9sPJMWHSTqhh5XRJQZjhlYOP8jqvgKjVoGoiARZEiK1Ie 6T6xA/ByZ6um15KhpXKDDd3FKxACjhtgc9tpTyd4/UYlo685M3RevABZWc1b6pGXY FPDMofqU87Phxq9IgCsQjSRaHeJg/7SRyf8dSETsiGbgrck1tPBw5SEsi5xQAZvaK aza6ZpyS3Y/rtzgTRIZxHr96rR4zKRaGCLtR069sJ6chOYuC/+AedeYupVyiBkHeT GEHvQ1IO81DEN38k7yH4JcWqHgEXaivRyI5Qb0qAppEjiJbOH9wjjE9NuBVGrP3vM 0NTIO/y61mklx1PgOA== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYNaE-1tkaoq0eqw-00Pfyl; Tue, 04 Mar 2025 16:56:34 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 12/16] sna: use xserver's bswap_32() Date: Tue, 4 Mar 2025 16:58:05 +0100 Message-Id: <20250304155809.30399-13-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:c2pjBM+W3XKFVwr4oR8RJoF00ls/JRq6tsCX5M4WcUMrZESjDHp ghTkk4JzPsWlhG5r8OGmSlG/51rSXb8A3zvrEF4RSVb62+k5nIr153t+mVRhSO90L6owDjA 4eDn8zMTz/sV6UXmkb+iOktAYWrk58o6pi6w4QBmRxR8Jyt4gktMuCfezZPpsaxeT7RJMdl pfY6P3LxRwuEukQ0fLslg== UI-OutboundReport: notjunk:1;M01:P0:SUFXpOHsiWs=;rEig1tMkiZnpGdm6E/p03Ms3kA1 QYAJd1JPUF/Ijj0wUXaFNJlFKNadoSjAIWlCaNS2fAG3zdmQ547pkeees8sbsUq4JJ6QtNf2d bK4/GR9UPtQ3BSDVaMPeYwuiEbKLjm63Mw+xwj6ScLN/t2CeKsIqmTQahxZeYZMKIk/oRVoy0 E1ETQYr3EUs7a9xqjL3NncZBeih1Xqt28XbHHBUEp7FJ+srw8ujdUQLdbVn6Y6n1h8KngikH+ o9sgD25lO7FHNgoO06BSUIsbCMaHd1hMAIjCyAZFb8oBccQxdx7PvOUWG0T10uaNA152UuJvb VEG24c5RTPcP0kYz2zVsERA9XlmdILd9IrqwERdRLTF1UWiw4ahnzCy2SLALwpejs8VYbpZui 8OavN2pg8/aTH3JNc+lUoqtBgC3PSsGHdyXDwbT1pYdAE1/ITI8zUonv/GndkzCzY/5HO6UpR hcUHvc2fKbtCXM3LEA2g/Fn+aeSJ1EwDYcs2/1neEDsRvSFLFwbG95LNONAdfstpqk2K2T+fg 18TTvdjtzHnZAMEHKcsPhEdwqoOfvzoqJYM7NYSV32FUn02RzIWX8/D2TE7L+hs5UdmCW95jF t7irScm/dmCmp8uuiRHsaBVSZq9EcuxAMo9jdd9bMsXGJNOOeycYvH7L3+5E0Z0oS3+s2DOEq BitkjY+HYguVELTyG0V6BZ21x1lJbJN2LILyMkHvj69SwFzgZ/b1oeOyseiOUAV1DAWxho7pG t7paDKhkjRFNMAEgXZu/On3SL1BkdbzA91UFGu9bscQU6UCMq88MXd6OMRCoJO218/Gsq83Xw FDHEQqyhm7DwJUIhiKYZSL5MHzx15/8YLJRJTUlq92T1S2WaveBzk/qQRkMzUIym1ql/WyvcQ iDsa1izJzX2dNsm+eNQ6b73wDCEsXD+0EsidJBhZphwauFVRwocZxTlnxPFWr3CgcyJHYx8Nh eE0+hpJQQvaKPiOU2gWt0ja4vF15SblowvXkvxIy6vKboCjkPBahonRKfHBHWbIF0KdYXqzhE H9tOgmeibp1TtAfzIK56uAz0YGz2M+uANIbt4PmzOW3KkUH46QvpAlC+vbJGubxxyXwTfcorr bRuINI1pUD5HVPsgpHAj/xHy0z2uQJFUQlXAYG99/lyDvFDUwH+zo8HniG8wTt6FtBm8ESKEE sot1Kg3dhkV8ObpzYU4M3trR70lYlT/QIhFHmjTRZgPz+F6KFLPTaQKBDqumiTOB9RykAdSp6 zDyd2ZX6NDUfQrlB1qhdG1sOHHZVETNpNJO9OTRFByzwHorgav7/GuZ3y+MVapXWDhPGwAvUM /WYDOLOKbGSnEEjAGRE7c6oNFUiuE/yBXYbKnmx3eK8GbPmU+iA79IMk3qaEhiW8+plmIzeJ3 qp6ASiOA9EChUGIg== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Some (non-BSD) platforms don't have , so better use the Xserver's bswap_32() implementation here. Signed-off-by: Enrico Weigelt, metux IT consult --- src/sna/sna_video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.39.5 diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c index b7aa6624..9217a42f 100644 --- a/src/sna/sna_video.c +++ b/src/sna/sna_video.c @@ -68,7 +68,8 @@ #define bswap_32 bswap32 #endif #else -#include +/* use Xserver's implementation */ +#include "misc.h" #endif #ifdef SNA_XVMC From patchwork Tue Mar 4 15:58:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001066 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0E73C021B8 for ; Tue, 4 Mar 2025 16:02:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4235210E638; Tue, 4 Mar 2025 16:02:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="dI4OXNu8"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.133]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0A7510E62E for ; Tue, 4 Mar 2025 16:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104125; x=1741708925; i=info@metux.net; bh=bR0IXSNJZLIIcGsMXk8jAPZ/JnE7101SkcIprGe6n14=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=dI4OXNu848uUe6UqfD7+yBhE0Z+kxm0toN80BAx6ACqd30SWMpg4jio8tJoOOwI8 1+swDI/tsr3BdyafJdpfb2qcx0e8iZ3QBChimGvx4AAgKMIidYhdzkls3Xe55hptn k7TmNFjADGUEjcSMvxpEdpBCSk813RHZp1RqEGsKjvu1KOKuVq4t6d0CCnMiB82SG hCfm9/ATT2Ls1tRbvWl8EDM+4s1MDNL/bUTFfSdPncmOtVIrvxqT1R1/nsE21MmbC EGVj3Fd/K7OkSZwgFD1EXt3NGRlYn+2QMPWZ/JjPBaeNTvCa3ziZSTzeCjrofgOAs 3CqnDoSUSpVsEZrFsw== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mv3Ds-1syu0o2Ywy-013wgL; Tue, 04 Mar 2025 16:56:35 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 13/16] meson.build: increase required version Date: Tue, 4 Mar 2025 16:58:06 +0100 Message-Id: <20250304155809.30399-14-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:EAwotnE58s/21inW9dALDZc+4Mt7EzeDQlqz5AF4+XW4cqHhJqQ LfohZKRLXB9kK7kp/UCvEths38vHnoMkD6Ad6KM2QLGt7AQKgFd8kBEGdPOWcQGxA4ItUL7 LkgUlUzNQPRTFhnffmqpC3hJOR2kLEz0B3ldZZ38ZGwbSYVbygAL2a8G4NsQBZE5adiUXGQ 6Dc/oJGrRzs4kRtOJoJ6g== UI-OutboundReport: notjunk:1;M01:P0:GIrHQXfUh7w=;JI0EsI4IA32VmoTHCzLAgsl078C TseTEl+/fiTN/jpIRB1BVn6Ba9O6QkukgipQy4bziuUKrXZdx8HXUrlhY+wVzagF3xT7+9OzO RxQc1FFN38KqgRhBKia4vQJRB+s3m+Jt+fhmSi0eZSmnWw9KcWSGGUwWaljRXbQRv4q7oFhUC itcuQOB/4cSA8Qg0ZhtyNMhZ1zXChYdNGwJvKNhGN9gHT02LwsmKN4oGFz6/5yNYlgo1zoBlU QpaP8AerBsxV6Er7B8cH667EJ1yhTsKiX2cOfL2Coz8HP20m0ecG0i0pQvLymDHc5mhOnpnjx Jw7Jj6fs4JHLZzRqmyjeos5ic1U7uRF72D3F9B5h3eiIN4PG8wozikf+59eS0Hle3mN/j5/LB iYWD3YsxVq+kUlESKjRfxUqQwazAQe3SXx/xNZYlkGvuy4yx0ek525PlP4lFKh+0T0+xeudlg UAjI7II+yGTaFa6yVEpAxT6VP08AGL2p2pvn8gsWbIx1wafxM711z+iaZ3fLWq6FdjNkfLXQE arXzUFl8nUv0DPrvx+FqsjPCqhXSifkR1AH9Dp6A52w71EY7SZET71nOshcJ1d0lzI3OMm/Yx /qT00ve9GEgpSPRBzJrZXH6ZnZDlgB8O88j/ApAGLm2EIP01kGfMs8juTLmXokAmEoh6m7/rg pGl9KW8Lzs3w31p4UVtsaJLZ7u9wC3H+CBtTFWQn3g9aun217SdQLIrf5T791DLB5izHnMl/9 anvnsPcUg7wUDjI9+AZ2aYRL1Ddzlu80+tGKOFTuhuMipSSA+ELzBnJ9JPMUOhZ+ddZq7pnzr coa37ai4kiokeu2txC7VPhuTME2ezlkJHRsHVY7YAotR5n7bxIF6cw8XdQxoXfovUKJw0WvQ0 BgGqezYom/54l7GFFtrKdFKp1hQuj5vHBQAURNiwC5NQocwQeRn2FmeX7ueb9FPxcFxWJ7mBb EktEQ2f7FFVJCCx7SRPWH5vWSUAt4bwnjUlx6mvK5okZxGQxRJWEaIR2IwhYUU8rCEpp8Y9al a0RoONFwxtfsL3b6kaWukuB79hcXyp7wROPxdJt0selek+4M+q34oodaICXPlt2hSkDJXJK5D yUcDQThxuBFQdQULYrzXVhnK9RoYXADHsAqH52WkMzHdnxJ9CG5StbRR4VMeujTiqXmE7O2Av dcvPdu4uAbLqLSeGZ/ZVBU2Ty9FytMNF1ol2ycA8SrIsUC+H88ARzccOKwWA+QQ6jxNJRv2fg Fy/WG1bZGAGUXOsrU7gApSbgTLesfXB7gQ/JGRdTazG74afCp/w0QYu8rLzBIXtZ78ly/bVB0 7dS9j1IA6nBPx7EqyzP/ykjplpVGzKwVDw5TaDb23gUs7MQa/0JTkb3v/gnpCXaaaU7Z6D8D/ wS5smnjGmXa6cxcw== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" tools/meson.build:45: WARNING: Project targets '>0.40.0' but uses feature introduced in '0.41.0': capture arg in configure_file. 377tools/meson.build:45: WARNING: Project targets '>0.40.0' but uses feature introduced in '0.50.0': install arg in configure_file. Signed-off-by: Enrico Weigelt, metux IT consult --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.5 diff --git a/meson.build b/meson.build index 227ca2eb..fa861401 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('xf86-video-intel', 'c', 'c_std=gnu99', ], license : 'MIT', - meson_version : '>0.40.0') + meson_version : '>=0.50.0') config = configuration_data() From patchwork Tue Mar 4 15:58:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 16DBDC021B8 for ; Tue, 4 Mar 2025 16:02:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0302F10E636; Tue, 4 Mar 2025 16:02:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="in2+HS7J"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.135]) by gabe.freedesktop.org (Postfix) with ESMTPS id 97AD510E62B for ; Tue, 4 Mar 2025 16:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104121; x=1741708921; i=info@metux.net; bh=ApA7vI6COL6QV4EMo+Qj4+q5vFtaYc53bzyF2bYZ4y0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=in2+HS7JpEryZjAEk7K6efH8XqicXwK4e0hw2tjGhZsnG369PB4uKrDmgLseuYMF U0XSANqPVYKyCTKKrzWqVCMj7bs16o+BkqamTxWB//ICgyqXYUBagTsDKbhESGAUM c1lISZY7VHFggo1xnh8Hg9RjfMqLeZHBezgvU7/sCo0ZbrrDyjhT+nb/mIg+vyqve 0/BUftAH13kTc2z3p3wD8gGEmZOheAqutgliSS7Wuyc//LxvMKU1Kml3JyU6z/ppB nASFHEd5fUG8CsXwLBqa1uOAyziulm/5WPBPVfcOPWYn+S0ST4EiQ7LQjTEjxAqvR LwnS7GjWUqOAm0xq5Q== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYNaE-1tkaor23MY-00Pfyl; Tue, 04 Mar 2025 16:56:35 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 14/16] Define __container_of only if not defined yet. Date: Tue, 4 Mar 2025 16:58:07 +0100 Message-Id: <20250304155809.30399-15-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:udiS9uvVqlZ1qMy+HIRZLMe1HfdDLTU+kb4XBaDTruZONHAryer ay/xU286Z5d/DjsfVXsv8ZKWHRtsD/8Jw7rkQeoiqd7Zgx1FEnafgIhRDlChXmp5NzAp7FB /iXrd6D6apDFyT9dy1bPk8lGJsgKRhfaXDi5rlDjFZ1zIBAcylajV9Ryq+lA4cjxG01Gq4w FA15U5DMdKSOeD7ZKUPCQ== UI-OutboundReport: notjunk:1;M01:P0:RATZoGLiV2o=;UHOLUdC7y6GoIeCcc+mDpmvsXTv PHJyxL31wY76ZdVwmfaiSbu7dmgUImVc3nWXyt4bqD4JJfSysCqPSUGFPGnW4R0QFgzDYl3Mn UJS5CMDPv6yWzlgsWNp8TTNkpSqIz8JKhQ4mSqBp/BHMTPlzVxqAQNy8baJBeiOyQ2qtykidv 5dympoOXIsfPZgkjpCBQ8u3867Hk79s12VElbKa2jUNsBS0LCVsvO9/sx+hoJVWoSvLubhu1I q8SzdRxVi19C0RhmiHA2k4vx9gqDWY+TJitP8hBrYv+LpqH1WbVom6IAgaF/rZREne/YsJnly 3zwbzind8Dd5IlJJ6xEINBLUMr302NdZvnrdD+L7ES6Nu4hrO6yJgFAkcE5YqmQZfVuIFYExG aNhTlV/GIlHbsCX79IcQynnm/R5DoOFaZLEihXky999DxcoBXfe5tOQKeWMQ9oJ+UnNpRdwIU X3bLlWOAwCmdC6Bb5FTf3ab9MuWA2Bny/e/eq1x8hs0AhzV168mtsZyg/IEdmgFOkhNC85Naa bYKccKXnzSr8wxG/DMv7mhWUMsnPLXc3vyOxPTn0UcYjzXFnMT0j2amw1hfdc2y5udVnaCt6e ihOxbEM5/TuxvUDDLofvHATobvGoTC0bPeFJVs5qQvfJyvIrJ3wu1WyoXMW9LRuDTjMwTkxHs h2AbQylJUKRVfl2THU286sEjokCAX3r3w3s7dkIziEmjBu+JqMkFocPuu7hwqAD0i2ZE8HJ0O tdNL4fTkLUpKhJZ56CRoLz27919YI8RVtk+CeI1WgU6S2+UxNB+kPBCcclFk39tJOalEExITE Byhh0Vxx803P21G+0Admh4icdgdDM3z1QbwmCGA4hJqQQpWDvDb6oHZ44LdInv+1qOwhZBlF7 M+vAYxkAe5ix1mvcRAEWvglRw2g3Qa5l+hps2IZkXsBgx4XycgFmEYwOxHPVnrdPZFyV7+q57 n7DADo9v4ReEFZ1vxMwLnKGgfNGxDGUV9V2X888D2WAKccRJK5linzRxwIakO4dclg3Kho3yJ xXY1xYkNNy2Ql3v6WVuzv9M6uct0inwi4wcrIqgITDw4ew98TcR8O8SA5UhKzxjvi6D0TPGYn FWqXRpma82uGTR890x1ht4uAAs69A1Ywi8liC3/C2SH2mJsxcAPngtibO/dv86NTv7F/wD1dq 7mAiQH4+4yGrjzONQvqJdIIZXwcEXozLvRS0RKzb7Lt11D4aZESGBb8eNcgNx9z8fgsJlKcgQ U2Hhp6EK+KHrZHGZexRekaQySgBRoEeL1O0kL2ihRrZKyIrpjV6gZgrr65geTQ7L6KAkFx4lW 8/UdlGhgDrYMNNUJppmlBfmCoh0TWdEcRAczdWA+NGS2GmSqipXM4eNHbRIQqv08RO8p1H0LP Slz0KemGhWW2ipyA== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Silence warnings. Signed-off-by: Enrico Weigelt, metux IT consult --- benchmarks/dri3-swap.c | 2 ++ src/intel_list.h | 3 +++ test/present-speed.c | 2 ++ 3 files changed, 7 insertions(+) -- 2.39.5 diff --git a/benchmarks/dri3-swap.c b/benchmarks/dri3-swap.c index 4dd423b3..fa8ec34e 100644 --- a/benchmarks/dri3-swap.c +++ b/benchmarks/dri3-swap.c @@ -110,8 +110,10 @@ list_move(struct list *list, struct list *head) } } +#ifndef __container_of #define __container_of(ptr, sample, member) \ (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample))) +#endif #define list_for_each_entry(pos, head, member) \ for (pos = __container_of((head)->next, pos, member); \ diff --git a/src/intel_list.h b/src/intel_list.h index c8a3187a..f0fe7af9 100644 --- a/src/intel_list.h +++ b/src/intel_list.h @@ -305,8 +305,11 @@ list_is_empty(const struct list *head) #define list_last_entry(ptr, type, member) \ list_entry((ptr)->prev, type, member) +#ifndef __container_of #define __container_of(ptr, sample, member) \ (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample))) +#endif + /** * Loop through the list given by head and set pos to struct in the list. * diff --git a/test/present-speed.c b/test/present-speed.c index eccde931..7765aa94 100644 --- a/test/present-speed.c +++ b/test/present-speed.c @@ -108,8 +108,10 @@ list_move(struct list *list, struct list *head) } } +#ifndef __container_of #define __container_of(ptr, sample, member) \ (void *)((char *)(ptr) - ((char *)&(sample)->member - (char *)(sample))) +#endif #define list_for_each_entry(pos, head, member) \ for (pos = __container_of((head)->next, pos, member); \ From patchwork Tue Mar 4 15:58:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA0B9C282D6 for ; Tue, 4 Mar 2025 16:02:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5545B10E62C; Tue, 4 Mar 2025 16:02:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="mWwauAPO"; dkim-atps=neutral Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F3DB10E62A for ; Tue, 4 Mar 2025 16:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104118; x=1741708918; i=info@metux.net; bh=OaM+LWQMIWoBJnXRbdUJ6h33XL0aDnyrTuxByQYcRVQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=mWwauAPOcTnPgqmWcAdX5sp/sMGYYgZF6KiTtr5CcrPL4zStqPSfGGmRBlXFewl/ /SNuG71llv/XUarq77TSI2uWHHskel/+/V9/ZQqDJAwvhT/7woglSEBt3o6uP9qgP leE5SHZssdyJb8ZQDY9LzApOlinHVY0xIzjxPwihKhpW8gq/tTUf+WO2UpKlf8gtp t4RfkdPbf0D5Dm2ENf9F6WGGfboEEspU5pd1wyS5MIrizEyU7+ZkZc/vWdevqUiqR EZUp1Jb6HxUb9htHIYaY3Ga1XhmFoLN207634Zze9tN1dHhfWCYydc7qi7WbxeAjZ iM83/yXTZuAde6CvMA== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mv2tE-1syu0v2IEa-00wbha; Tue, 04 Mar 2025 16:56:41 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 15/16] use dixDestroyPixmap() instead of direct driver call Date: Tue, 4 Mar 2025 16:58:08 +0100 Message-Id: <20250304155809.30399-16-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:7QtobdSp6JqDoSfbO7vX9mKpwvcecG/4vwegiv0lblhyQkyaz7j 33c1eCIMhr7c8zKkCgZ3Kh7P4EvVaf+yg3yR9xP5JRSwBRW/EBcjE9Rws/kamzky3PIJKEE 1DqMIXdBjUMh9CrdWhmJ7riY8jkfORB2Y9lzx6tiIZ8qEMdYpRnViWm6VzIZLw15xcIlnBi Npx80w2oa+eyZMBD4Nbmg== UI-OutboundReport: notjunk:1;M01:P0:B9UYhLo+5Ew=;1yso9AVFg6rB/+qYxi4SB4krFw4 txKaMwDEFZiMRbwyn0UwPRnw9LmabmkVqbcPtzqOYbZZF9fHtP6AAQq9lk1YjXwPIuqkpeAVa xILe5CHOC2scDmwB3UWy3h/3TEDJILJTVmsK7IGjoR5i6JWNKfW4VSgq4pVsK+b+1Xl+PcLJ2 8T74gf1yUcgTOcpoSc1QnLkqzJD5fFVpI3eUjD6wvxvgHwCQFS764535CQml9zr3GtS2gdlv4 KkWqVSZcTGrM9EtKXlcIdgHuvQdc4OZfvdPe9oCbCC8kCk8wKOHhmqEjgzdNXbcLYkMTn5N/T DjDcF02hr+TJzJWaxQeS0cggiEeFCr7NYRCC720VDnaIZyIwJP1moUkYZxEAqo50iX9kFnXvn fJJxTdIFRDHNbG2JWThQc8y0iac8QWM22nPxXWY43dPBSgBZV0RpO1GcNBeHgVa+reKjy7yRs +DdnngSMuvncwmm9cHx5XDHL8vA3lFFeNw3waiah14G+gbdOZy1R/gAnjPvTkT0uiwpFUDE4w hgY8tBjWIQBPtTX5I3Cy6ap8eGm1WxVIUSyl+j2Em0y4QeJzJHNB4kOW/XhFTlMVozDkFyxj7 qfuV+AFg9aL7BdPaHBMYJVvnXvkH8fPOXc2gb7BCq7B3wh2LWhKx8rhY7JJL4dRjnaQr3+fJB gHOnmWd4TGvIjp0yDmOT6TZEXCgfMAQ76JzCaxpwX25cHNTwHrL4cQzIlsRFjpY7Pw+WBKHE6 dbo8sc2n3c/dBbNVXV5+AUJ/aZCw+1tSN99CQmQ4v9NhPeRkMlO3uwdZgPLjDepGcBD4PtVSn xOR2aS9t75WN7bJn17xHaezrWl7itQ6udoTE+DDDvMC5TVL4bcudUWKJkzVxrLveCAwv4JGYx S1Jn0jQ8L8SEMGLKy8ParxyqL2K9+5rnaqqbnhOJ5WobhIqIXJomFDACHL7oxhxrrFVakDN+q ISnsh9jAgYyZUctBHhmvUmmK6HPt1SIvbW4nsQ72G7ji74auT73zFSrNFro9M753mCpjSX9vz EDTb6EBb1wbyAzgZiJb0qeNHP+gca7AcBy8qyvaufNMwmJHszLeg1ZyDn39bk4uilshAtlrVO gg6pdBvWc93TnAR8lg4Mak6Ym/d3mPVkReL5APPGLVPjpFl1Z1RYhaD0hWf+VUsVHpFl3T837 C7VVnGjffZAoP1nlboftxDKNBqfzCbVq00GBZAWPCaka6s/AQRdHRC33CDqRQdEcMnCqMPZ5p nRa17EZuUAvaFCaXeACIsSqAEl9o7cr+LwM0Zt8u3NFqpvlzJHyPP3kriafam06EnmvcdUm+L AkcGXhYpdBQ7nBohXEfwAMZBj78If41ax2YDVWVW8NLn8hay40PhWyac5ZJVH+YGL9Oi5MDOs fD8QxJyTgK/FU/EQ== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Direct calls to ScreenRec->DestroyPixmap() blocks cleaning up the wrapping jungle, so use the proper dix function instead. See: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1754 Signed-off-by: Enrico Weigelt, metux IT consult --- src/sna/sna_accel.c | 8 ++++---- src/sna/sna_display.c | 6 +++--- src/sna/sna_display_fake.c | 2 +- src/sna/sna_dri2.c | 2 +- src/sna/sna_dri3.c | 2 +- src/sna/sna_driver.c | 4 ++-- src/sna/sna_glyphs.c | 2 +- src/sna/sna_render.c | 14 +++++++------- src/sna/sna_video_sprite.c | 4 ++-- src/uxa/i915_video.c | 4 ++-- src/uxa/intel_display.c | 10 +++++----- src/uxa/intel_dri.c | 14 +++++++------- src/uxa/intel_uxa.c | 10 +++++----- src/uxa/uxa-glyphs.c | 12 ++++++------ src/uxa/uxa-render.c | 24 ++++++++++++------------ src/uxa/uxa.c | 5 ++--- 16 files changed, 61 insertions(+), 62 deletions(-) -- 2.39.5 diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 90a61ab3..e3c57edd 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -982,7 +982,7 @@ fallback: if (!screen->ModifyPixmapHeader(pixmap, width, height, depth, bpp, pitch, addr)) { - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); return NULL; } @@ -6871,10 +6871,10 @@ discard_cow: box, n, 0)) { DBG(("%s: fallback - accelerated copy boxes failed\n", __FUNCTION__)); - tmp->drawable.pScreen->DestroyPixmap(tmp); + dixDestroyPixmap(tmp, 0); goto fallback; } - tmp->drawable.pScreen->DestroyPixmap(tmp); + dixDestroyPixmap(tmp, 0); if (damage) sna_damage_add_to_pixmap(damage, region, dst_pixmap); @@ -18011,7 +18011,7 @@ sna_set_screen_pixmap(PixmapPtr pixmap) pixmap->refcnt++; if (old_front) - screen->DestroyPixmap(old_front); + dixDestroyPixmap(old_front, 0); } static Bool diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index d4adf34f..33a7e70f 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -6046,7 +6046,7 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height) screen->SetScreenPixmap(new_front); assert(screen->GetScreenPixmap(screen) == new_front); assert(sna->front == new_front); - screen->DestroyPixmap(new_front); /* owned by screen now */ + dixDestroyPixmap(new_front, 0); /* owned by screen now */ scrn->virtualX = width; scrn->virtualY = height; @@ -8918,7 +8918,7 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo free_src: FreePicture(src, None); free_pixmap: - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); } static void @@ -9028,7 +9028,7 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo free_src: FreePicture(src, None); free_pixmap: - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); } static void diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c index 401e9a06..ed26199c 100644 --- a/src/sna/sna_display_fake.c +++ b/src/sna/sna_display_fake.c @@ -215,7 +215,7 @@ sna_mode_resize(ScrnInfoPtr scrn, int width, int height) assert(screen->GetScreenPixmap(screen) == new_front); assert(to_sna_from_screen(screen)->front == new_front); - screen->DestroyPixmap(new_front); + dixDestroyPixmap(new_front, 0); return TRUE; } diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c index ee4b89db..f5f47554 100644 --- a/src/sna/sna_dri2.c +++ b/src/sna/sna_dri2.c @@ -934,7 +934,7 @@ static void _sna_dri2_destroy_buffer(struct sna *sna, sna_watch_flush(sna, -1); sna_pixmap_set_buffer(pixmap, NULL); - pixmap->drawable.pScreen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); } sna_dri2_cache_bo(sna, draw, diff --git a/src/sna/sna_dri3.c b/src/sna/sna_dri3.c index ce4970ae..cea1efc7 100644 --- a/src/sna/sna_dri3.c +++ b/src/sna/sna_dri3.c @@ -284,7 +284,7 @@ static PixmapPtr sna_dri3_pixmap_from_fd(ScreenPtr screen, return pixmap; free_pixmap: - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); free_bo: kgem_bo_destroy(&sna->kgem, bo); return NULL; diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 137f29e8..66e8731e 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -266,7 +266,7 @@ static Bool sna_create_screen_resources(ScreenPtr screen) screen->SetScreenPixmap(new_front); assert(screen->GetScreenPixmap(screen) == new_front); assert(sna->front == new_front); - screen->DestroyPixmap(new_front); /* transfer ownership to screen */ + dixDestroyPixmap(new_front, 0); /* transfer ownership to screen */ sna_mode_set_primary(sna); @@ -1011,7 +1011,7 @@ static Bool sna_early_close_screen(CLOSE_SCREEN_ARGS_DECL) } if (sna->front) { - screen->DestroyPixmap(sna->front); + dixDestroyPixmap(sna->front, 0); sna->front = NULL; } diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c index ebc061b5..a3894518 100644 --- a/src/sna/sna_glyphs.c +++ b/src/sna/sna_glyphs.c @@ -260,7 +260,7 @@ bool sna_glyphs_create(struct sna *sna) serverClient, &error); } - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (!picture) goto bail; diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c index 904d4400..a0fdabcb 100644 --- a/src/sna/sna_render.c +++ b/src/sna/sna_render.c @@ -875,7 +875,7 @@ cleanup_src: cleanup_dst: FreePicture(tmp_dst, 0); cleanup_tmp: - screen->DestroyPixmap(tmp); + dixDestroyPixmap(tmp, 0); return ret; } @@ -1348,7 +1348,7 @@ sna_render_picture_convolve(struct sna *sna, tmp = CreatePicture(0, &pixmap->drawable, PictureMatchFormat(screen, depth, channel->pict_format), 0, NULL, serverClient, &error); - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (tmp == NULL) return -1; @@ -1429,7 +1429,7 @@ sna_render_picture_flatten(struct sna *sna, tmp = CreatePicture(0, &pixmap->drawable, PictureMatchFormat(screen, 32, PICT_a8r8g8b8), 0, NULL, serverClient, &error); - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (tmp == NULL) return false; @@ -1811,7 +1811,7 @@ sna_render_picture_convert(struct sna *sna, channel->pict_format), 0, NULL, serverClient, &error); if (dst == NULL) { - screen->DestroyPixmap(tmp); + dixDestroyPixmap(tmp, 0); return 0; } @@ -1822,7 +1822,7 @@ sna_render_picture_convert(struct sna *sna, 0, NULL, serverClient, &error); if (src == NULL) { FreePicture(dst, 0); - screen->DestroyPixmap(tmp); + dixDestroyPixmap(tmp, 0); return 0; } @@ -1839,7 +1839,7 @@ sna_render_picture_convert(struct sna *sna, channel->bo = __sna_pixmap_get_bo(tmp); kgem_bo_reference(channel->bo); - screen->DestroyPixmap(tmp); + dixDestroyPixmap(tmp, 0); } else { pixman_image_t *src, *dst; void *ptr; @@ -2173,7 +2173,7 @@ copy_overlap(struct sna *sna, uint8_t alu, draw, bo, dst_dx, dst_dy, box, n, 0)); - screen->DestroyPixmap(tmp); + dixDestroyPixmap(tmp, 0); return ret; } bool diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c index 2d012b95..7d9a13e1 100644 --- a/src/sna/sna_video_sprite.c +++ b/src/sna/sna_video_sprite.c @@ -666,7 +666,7 @@ off: } if (!sna->render.video(sna, video, &frame, &r, scaled)) { - screen->DestroyPixmap(scaled); + dixDestroyPixmap(scaled, 0); ret = BadAlloc; goto err; } @@ -685,7 +685,7 @@ off: frame.height = frame.image.y2; frame.pitch[0] = frame.bo->pitch; - screen->DestroyPixmap(scaled); + dixDestroyPixmap(scaled, 0); cache_bo = false; } diff --git a/src/uxa/i915_video.c b/src/uxa/i915_video.c index a2fb50cf..6f7ae91e 100644 --- a/src/uxa/i915_video.c +++ b/src/uxa/i915_video.c @@ -79,7 +79,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, return; if (intel_uxa_get_pixmap_bo(target) == NULL) { - screen->DestroyPixmap(target); + dixDestroyPixmap(target, 0); return; } @@ -485,7 +485,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn, FreeScratchGC(gc); } - target->drawable.pScreen->DestroyPixmap(target); + dixDestroyPixmap(target, 0); } intel_uxa_debug_flush(scrn); diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index 2a544779..17198ffc 100644 --- a/src/uxa/intel_display.c +++ b/src/uxa/intel_display.c @@ -563,7 +563,7 @@ intel_create_pixmap_header(ScreenPtr pScreen, int width, int height, int depth, { return pixmap; } - (*pScreen->DestroyPixmap) (pixmap); + dixDestroyPixmap(pixmap, 0); } return NullPixmap; } @@ -620,7 +620,7 @@ intel_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data) if (rotate_pixmap) { intel_set_pixmap_bo(rotate_pixmap, NULL); - rotate_pixmap->drawable.pScreen->DestroyPixmap(rotate_pixmap); + dixDestroyPixmap(rotate_pixmap, 0); } if (data) { @@ -2408,7 +2408,7 @@ intel_create_pixmap_for_bo(ScreenPtr pScreen, dri_bo *bo, width, height, depth, bpp, pitch, NULL)) { - pScreen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); return NullPixmap; } @@ -2515,9 +2515,9 @@ void intel_copy_fb(ScrnInfoPtr scrn) #endif cleanup_dst: - (*pScreen->DestroyPixmap)(dst); + dixDestroyPixmap(dst, 0); cleanup_src: - (*pScreen->DestroyPixmap)(src); + dixDestroyPixmap(src, 0); } void diff --git a/src/uxa/intel_dri.c b/src/uxa/intel_dri.c index d91ed295..ddce265c 100644 --- a/src/uxa/intel_dri.c +++ b/src/uxa/intel_dri.c @@ -210,7 +210,7 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments, intel_get_pixmap_bo(pixmap) == NULL) { if (pixmap) - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); goto unwind; } } @@ -228,7 +228,7 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments, if ((buffers[i].name = pixmap_flink(pixmap)) == 0) { /* failed to name buffer */ - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); goto unwind; } } @@ -237,7 +237,7 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments, unwind: while (i--) - screen->DestroyPixmap(privates[i].pixmap); + dixDestroyPixmap(privates[i].pixmap, 0); free(privates); free(buffers); return NULL; @@ -252,7 +252,7 @@ I830DRI2DestroyBuffers(DrawablePtr drawable, DRI2BufferPtr buffers, int count) for (i = 0; i < count; i++) { private = buffers[i].driverPrivate; - screen->DestroyPixmap(private->pixmap); + dixDestroyPixmap(private->pixmap, 0); } if (buffers) { @@ -353,7 +353,7 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment, hint); if (pixmap == NULL || intel_get_pixmap_bo(pixmap) == NULL) { if (pixmap) - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); free(privates); free(buffer); return NULL; @@ -371,7 +371,7 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment, if ((buffer->name = pixmap_flink(pixmap)) == 0) { /* failed to name buffer */ - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); free(privates); free(buffer); return NULL; @@ -386,7 +386,7 @@ static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer) I830DRI2BufferPrivatePtr private = buffer->driverPrivate; if (--private->refcnt == 0) { ScreenPtr screen = private->pixmap->drawable.pScreen; - screen->DestroyPixmap(private->pixmap); + dixDestroyPixmap(private->pixmap, 0); free(private); free(buffer); diff --git a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c index ec32a723..3ab70a30 100644 --- a/src/uxa/intel_uxa.c +++ b/src/uxa/intel_uxa.c @@ -811,7 +811,7 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap, return FALSE; if (!intel_uxa_pixmap_is_offscreen(scratch)) { - screen->DestroyPixmap(scratch); + dixDestroyPixmap(scratch, 0); return FALSE; } @@ -830,7 +830,7 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap, ret = FALSE; } - (*screen->DestroyPixmap)(scratch); + dixDestroyPixmap(scratch, 0); return ret; } } @@ -896,13 +896,13 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, return FALSE; if (!intel_uxa_pixmap_is_offscreen(scratch)) { - screen->DestroyPixmap(scratch); + dixDestroyPixmap(scratch, 0); return FALSE; } gc = GetScratchGC(pixmap->drawable.depth, screen); if (!gc) { - screen->DestroyPixmap(scratch); + dixDestroyPixmap(scratch, 0); return FALSE; } @@ -923,7 +923,7 @@ static Bool intel_uxa_get_image(PixmapPtr pixmap, ret = intel_uxa_pixmap_get_image(pixmap, x, y, w, h, dst, dst_pitch); if (scratch) - scratch->drawable.pScreen->DestroyPixmap(scratch); + dixDestroyPixmap(scratch, 0); return ret; } diff --git a/src/uxa/uxa-glyphs.c b/src/uxa/uxa-glyphs.c index d24ba518..ac33178d 100644 --- a/src/uxa/uxa-glyphs.c +++ b/src/uxa/uxa-glyphs.c @@ -172,7 +172,7 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen) goto bail; if (!uxa_pixmap_is_offscreen(pixmap)) { /* Presume shadow is in-effect */ - pScreen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); uxa_unrealize_glyph_caches(pScreen); return TRUE; } @@ -182,7 +182,7 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen) CPComponentAlpha, &component_alpha, serverClient, &error); - pScreen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (!picture) goto bail; @@ -293,7 +293,7 @@ uxa_glyph_cache_upload_glyph(ScreenPtr screen, x, y); if (scratch != pGlyphPixmap) - screen->DestroyPixmap(scratch); + dixDestroyPixmap(scratch, 0); FreeScratchGC(gc); } @@ -769,7 +769,7 @@ uxa_glyphs_via_mask(CARD8 op, return 1; if (!uxa_pixmap_is_offscreen(pixmap)) { - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); return -1; } @@ -780,7 +780,7 @@ uxa_glyphs_via_mask(CARD8 op, if (!white_pixmap) { if (white) FreePicture(white, 0); - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); return -1; } @@ -790,7 +790,7 @@ uxa_glyphs_via_mask(CARD8 op, mask = CreatePicture(0, &pixmap->drawable, maskFormat, CPComponentAlpha, &component_alpha, serverClient, &error); - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (!mask) { FreePicture(white, 0); diff --git a/src/uxa/uxa-render.c b/src/uxa/uxa-render.c index 0c3e8560..ea3e9d4a 100644 --- a/src/uxa/uxa-render.c +++ b/src/uxa/uxa-render.c @@ -479,7 +479,7 @@ uxa_picture_for_pixman_format(ScreenPtr screen, return 0; if (!uxa_pixmap_is_offscreen(pixmap)) { - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); return 0; } @@ -488,7 +488,7 @@ uxa_picture_for_pixman_format(ScreenPtr screen, PIXMAN_FORMAT_DEPTH(format), format), 0, 0, serverClient, &error); - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (!picture) return 0; @@ -592,7 +592,7 @@ uxa_create_solid(ScreenPtr screen, uint32_t color) return 0; if (!uxa_prepare_access((DrawablePtr)pixmap, UXA_ACCESS_RW)) { - (*screen->DestroyPixmap)(pixmap); + dixDestroyPixmap(pixmap, 0); return 0; } *((uint32_t *)pixmap->devPrivate.ptr) = color; @@ -601,7 +601,7 @@ uxa_create_solid(ScreenPtr screen, uint32_t color) picture = CreatePicture(0, &pixmap->drawable, PictureMatchFormat(screen, 32, PICT_a8r8g8b8), CPRepeat, &repeat, serverClient, &error); - (*screen->DestroyPixmap)(pixmap); + dixDestroyPixmap(pixmap, 0); return picture; } @@ -828,13 +828,13 @@ uxa_acquire_drawable(ScreenPtr pScreen, /* Skip the copy if the result remains in memory and not a bo */ if (!uxa_pixmap_is_offscreen(pPixmap)) { - pScreen->DestroyPixmap(pPixmap); + dixDestroyPixmap(pPixmap, 0); return 0; } pGC = GetScratchGC(depth, pScreen); if (!pGC) { - pScreen->DestroyPixmap(pPixmap); + dixDestroyPixmap(pPixmap, 0); return 0; } @@ -846,7 +846,7 @@ uxa_acquire_drawable(ScreenPtr pScreen, pDst = CreatePicture(0, &pPixmap->drawable, PictureMatchFormat(pScreen, depth, pSrc->format), 0, 0, serverClient, &error); - pScreen->DestroyPixmap(pPixmap); + dixDestroyPixmap(pPixmap, 0); if (!pDst) return 0; @@ -978,7 +978,7 @@ uxa_try_driver_composite(CARD8 op, gc = GetScratchGC(depth, screen); if (!gc) { - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); return 0; } @@ -993,7 +993,7 @@ uxa_try_driver_composite(CARD8 op, localDst = CreatePicture(0, &pixmap->drawable, PictureMatchFormat(screen, depth, pDst->format), 0, 0, serverClient, &error); - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (!localDst) return 0; @@ -1238,7 +1238,7 @@ uxa_try_magic_two_pass_composite_helper(CARD8 op, gc = GetScratchGC(depth, screen); if (!gc) { - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); return 0; } @@ -1253,7 +1253,7 @@ uxa_try_magic_two_pass_composite_helper(CARD8 op, localDst = CreatePicture(0, &pixmap->drawable, PictureMatchFormat(screen, depth, pDst->format), 0, 0, serverClient, &error); - screen->DestroyPixmap(pixmap); + dixDestroyPixmap(pixmap, 0); if (!localDst) return 0; @@ -1574,7 +1574,7 @@ uxa_create_alpha_picture(ScreenPtr pScreen, return 0; pPicture = CreatePicture(0, &pPixmap->drawable, pPictFormat, 0, 0, serverClient, &error); - (*pScreen->DestroyPixmap) (pPixmap); + dixDestroyPixmap(pPixmap, 0); return pPicture; } diff --git a/src/uxa/uxa.c b/src/uxa/uxa.c index b682dfd9..125dc0c4 100644 --- a/src/uxa/uxa.c +++ b/src/uxa/uxa.c @@ -191,7 +191,7 @@ uxa_validate_gc(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) #ifdef FB_24_32BIT if ((changes & GCTile) && fbGetRotatedPixmap(pGC)) { - (*pGC->pScreen->DestroyPixmap) (fbGetRotatedPixmap(pGC)); + dixDestroyPixmap(fbGetRotatedPixmap(pGC), 0); fbGetRotatedPixmap(pGC) = 0; } @@ -205,8 +205,7 @@ uxa_validate_gc(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) pNewTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel) { if (pNewTile) - (*pGC->pScreen-> - DestroyPixmap) (pNewTile); + dixDestroyPixmap(pNewTile, 0); /* fb24_32ReformatTile will do direct access * of a newly-allocated pixmap. This isn't a * problem yet, since we don't put pixmaps in From patchwork Tue Mar 4 15:58:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 14001052 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8773FC282D2 for ; Tue, 4 Mar 2025 16:02:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0A47E10E62A; Tue, 4 Mar 2025 16:02:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=metux.net header.i=info@metux.net header.b="caiogm0k"; dkim-atps=neutral X-Greylist: delayed 307 seconds by postgrey-1.36 at gabe; Tue, 04 Mar 2025 16:01:59 UTC Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.133]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41AE810E323 for ; Tue, 4 Mar 2025 16:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metux.net; s=s1-ionos; t=1741104117; x=1741708917; i=info@metux.net; bh=EspdX0h7TCDrE5+8KgLDPh53rrmhqNZVGUVIG1244J4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-Id:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=caiogm0kL5K5oc0lu3wFhjoQkgJTo6zDuC6TZ8B8ZEUG4S3yLaXYKg0xcYhHstE7 HR7qw79O9bOPL6t4KppCADi+tltCbxOWHN0BszWz5swPQ4j8fShBrFCuYfckrmyJO ODk+EDuLYNq6pP6ezPp2ZNRbfP0i1SCrk9GQqNW5NDVjdLhrUTeTWlF2kVmI5Efk3 eyNcKZEHa+rY/y5pSsgOAyhLBkhiqeNfhqPgZ7q0I2zm5G3miJR/PaslygwuoIWTZ d4POc99tX4V1snp55G9bQEYK0fVqvsx1ZK0dbTh6wB3+QgG3kap1N3aiFalh0Vmt4 D9TbFl41pV3t8X2mvA== X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from x1.localdomain ([77.7.107.91]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MbAYi-1tIdmr41Zg-00hHkA; Tue, 04 Mar 2025 16:56:42 +0100 From: "Enrico Weigelt, metux IT consult" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@linux.intel.com Subject: [PATCH 16/16] use xf86NameCmp() instead of xf86nameCompare() Date: Tue, 4 Mar 2025 16:58:09 +0100 Message-Id: <20250304155809.30399-17-info@metux.net> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250304155809.30399-1-info@metux.net> References: <20250304155809.30399-1-info@metux.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:bcqysGTZ3rgDU3gZvF/EDVfYfbAorR2TLqkXJdko2+Ifv5Rjuo4 XAULK4fC/rmJGhpoYbNczbRuRe/G+MR6zSNIFfTX5X5rACZyhvpwqZNUQUk3qkiYFFnurtX CCXQNaozyoIczyKan7NCPzwo9Dj8B7yYe9AAPRPsgjEpULFMyR+chU7pT+pKbII2CTDHcev cO3El2H14KoGwdyxTvhSw== UI-OutboundReport: notjunk:1;M01:P0:ldtQXBJpzvg=;o1P8w4CzbN8tRIUaekbsARryS3q QEz5EcZRL0BzCbYxj89cY0wqiTR4QbJzNMjzP6ULislfAeyij55lrKeRHVmqHpjGh7rxgIb17 497jBM/gX7FJ5uoV1jRgsg3yKA+A56MfvJvzrBy0STYNyQvTL1CUgeksMnYwaHy5ZJBdnVsFy Pv6lsbhbGUDXK20TTrs2QfaO3nhr2hpGBo4uU9lzj92ZZQP1GQ+gDT+pLN8MjXvAzILgck/8I Cnz/dpkKVS37utqvKXlU/D629Ru3RFtNXkUldGeIqX2f5+PTohefTxRGTbln1FSnzOnJBht2R pTwgXh7RKQs11rrPGOIZq+9SzlG2niUon8FXO/LFvhlUPVE5zHdMxJpitPICj9QJq3itJdFFf 0Lvl7EQxkRA183X8a0Upi4/AImFbAAo3rMOkIgAJ2IwIXONwPxJaa3DNcM+XTvXySrPTVb1VK GrO1ioO3zaUeyPZPyn5ctg1BNTd6ctMeKhQCiXlQ2IVKprvEOw+VnlrOmIpgkZB/ClXN+T48e 72Stxd2ZWxXs3I/N4I0GAI5rpr2nBrT24XckZ2r887TnTl7EqjtCSNu90/nMdCXYx+HWaCtfN gtZ0VPyKphen3PigKDoQUgStawe9MlYecfb5R+Bh072zHDPTaBWN/ngPN4R11sPZKSURnRaLv k/1UwmDC555xQdHgTf6PXhPpAvkGHyqQZ4KorH2NB+qg49iqFmqvmOjKoDFSeYzrFEIOi2/jg QbtoWsAT0KvgdVDcmtjbQpo/4NZqp2eNBEMpCK/A+zeRsNffWF0jDq7f4Hti+sea0vGmZKEa0 hhX1XlXV4l70AjdR4JyVEXngumbeUiHOs778ABQRQGrWtU9ggIcqkLDKhtHFbRIRQJIQhhAQK nEMAmtGQg8wSrxmfXvcSBkFUTyeuw/8sPmkH5O+CMqRiQrQjw5xEj8d/Fr1d0e0mocJBU6ju3 sgmy0uigwkMOi3C3atd+QEWrl72AcwEtfpSy8xS1dvEPmggs4ly4WN0w7hcIvXDbE0hDnkWC2 MVLc266ojRiZ9Yzs+3b2L46BovORnA7y4Hw8+NZkNG7I845KqTF5qpZS6znVhnSEeIlshSY8S O4jKo1he5LszlkupSYzLwPtz+GQuALa+qnXo2+sRZfhGagmqGGmLuprymOr22CqDzzKDzeQsR T6aywHGf5SRhEob2rCUGTA6dfN/jLlyRZq0WzrfVAV8vs/37Spb+RpktsBCiH0xmGbBiqic1Y FoJdIDhPAFazMVb4v6I6E1tlYI12aZymcXrJv9brNDQ/glOOY11R9+TCcWrAfVM8qMa5v1P0u 1TXcCDuwXon+W8b4YIpJGGHBcY0JG2PFMRG0//rYbZdsyuyIk920a1/FPkaOThp9ZUn+9CFZE 6rIRffDyVozUjz6w== X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This driver is the only one still using xf86nameCompare() and so blocking it's removal from Xserver module ABI. Signed-off-by: Enrico Weigelt, metux IT consult --- src/intel_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.5 diff --git a/src/intel_module.c b/src/intel_module.c index 7ea0f5d3..f90b3cea 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -654,7 +654,7 @@ static XF86ConfDevicePtr _xf86findDriver(const char *ident, XF86ConfDevicePtr p) { while (p) { - if (p->dev_driver && xf86nameCompare(ident, p->dev_driver) == 0) + if (p->dev_driver && xf86NameCmp(ident, p->dev_driver) == 0) return p; p = p->list.next;