Bug 268955 - graphics/mesa-dri: extend kwin_x11 workaround to crocus
Summary: graphics/mesa-dri: extend kwin_x11 workaround to crocus
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-x11 (Nobody)
URL:
Keywords:
Depends on: 251836
Blocks:
  Show dependency treegraph
 
Reported: 2023-01-14 17:18 UTC by Jan Beich
Modified: 2023-01-16 20:48 UTC (History)
3 users (show)

See Also:
manu: maintainer-feedback+
manu: merge-quarterly+


Attachments
v1 (apply via "git am") (1.61 KB, patch)
2023-01-14 17:18 UTC, Jan Beich
no flags Details | Diff
v2 (apply via "git am") (3.07 KB, patch)
2023-01-15 17:27 UTC, Jan Beich
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jan Beich freebsd_committer freebsd_triage 2023-01-14 17:18:21 UTC
Created attachment 239470 [details]
v1 (apply via "git am")

May help https://github.com/helloSystem/ISO/issues/444 as 2022Q4 -> 2023Q1 contains mesa-dri 21.3.8 -> 22.3.2 which replaced i965 with crocus on old Intel iGPUs. crocus, unlike iris, was never used by default until i965 removal. However, crocus was forked from iris, so likely contains many same bugs/features.

http://gitlab.freedesktop.org/mesa/mesa/-/commit/cdde031ac2c8 (see prefer-crocus in meson_options.txt)

Disclaimer: I don't have a crocus-compatible GPU to test runtime.
Comment 1 Jesper Schmitz Mouridsen freebsd_committer freebsd_triage 2023-01-15 14:48:06 UTC
(In reply to Jan Beich from comment #0)
Confirmed working on helloSystem. Writing this from falkon on helloSystem on HD Graphics 3000

OpenGL vendor string:                   Intel
OpenGL renderer string:                 Mesa Intel(R) HD Graphics 3000 (SNB GT2)
OpenGL version string:                  3.3 (Compatibility Profile) Mesa 22.3.2
OpenGL shading language version string: 3.30
Driver:                                 Intel
GPU class:                              SandyBridge
OpenGL version:                         3.3
GLSL version:                           3.30
Mesa version:                           22.3.2
X server version:                       1.21.1
Requires strict binding:                yes
GLSL shaders:                           yes
Texture NPOT support:                   yes
Virtual Machine:                        no
Comment 2 probono 2023-01-15 16:12:53 UTC
Confirm that this fixes the issue for https://github.com/helloSystem/ISO/issues/444 (2022Q4 -> 2023Q1).

This change makes kwin_x11 work again with this GPU:

OpenGL vendor string:                   Intel
OpenGL renderer string:                 Mesa Intel(R) HD Graphics 400 (BSW)
OpenGL version string:                  4.6 (Compatibility Profile) Mesa 22.3.2
OpenGL shading language version string: 4.60
Driver:                                 Intel
GPU class:                              Cherryview
OpenGL version:                         4.6
GLSL version:                           4.60
Mesa version:                           22.3.2
X server version:                       1.21.1
Requires strict binding:                yes
GLSL shaders:                           yes
Texture NPOT support:                   yes
Virtual Machine:                        no

It would be nice to see this fix in 2023Q1.

Huge "thank you" to Jan Beich for identifying the root cause, and for providing a fix.
Comment 3 Jan Beich freebsd_committer freebsd_triage 2023-01-15 17:27:16 UTC
Created attachment 239492 [details]
v2 (apply via "git am")

Minor cleanup:
- Adjust crocus comment to reference this bug
- Drop glx_disable_ext_buffer_age used for Mesa < 21.0.0
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-01-15 18:17:28 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8b0f9b7f3c7c3099d49d69bcfc92466ae012644e

commit 8b0f9b7f3c7c3099d49d69bcfc92466ae012644e
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-15 17:22:09 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-15 18:16:51 +0000

    graphics/mesa-dri: drop obsolete override after 22a85734ff71

    PR:             268955
    Approved by:    manu

 graphics/mesa-dri/files/01-freebsd.conf | 4 ----
 1 file changed, 4 deletions(-)
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-01-15 18:17:29 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fe95d2527471eb9bf3aff8ac02b45482abf911bd

commit fe95d2527471eb9bf3aff8ac02b45482abf911bd
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-14 17:06:09 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-15 18:16:51 +0000

    graphics/mesa-dri: extend kwin_x11 workaround to crocus

    PR:             268955
    Tested by:      jsm, probono@puredarwin.org
    Approved by:    manu

 graphics/mesa-dri/Makefile              | 2 +-
 graphics/mesa-dri/files/01-freebsd.conf | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
Comment 6 commit-hook freebsd_committer freebsd_triage 2023-01-15 18:17:31 UTC
A commit in branch 2023Q1 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=25cf220540bcc03e7e9581e19bc028c69c85d2b1

commit 25cf220540bcc03e7e9581e19bc028c69c85d2b1
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-14 17:06:09 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-15 18:17:08 +0000

    graphics/mesa-dri: extend kwin_x11 workaround to crocus

    PR:             268955
    Tested by:      jsm, probono@puredarwin.org
    Approved by:    manu

    (cherry picked from commit fe95d2527471eb9bf3aff8ac02b45482abf911bd)

 graphics/mesa-dri/Makefile              | 2 +-
 graphics/mesa-dri/files/01-freebsd.conf | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
Comment 7 commit-hook freebsd_committer freebsd_triage 2023-01-15 18:17:32 UTC
A commit in branch 2023Q1 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e76c51733140f976124a4599bf18f574ac5b79fc

commit e76c51733140f976124a4599bf18f574ac5b79fc
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-15 17:22:09 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-15 18:17:08 +0000

    graphics/mesa-dri: drop obsolete override after 22a85734ff71

    PR:             268955
    Approved by:    manu

    (cherry picked from commit 8b0f9b7f3c7c3099d49d69bcfc92466ae012644e)

 graphics/mesa-dri/files/01-freebsd.conf | 4 ----
 1 file changed, 4 deletions(-)
Comment 8 Jan Beich freebsd_committer freebsd_triage 2023-01-16 20:48:48 UTC
Binary package builds start on Tue/Thu/Sat/Sun at 01:00 UTC, so given builds take 2~4 days the fix would propagate around 2023-01-19.

Similar reports:
https://forums.freebsd.org/threads/compositor-disabled-after-quarterly-package-upgrade.87682/
https://twitter.com/TomaszJ/status/1614751981876219905