[WPE] Fix DRM initialization in nxp-imx6qp-sdb board #23608

psaavedra · 2024-01-31T19:43:28Z

`5a6315f`

[WPE] Fix DRM initialization in nxp-imx6qp-sdb board
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: #23654
Related-To: #23657

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

Canonical link: https://commits.webkit.org/273898@main

6c5d0b2

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	~~🛠 ios~~	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 wincairo~~
	~~🛠 ios-sim~~	~~🛠 mac-AS-debug~~	~~🧪 wpe-wk2~~
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	~~🛠 gtk~~
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	~~🛠 tv~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	~~🛠 tv-sim~~	~~🧪 mac-wk2-stress~~
	~~🛠 watch~~
✅ 🛠 🧪 unsafe-merge	~~🛠 watch-sim~~

webkit-early-warning-system · 2024-01-31T20:11:14Z

EWS run on previous version of this PR (hash 60c9146)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
~~🧪 style~~	~~🛠 ios~~	~~🛠 mac~~	⏳ 🛠 wpe	⏳ 🛠 wincairo
	~~🛠 ios-sim~~	~~🛠 mac-AS-debug~~	⏳ 🧪 wpe-wk2
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	⏳ 🧪 api-wpe
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	⏳ 🛠 gtk
⏳ 🛠 🧪 jsc	~~🧪 api-ios~~	~~🧪 mac-wk2~~	⏳ 🧪 gtk-wk2
	⏳ 🛠 tv	~~🧪 mac-AS-debug-wk2~~	⏳ 🧪 api-gtk
	⏳ 🛠 tv-sim	~~🧪 mac-wk2-stress~~
	⏳ 🛠 watch
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-01-31T20:16:00Z

EWS run on previous version of this PR (hash 01f4834)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 gtk
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp

Source/WebKit/WPEPlatform/wpe/drm/WPEDRM.cpp

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp

carlosgcampos · 2024-02-01T09:57:18Z

Simplifies checks for the valid connector in the chooseConnector():

It looks like the DRM_MODE_CONNECTOR_WRITEBACK is not required
for rendering WPE in DRM mode.

Right, that's why we ignore writeback connectors.

The encoder Id can be zero.

Are you sure 0 is a valid drm object identifier?

psaavedra · 2024-02-01T10:26:23Z

Simplifies checks for the valid connector in the chooseConnector():

It looks like the DRM_MODE_CONNECTOR_WRITEBACK is not required
for rendering WPE in DRM mode.

Right, that's why we ignore writeback connectors.

The encoder Id can be zero.

Are you sure 0 is a valid drm object identifier?

0 is valid since we can be in the case explained here #23608 (comment) : he connector is not currently bound to an encoder or if the encoder+crtc is already used by another connector.

psaavedra · 2024-02-01T10:32:14Z

Simplifies checks for the valid connector in the chooseConnector():

It looks like the DRM_MODE_CONNECTOR_WRITEBACK is not required
for rendering WPE in DRM mode.
Right, that's why we ignore writeback connectors.

I see. But then, if all are DRM_MODE_CONNECTOR_WRITEBACK:ON then we are skipping all of them. What I think this is the case in my board.

UPDATE: to keep the check for the DRM_MODE_CONNECTOR_WRITEBACK is ok.

webkit-early-warning-system · 2024-02-01T11:00:10Z

EWS run on current version of this PR (hash f2830a0)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
⏳ 🧪 style	🛠 ios	🛠 mac	🛠 wpe	⏳ 🛠 wincairo
	🛠 ios-sim	⏳ 🛠 mac-AS-debug	🧪 wpe-wk2
🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	🧪 api-wpe
	🧪 ios-wk2-wpt	🧪 mac-wk1	🛠 gtk
⏳ 🛠 🧪 jsc	🧪 api-ios	🧪 mac-wk2	🧪 gtk-wk2
	⏳ 🛠 tv	⏳ 🧪 mac-AS-debug-wk2	🧪 api-gtk
🧪 services	⏳ 🛠 tv-sim	🧪 mac-wk2-stress	⏳ 🛠 jsc-armv7
	⏳ 🛠 watch		⏳ 🧪 jsc-armv7-tests
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-02-01T11:00:11Z

EWS run on previous version of this PR (hash f2830a0)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	⏳ 🧪 api-mac	✅ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt	⏳ 🧪 mac-wk1	✅ 🛠 gtk
⏳ 🛠 🧪 jsc	✅ 🧪 api-ios	⏳ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	⏳ 🛠 tv-sim
	⏳ 🛠 watch
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-02-01T11:23:12Z

EWS run on previous version of this PR (hash aaf3552)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	⏳ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt		✅ 🛠 gtk
	✅ 🧪 api-ios	~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	✅ 🛠 tv	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 api-gtk
	⏳ 🛠 tv-sim
	⏳ 🛠 watch
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-02-01T11:23:12Z

Starting EWS tests for aaf3552. Live statuses available at the PR page, #23608

…ization https://bugs.webkit.org/show_bug.cgi?id=268533 Reviewed by Carlos Garcia Campos. This change removes the DPMS property check. The DPMS is a legacy property for setting the power state of the connector. For atomic drivers this is only provided for backwards compatibility with existing drivers. Related-To: WebKit#23608 * Source/WebKit/WPEPlatform/wpe/drm/WPEDRM.cpp: (WPE::DRM::Connector::create): Canonical link: https://commits.webkit.org/273895@main

…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

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp

webkit-early-warning-system · 2024-02-01T12:17:26Z

EWS run on previous version of this PR (hash 3d07a0a)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	⏳ 🛠 ios	⏳ 🛠 mac	⏳ 🛠 wpe	⏳ 🛠 wincairo
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl	⏳ 🧪 ios-wk2	⏳ 🧪 api-mac	⏳ 🧪 api-wpe
	⏳ 🧪 ios-wk2-wpt	⏳ 🧪 mac-wk1	⏳ 🛠 gtk
	⏳ 🧪 api-ios	⏳ 🧪 mac-wk2	⏳ 🧪 gtk-wk2
	⏳ 🛠 tv	~~🧪 mac-AS-debug-wk2~~	⏳ 🧪 api-gtk
	⏳ 🛠 tv-sim	⏳ 🧪 mac-wk2-stress
	⏳ 🛠 watch
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2024-02-01T12:20:23Z

EWS run on current version of this PR (hash 6c5d0b2)

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	~~🛠 ios~~	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 wincairo~~
	~~🛠 ios-sim~~	~~🛠 mac-AS-debug~~	~~🧪 wpe-wk2~~
~~🧪 webkitperl~~	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~
	~~🧪 ios-wk2-wpt~~	~~🧪 mac-wk1~~	~~🛠 gtk~~
	~~🧪 api-ios~~	~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	~~🛠 tv~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	~~🛠 tv-sim~~	~~🧪 mac-wk2-stress~~
	~~🛠 watch~~
✅ 🛠 🧪 unsafe-merge	~~🛠 watch-sim~~

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

webkit-commit-queue · 2024-02-01T12:25:15Z

Committed 273898@main (5a6315f): https://commits.webkit.org/273898@main

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

psaavedra requested review from zdobersek and a team as code owners January 31, 2024 19:43

psaavedra self-assigned this Jan 31, 2024

psaavedra added the WPE WebKit WebKit WPE component label Jan 31, 2024

psaavedra requested a review from carlosgcampos January 31, 2024 19:44

psaavedra force-pushed the eng/WPE-Fix-DRM-initialization-in-nxp-imx6qp-sdb-board branch from 60c9146 to 01f4834 Compare January 31, 2024 20:07

psaavedra commented Feb 1, 2024

View reviewed changes

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp Show resolved Hide resolved

psaavedra commented Feb 1, 2024

View reviewed changes

Source/WebKit/WPEPlatform/wpe/drm/WPEDRM.cpp Outdated Show resolved Hide resolved

psaavedra commented Feb 1, 2024

View reviewed changes

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp Show resolved Hide resolved

psaavedra marked this pull request as draft February 1, 2024 09:32

psaavedra commented Feb 1, 2024

View reviewed changes

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp Outdated Show resolved Hide resolved

carlosgcampos reviewed Feb 1, 2024

View reviewed changes

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp Outdated Show resolved Hide resolved

psaavedra mentioned this pull request Feb 1, 2024

[WPE] WPE Platform: don't check DPMS property in DRM platform initialization #23654

Merged

psaavedra mentioned this pull request Feb 1, 2024

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

Merged

psaavedra force-pushed the eng/WPE-Fix-DRM-initialization-in-nxp-imx6qp-sdb-board branch from 01f4834 to f2830a0 Compare February 1, 2024 10:59

psaavedra force-pushed the eng/WPE-Fix-DRM-initialization-in-nxp-imx6qp-sdb-board branch from f2830a0 to aaf3552 Compare February 1, 2024 11:23

psaavedra marked this pull request as ready for review February 1, 2024 11:59

carlosgcampos approved these changes Feb 1, 2024

View reviewed changes

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp Outdated Show resolved Hide resolved

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp Outdated Show resolved Hide resolved

Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp Outdated Show resolved Hide resolved

psaavedra force-pushed the eng/WPE-Fix-DRM-initialization-in-nxp-imx6qp-sdb-board branch from aaf3552 to 3d07a0a Compare February 1, 2024 12:17

psaavedra force-pushed the eng/WPE-Fix-DRM-initialization-in-nxp-imx6qp-sdb-board branch from 3d07a0a to 6c5d0b2 Compare February 1, 2024 12:20

psaavedra added 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 force-pushed the eng/WPE-Fix-DRM-initialization-in-nxp-imx6qp-sdb-board branch from 6c5d0b2 to 95ad529 Compare February 1, 2024 12:23

webkit-commit-queue force-pushed the eng/WPE-Fix-DRM-initialization-in-nxp-imx6qp-sdb-board branch from 95ad529 to 5a6315f Compare February 1, 2024 12:25

webkit-commit-queue merged commit 5a6315f into WebKit:main Feb 1, 2024

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WPE] Fix DRM initialization in nxp-imx6qp-sdb board #23608

[WPE] Fix DRM initialization in nxp-imx6qp-sdb board #23608

psaavedra commented Jan 31, 2024 •

edited by webkit-early-warning-system

webkit-early-warning-system commented Jan 31, 2024 •

edited

webkit-early-warning-system commented Jan 31, 2024 •

edited

carlosgcampos commented Feb 1, 2024

psaavedra commented Feb 1, 2024

psaavedra commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-commit-queue commented Feb 1, 2024

[WPE] Fix DRM initialization in nxp-imx6qp-sdb board #23608

[WPE] Fix DRM initialization in nxp-imx6qp-sdb board #23608

Conversation

psaavedra commented Jan 31, 2024 • edited by webkit-early-warning-system

5a6315f

webkit-early-warning-system commented Jan 31, 2024 • edited

webkit-early-warning-system commented Jan 31, 2024 • edited

carlosgcampos commented Feb 1, 2024

psaavedra commented Feb 1, 2024

psaavedra commented Feb 1, 2024 • edited

webkit-early-warning-system commented Feb 1, 2024 • edited

webkit-early-warning-system commented Feb 1, 2024 • edited

webkit-early-warning-system commented Feb 1, 2024 • edited

webkit-early-warning-system commented Feb 1, 2024

webkit-early-warning-system commented Feb 1, 2024 • edited

webkit-early-warning-system commented Feb 1, 2024 • edited

webkit-commit-queue commented Feb 1, 2024

psaavedra commented Jan 31, 2024 •

edited by webkit-early-warning-system

`5a6315f`

webkit-early-warning-system commented Jan 31, 2024 •

edited

webkit-early-warning-system commented Jan 31, 2024 •

edited

psaavedra commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited

webkit-early-warning-system commented Feb 1, 2024 •

edited