Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WPE] WPE Platform: make sure the DRM device selected is capable of modesetting #23657

Conversation

psaavedra
Copy link
Contributor

@psaavedra psaavedra commented Feb 1, 2024

@psaavedra psaavedra requested review from zdobersek and a team as code owners February 1, 2024 10:50
@psaavedra psaavedra self-assigned this Feb 1, 2024
@psaavedra psaavedra added the WPE WebKit WebKit WPE component label Feb 1, 2024
@psaavedra psaavedra force-pushed the eng/WPE-WPE-Platform-make-sure-the-DRM-device-selected-is-capable-of-modesetting branch from 4f35f9d to 587588f Compare February 1, 2024 10:52
@psaavedra psaavedra added safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Feb 1, 2024
@psaavedra psaavedra force-pushed the eng/WPE-WPE-Platform-make-sure-the-DRM-device-selected-is-capable-of-modesetting branch from 587588f to b5e8fec Compare February 1, 2024 11:33
@psaavedra psaavedra added safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Feb 1, 2024
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WPE-WPE-Platform-make-sure-the-DRM-device-selected-is-capable-of-modesetting branch from b5e8fec to e2b5ade Compare February 1, 2024 11:41
…odesetting

https://bugs.webkit.org/show_bug.cgi?id=268535

Reviewed by Carlos Garcia Campos and Adrian Perez de Castro.

Fixes the findDevice() by ensuring the returning device has DRM
resources.

Related-To: WebKit#23608

* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp:
(findDevice):

Canonical link: https://commits.webkit.org/273896@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WPE-WPE-Platform-make-sure-the-DRM-device-selected-is-capable-of-modesetting branch from e2b5ade to 3b6c9da Compare February 1, 2024 11:44
@webkit-commit-queue
Copy link
Collaborator

Committed 273896@main (3b6c9da): https://commits.webkit.org/273896@main

Reviewed commits have been landed. Closing PR #23657 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 3b6c9da into WebKit:main Feb 1, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 1, 2024
webkit-commit-queue pushed a commit to psaavedra/WebKit that referenced this pull request Feb 1, 2024
https://bugs.webkit.org/show_bug.cgi?id=268487

Reviewed by Carlos Garcia Campos.

This patch is generic but fixes the DRM initialization for NXP imx6qp
Sabre Development boards:

* Removes the check for the valid connector in the chooseConnector().
  The encoder Id can be zero if the connector is not currently bound
  to an encoder or if the encoder+crtc is already used by another
  connector.

* Modifies the chooseCrtcForConnector() logic. We implement a more
  robust mechanism by checking the encoder->possible_crtcs in case of
  no active crtc was found.

Credits to Jani Hautakangas <jani@igalia.com>.

Related-To: Igalia/cog#590
Related-To: WebKit#23654
Related-To: WebKit#23657

* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp:
(chooseConnector):
(chooseCrtcForConnector):

Canonical link: https://commits.webkit.org/273898@main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WPE WebKit WebKit WPE component
Projects
None yet
5 participants