| Message ID | 20220621201637.1378306-3-alex@linutronix.de |
|---|---|
| State | Accepted, archived |
| Commit | d5b2e40be6d6e4c52078ab5a087eefaa7330c320 |
| Headers | show |
| Series | [01/18] sato: work around missing icons in adwaita 42.0 | expand |
On Tue, Jun 21, 2022 at 10:16 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > ...wkmsDRI2Extension-instead-of-driDRI2.patch | 113 ++++++++++++++++++ > .../{mesa-gl_22.0.3.bb => mesa-gl_22.1.2.bb} | 0 > meta/recipes-graphics/mesa/mesa.inc | 3 +- > .../mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} | 0 > 4 files changed, 115 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch > rename meta/recipes-graphics/mesa/{mesa-gl_22.0.3.bb => mesa-gl_22.1.2.bb} > (100%) > rename meta/recipes-graphics/mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} > (100%) > FYI: in case more host systems are affected While building this, I've noticed WARNING: Failed to fetch URL https://mesa.freedesktop.org/archive/mesa-22.1.2.tar.xz, attempting MIRRORS if available log.do_fetch shows why: Resolving mesa.freedesktop.org... 147.75.198.156 Connecting to mesa.freedesktop.org|147.75.198.156|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://archive.mesa3d.org//mesa-22.1.2.tar.xz [following] --2022-06-23 12:29:58-- https://archive.mesa3d.org//mesa-22.1.2.tar.xz Resolving archive.mesa3d.org... 131.252.210.176, 2610:10:20:722:a800:ff:feda:470f Connecting to archive.mesa3d.org|131.252.210.176|:443... connected. ERROR: The certificate of ‘archive.mesa3d.org’ is not trusted. ERROR: The certificate of ‘archive.mesa3d.org’ doesn't have a known issuer. In browser it's considered valid certificate with issuer: Common Name (CN) R3 Organization (O) Let's Encrypt Organizational Unit (OU) <Not Part Of Certificate> Do we need ca-certificates update? But I guess it's host issue (this was on gentoo with ca-certificates 20211016.3.79), on ubuntu 22.10 and debian 11.3 it works fine: Initiating SSL handshake. Handshake successful; connected socket 4 to SSL handle 0x000056094b80f8c0 certificate: subject: CN=archive.mesa3d.org issuer: CN=R3,O=Let's Encrypt,C=US X509 certificate successfully verified and matches host archive.mesa3d.org and in OE built image with: meta/recipes-support/ca-certificates/ca-certificates_20211016.bb I didn't get that far yet :) root@qemux86-64:~# wget https://mesa.freedesktop.org/archive/mesa-22.1.2.tar.xz Connecting to mesa.freedesktop.org (147.75.198.156:443) wget: note: TLS certificate validation not implemented Connecting to archive.mesa3d.org (131.252.210.176:443) wget: TLS error from peer (alert code 80): 80 wget: error getting response: Connection reset by peer The --debug in gentoo wasn't showing the details about certificate just: Resolving archive.mesa3d.org... 131.252.210.176, 2610:10:20:722:a800:ff:feda:470f Caching archive.mesa3d.org => 131.252.210.176 2610:10:20:722:a800:ff:feda:470f Connecting to archive.mesa3d.org|131.252.210.176|:443... connected. Created socket 4. Releasing 0x000055e5d4567460 (new refcount 1). ERROR: The certificate of ‘archive.mesa3d.org’ is not trusted. ERROR: The certificate of ‘archive.mesa3d.org’ doesn't have a known issuer. Then I've disabled gnutls support in wget and now net-misc/wget-1.21.3-r1 works fine again (like in ubuntu/debian): Resolving archive.mesa3d.org... 131.252.210.176, 2610:10:20:722:a800:ff:feda:470f Caching archive.mesa3d.org => 131.252.210.176 2610:10:20:722:a800:ff:feda:470f Connecting to archive.mesa3d.org|131.252.210.176|:443... connected. Created socket 4. Releasing 0x000055903f10ebd0 (new refcount 1). Initiating SSL handshake. Handshake successful; connected socket 4 to SSL handle 0x000055903f0f4e50 certificate: subject: CN=archive.mesa3d.org issuer: CN=R3,O=Let's Encrypt,C=US X509 certificate successfully verified and matches host archive.mesa3d.org I'll check how gnutls USE flag affects this, just in case someone is seeing a lot of downloads from mirror, check your wget. Cheers,
On Thu, Jun 23, 2022 at 5:27 PM Martin Jansa <martin.jansa@gmail.com> wrote: > On Tue, Jun 21, 2022 at 10:16 PM Alexander Kanavin <alex.kanavin@gmail.com> > wrote: > >> Signed-off-by: Alexander Kanavin <alex@linutronix.de> >> --- >> ...wkmsDRI2Extension-instead-of-driDRI2.patch | 113 ++++++++++++++++++ >> .../{mesa-gl_22.0.3.bb => mesa-gl_22.1.2.bb} | 0 >> meta/recipes-graphics/mesa/mesa.inc | 3 +- >> .../mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} | 0 >> 4 files changed, 115 insertions(+), 1 deletion(-) >> create mode 100644 >> meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch >> rename meta/recipes-graphics/mesa/{mesa-gl_22.0.3.bb => >> mesa-gl_22.1.2.bb} (100%) >> rename meta/recipes-graphics/mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} >> (100%) >> > > FYI: in case more host systems are affected > > While building this, I've noticed > WARNING: Failed to fetch URL > https://mesa.freedesktop.org/archive/mesa-22.1.2.tar.xz, attempting > MIRRORS if available > > log.do_fetch shows why: > > Resolving mesa.freedesktop.org... 147.75.198.156 > Connecting to mesa.freedesktop.org|147.75.198.156|:443... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: https://archive.mesa3d.org//mesa-22.1.2.tar.xz [following] > --2022-06-23 12:29:58-- https://archive.mesa3d.org//mesa-22.1.2.tar.xz > Resolving archive.mesa3d.org... 131.252.210.176, > 2610:10:20:722:a800:ff:feda:470f > Connecting to archive.mesa3d.org|131.252.210.176|:443... connected. > ERROR: The certificate of ‘archive.mesa3d.org’ is not trusted. > ERROR: The certificate of ‘archive.mesa3d.org’ doesn't have a known > issuer. > > In browser it's considered valid certificate with issuer: > Common Name (CN) R3 > Organization (O) Let's Encrypt > Organizational Unit (OU) <Not Part Of Certificate> > > Do we need ca-certificates update? But I guess it's host issue (this was > on gentoo with ca-certificates 20211016.3.79), on ubuntu 22.10 and debian > 11.3 it works fine: > > Initiating SSL handshake. > Handshake successful; connected socket 4 to SSL handle 0x000056094b80f8c0 > certificate: > subject: CN=archive.mesa3d.org > issuer: CN=R3,O=Let's Encrypt,C=US > X509 certificate successfully verified and matches host archive.mesa3d.org > > and in OE built image with: > meta/recipes-support/ca-certificates/ca-certificates_20211016.bb > I didn't get that far yet :) > > root@qemux86-64:~# wget > https://mesa.freedesktop.org/archive/mesa-22.1.2.tar.xz > Connecting to mesa.freedesktop.org (147.75.198.156:443) > wget: note: TLS certificate validation not implemented > Connecting to archive.mesa3d.org (131.252.210.176:443) > wget: TLS error from peer (alert code 80): 80 > wget: error getting response: Connection reset by peer > > The --debug in gentoo wasn't showing the details about certificate just: > Resolving archive.mesa3d.org... 131.252.210.176, > 2610:10:20:722:a800:ff:feda:470f > Caching archive.mesa3d.org => 131.252.210.176 > 2610:10:20:722:a800:ff:feda:470f > Connecting to archive.mesa3d.org|131.252.210.176|:443... connected. > Created socket 4. > Releasing 0x000055e5d4567460 (new refcount 1). > ERROR: The certificate of ‘archive.mesa3d.org’ is not trusted. > ERROR: The certificate of ‘archive.mesa3d.org’ doesn't have a known > issuer. > > Then I've disabled gnutls support in wget and now net-misc/wget-1.21.3-r1 > works fine again (like in ubuntu/debian): > > Resolving archive.mesa3d.org... 131.252.210.176, > 2610:10:20:722:a800:ff:feda:470f > Caching archive.mesa3d.org => 131.252.210.176 > 2610:10:20:722:a800:ff:feda:470f > Connecting to archive.mesa3d.org|131.252.210.176|:443... connected. > Created socket 4. > Releasing 0x000055903f10ebd0 (new refcount 1). > Initiating SSL handshake. > Handshake successful; connected socket 4 to SSL handle 0x000055903f0f4e50 > certificate: > subject: CN=archive.mesa3d.org > issuer: CN=R3,O=Let's Encrypt,C=US > X509 certificate successfully verified and matches host archive.mesa3d.org > > I'll check how gnutls USE flag affects this, just in case someone is > seeing a lot of downloads from mirror, check your wget. > Looks like it's caused by https://gitlab.com/gnutls/gnutls/-/issues/1131 and https://gitlab.com/gnutls/gnutls/-/issues/1335 mesa.freedesktop.org works but archive.mesa3d.org doesn't, gnutls-cli better shows why: $ gnutls-cli mesa.freedesktop.org Processed 136 CA certificate(s). Resolving 'mesa.freedesktop.org:443'... Connecting to '147.75.198.156:443'... - Certificate type: X.509 - Got a certificate list of 3 certificates. - Certificate[0] info: - subject `CN=pages.freedesktop.org', issuer `CN=R3,O=Let's Encrypt,C=US', serial 0x03a7a60e015c33d4ea520f1703fe373b4df3, RSA key 2048 bits, signed using RSA-SHA256, activated `2022-06-05 04:00:39 UTC', expires `2022-09-03 04:00 :38 UTC', pin-sha256="NjMC418mQlGvPW2NxT5dwc97mvcIpiITkEN2o0bzAsc=" Public Key ID: sha1:2cec883f93f73aba2709295790ca783cdf8de008 sha256:363302e35f264251af3d6d8dc53e5dc1cf7b9af708a62213904376a346f302c7 Public Key PIN: pin-sha256:NjMC418mQlGvPW2NxT5dwc97mvcIpiITkEN2o0bzAsc= - Certificate[1] info: - subject `CN=R3,O=Let's Encrypt,C=US', issuer `CN=ISRG Root X1,O=Internet Security Research Group,C=US', serial 0x00912b084acf0c18a753f6d62e25a75f5a, RSA key 2048 bits, signed using RSA-SHA256, activated `2020-09-04 00:00:00 UT C', expires `2025-09-15 16:00:00 UTC', pin-sha256="jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=" - Certificate[2] info: - subject `CN=ISRG Root X1,O=Internet Security Research Group,C=US', issuer `CN=DST Root CA X3,O=Digital Signature Trust Co.', serial 0x4001772137d4e942b8ee76aa3c640ab7, RSA key 4096 bits, signed using RSA-SHA256, activated `202 1-01-20 19:14:03 UTC', expires `2024-09-30 18:14:03 UTC', pin-sha256="C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M=" - Status: The certificate is trusted. - Description: (TLS1.3-X.509)-(ECDHE-SECP256R1)-(RSA-PSS-RSAE-SHA256)-(AES-256-GCM) - Session ID: 2D:A2:CA:0F:A3:0F:F3:D3:BE:B8:79:10:53:28:A0:78:C3:F8:C6:C8:5A:A8:13:00:DF:E2:85:AF:61:26:49:36 - Options: - Handshake was completed $ gnutls-cli archive.mesa3d.org Processed 136 CA certificate(s). Resolving 'archive.mesa3d.org:443'... Connecting to '131.252.210.176:443'... - Certificate type: X.509 - Got a certificate list of 4 certificates. - Certificate[0] info: - subject `CN=archive.mesa3d.org', issuer `CN=R3,O=Let's Encrypt,C=US', serial 0x034b691f41ef93f5d205f6678f5e065a9975, RSA key 2048 bits, signed using RSA-SHA256, activated `2022-05-05 00:25:27 UTC', expires `2022-08-03 00:25:26 UTC', pin-sha256="qg5rLg63UE4MvpjUZp40sqzqc4YJH3Fc3yv9EKQKkD0=" Public Key ID: sha1:8bbb9c1cef01c1ec2ae8c50bb720045e7a9427a2 sha256:aa0e6b2e0eb7504e0cbe98d4669e34b2acea7386091f715cdf2bfd10a40a903d Public Key PIN: pin-sha256:qg5rLg63UE4MvpjUZp40sqzqc4YJH3Fc3yv9EKQKkD0= - Certificate[1] info: - subject `CN=archive.mesa3d.org', issuer `CN=R3,O=Let's Encrypt,C=US', serial 0x034b691f41ef93f5d205f6678f5e065a9975, RSA key 2048 bits, signed using RSA-SHA256, activated `2022-05-05 00:25:27 UTC', expires `2022-08-03 00:25:26 UTC', pin-sha256="qg5rLg63UE4MvpjUZp40sqzqc4YJH3Fc3yv9EKQKkD0=" - Certificate[2] info: - subject `CN=R3,O=Let's Encrypt,C=US', issuer `CN=ISRG Root X1,O=Internet Security Research Group,C=US', serial 0x00912b084acf0c18a753f6d62e25a75f5a, RSA key 2048 bits, signed using RSA-SHA256, activated `2020-09-04 00:00:00 UT C', expires `2025-09-15 16:00:00 UTC', pin-sha256="jQJTbIh0grw0/1TkHSumWb+Fs0Ggogr621gT3PvPKG0=" - Certificate[3] info: - subject `CN=ISRG Root X1,O=Internet Security Research Group,C=US', issuer `CN=DST Root CA X3,O=Digital Signature Trust Co.', serial 0x4001772137d4e942b8ee76aa3c640ab7, RSA key 4096 bits, signed using RSA-SHA256, activated `202 1-01-20 19:14:03 UTC', expires `2024-09-30 18:14:03 UTC', pin-sha256="C5+lpZ7tcVwmwQIMcRtPbsQtWLABXhQzejna0wHFr8M=" - Status: The certificate is NOT trusted. The certificate issuer is unknown. *** PKI verification of server certificate failed... *** Fatal error: Error in the certificate.
diff --git a/meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch b/meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch new file mode 100644 index 0000000000..db25e16f4a --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch @@ -0,0 +1,113 @@ +From feb4ec510b1328fdd9aa77305d3273d1f9c7e124 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Thu, 9 Jun 2022 11:42:05 +0200 +Subject: [PATCH] swrast_kms: use swkmsDRI2Extension instead of + driDRI2Extension + +This set of changes: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15649 + +caused a regression in Xorg when using swrast_kms: + (EE) AIGLX error: Calling driver entry point failed + +This commit changes the swrast_kms driver to use a dedicated screen init function +(which I believe was overlooked); I also took the opportunity to rename the +associated plumbling to have swrast-specific names. + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16942] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/gallium/frontends/dri/dri2.c | 16 ++++++++-------- + src/gallium/frontends/dri/dri_screen.h | 4 ++-- + src/gallium/frontends/dri/dri_util.c | 2 +- + src/gallium/targets/dri/target.c | 2 +- + 4 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c +index 63ac9d5..de33789 100644 +--- a/src/gallium/frontends/dri/dri2.c ++++ b/src/gallium/frontends/dri/dri2.c +@@ -2508,7 +2508,7 @@ release_pipe: + * Returns the struct gl_config supported by this driver. + */ + static const __DRIconfig ** +-dri_kms_init_screen(__DRIscreen * sPriv) ++dri_swrast_kms_init_screen(__DRIscreen * sPriv) + { + #if defined(GALLIUM_SOFTPIPE) + const __DRIconfig **configs; +@@ -2613,8 +2613,8 @@ static const struct __DRIDriverVtableExtensionRec galliumdrm_vtable = { + * hook. The latter is used to explicitly initialise the kms_swrast driver + * rather than selecting the approapriate driver as suggested by the loader. + */ +-const struct __DriverAPIRec dri_kms_driver_api = { +- .InitScreen = dri_kms_init_screen, ++const struct __DriverAPIRec dri_swrast_kms_driver_api = { ++ .InitScreen = dri_swrast_kms_init_screen, + .DestroyScreen = dri_destroy_screen, + .CreateBuffer = dri2_create_buffer, + .DestroyBuffer = dri_destroy_buffer, +@@ -2633,17 +2633,17 @@ const __DRIextension *galliumdrm_driver_extensions[] = { + NULL + }; + +-static const struct __DRIDriverVtableExtensionRec dri_kms_vtable = { ++static const struct __DRIDriverVtableExtensionRec dri_swrast_kms_vtable = { + .base = { __DRI_DRIVER_VTABLE, 1 }, +- .vtable = &dri_kms_driver_api, ++ .vtable = &dri_swrast_kms_driver_api, + }; + +-const __DRIextension *dri_kms_driver_extensions[] = { ++const __DRIextension *dri_swrast_kms_driver_extensions[] = { + &driCoreExtension.base, + &driImageDriverExtension.base, +- &driDRI2Extension.base, ++ &swkmsDRI2Extension.base, + &gallium_config_options.base, +- &dri_kms_vtable.base, ++ &dri_swrast_kms_vtable.base, + NULL + }; + +diff --git a/src/gallium/frontends/dri/dri_screen.h b/src/gallium/frontends/dri/dri_screen.h +index 0ee2feb..0bb8817 100644 +--- a/src/gallium/frontends/dri/dri_screen.h ++++ b/src/gallium/frontends/dri/dri_screen.h +@@ -168,8 +168,8 @@ dri_destroy_screen_helper(struct dri_screen * screen); + void + dri_destroy_screen(__DRIscreen * sPriv); + +-extern const struct __DriverAPIRec dri_kms_driver_api; +-extern const __DRIextension *dri_kms_driver_extensions[]; ++extern const struct __DriverAPIRec dri_swrast_kms_driver_api; ++extern const __DRIextension *dri_swrast_kms_driver_extensions[]; + extern const struct __DriverAPIRec galliumdrm_driver_api; + extern const __DRIextension *galliumdrm_driver_extensions[]; + extern const struct __DriverAPIRec galliumsw_driver_api; +diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c +index 8d60526..03614e1 100644 +--- a/src/gallium/frontends/dri/dri_util.c ++++ b/src/gallium/frontends/dri/dri_util.c +@@ -187,7 +187,7 @@ swkmsCreateNewScreen(int scrn, int fd, + const __DRIconfig ***driver_configs, void *data) + { + return driCreateNewScreen2(scrn, fd, extensions, +- dri_kms_driver_extensions, ++ dri_swrast_kms_driver_extensions, + driver_configs, data); + } + +diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c +index 9b78351..e02b03b 100644 +--- a/src/gallium/targets/dri/target.c ++++ b/src/gallium/targets/dri/target.c +@@ -25,7 +25,7 @@ const __DRIextension **__driDriverGetExtensions_kms_swrast(void); + + PUBLIC const __DRIextension **__driDriverGetExtensions_kms_swrast(void) + { +- return dri_kms_driver_extensions; ++ return dri_swrast_kms_driver_extensions; + } + + #endif diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.1.2.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_22.0.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_22.1.2.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 3c26b23ed5..83705fc34d 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -21,9 +21,10 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-util-format-Check-for-NEON-before-using-it.patch \ file://0001-Revert-egl-wayland-deprecate-drm_handle_format-and-d.patch \ + file://0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch \ " -SRC_URI[sha256sum] = "9f2b30f5276a9abaf71aafc6979685e2636189de1a87aea2c9e69744a6d0ebb9" +SRC_URI[sha256sum] = "0971226b4a6a3d10cfc255736b33e4017e18c14c9db1e53863ac1f8ae0deb9ea" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/meta/recipes-graphics/mesa/mesa_22.0.3.bb b/meta/recipes-graphics/mesa/mesa_22.1.2.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa_22.0.3.bb rename to meta/recipes-graphics/mesa/mesa_22.1.2.bb
Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- ...wkmsDRI2Extension-instead-of-driDRI2.patch | 113 ++++++++++++++++++ .../{mesa-gl_22.0.3.bb => mesa-gl_22.1.2.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 3 +- .../mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} | 0 4 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-swrast_kms-use-swkmsDRI2Extension-instead-of-driDRI2.patch rename meta/recipes-graphics/mesa/{mesa-gl_22.0.3.bb => mesa-gl_22.1.2.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_22.0.3.bb => mesa_22.1.2.bb} (100%)