[WPE] WPE Platform: add a connect method to WPEDisplayDRM to use a custom device file #34453

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.

Sign up for GitHub

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

Jump to bottom

Merged

webkit-commit-queue merged 1 commit into WebKit:main from siwei-li:eng/WPE-WPE-Platform-add-a-connect-method-to-WPEDisplayDRM-to-use-a-custom-device-file

Oct 22, 2024

Contributor

siwei-li commented Sep 30, 2024 •

edited by webkit-early-warning-system

Loading

`f98baf3`

[WPE] WPE Platform: add a connect method to WPEDisplayDRM to use a custom device file
https://bugs.webkit.org/show_bug.cgi?id=265654

Reviewed by Carlos Garcia Campos.

Adding a wpe_display_drm_connect() to the DRM platform's API, so that
the DRM device to connect to may be specified by the device name.

* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp:
(wpeDisplayDRMSetup): a setup function to be called by the two functions
below
(wpeDisplayDRMConnect):
(wpe_display_drm_connect):
* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.h:

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

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	⏳ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🧪 api-gtk~~
	🧪 vision-wk2	✅ 🧪 mac-intel-wk2
✅ 🛠 🧪 unsafe-merge	🛠 tv	✅ 🛠 mac-safer-cpp
	⏳ 🛠 tv-sim
	⏳ 🛠 watch
	⏳ 🛠 watch-sim

siwei-li requested review from zdobersek and a team as code owners

September 30, 2024 15:49

Collaborator

webkit-early-warning-system commented Sep 30, 2024 •

edited

Loading

EWS run on previous version of this PR (hash 930b4e6)

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

siwei-li force-pushed the eng/WPE-WPE-Platform-add-a-connect-method-to-WPEDisplayDRM-to-use-a-custom-device-file branch from 930b4e6 to 809d3e8 Compare

September 30, 2024 15:54

Collaborator

webkit-early-warning-system commented Sep 30, 2024 •

edited

Loading

EWS run on previous version of this PR (hash 809d3e8)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	⏳ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

carlosgcampos requested changes

View reviewed changes

Source/WebKit/WPEPlatform/wpe/headless/WPEDisplayHeadless.cpp Outdated

Contributor

carlosgcampos Oct 1, 2024

Suggested change

      
             * wpe_display_headless_new_for_device:
          
             * wpe_display_headless_new_for_device: (skip)

Source/WebKit/WPEPlatform/wpe/headless/WPEDisplayHeadless.cpp Outdated

Contributor

carlosgcampos Oct 1, 2024

I would use a different error here, DRM device "%s" not found, or something similar.

Source/WebKit/WPEPlatform/wpe/headless/WPEDisplayHeadless.cpp Outdated

Contributor

carlosgcampos Oct 1, 2024

Suggested change

      
                g_set_error(error, WPE_DISPLAY_ERROR, WPE_DISPLAY_ERROR_NOT_SUPPORTED, "DRM device not supported");
          
                g_set_error_literal(error, WPE_DISPLAY_ERROR, WPE_DISPLAY_ERROR_NOT_SUPPORTED, "DRM device not supported");

Source/WebKit/WPEPlatform/wpe/headless/WPEDisplayHeadless.cpp Outdated

Contributor

carlosgcampos Oct 1, 2024

Suggested change

      
                    g_set_error(error, WPE_DISPLAY_ERROR, WPE_DISPLAY_ERROR_NOT_SUPPORTED, "No DRM devices found");
          
                    g_set_error_literal(error, WPE_DISPLAY_ERROR, WPE_DISPLAY_ERROR_NOT_SUPPORTED, "No DRM devices found");

Source/WebKit/WPEPlatform/wpe/headless/WPEDisplayHeadless.cpp Outdated

Comment on lines 250 to 255

Contributor

carlosgcampos Oct 1, 2024

If there's no primary or render node, we should initialize to a null CString.

siwei-li force-pushed the eng/WPE-WPE-Platform-add-a-connect-method-to-WPEDisplayDRM-to-use-a-custom-device-file branch from 809d3e8 to 25e89ac Compare

October 16, 2024 15:53

Collaborator

webkit-early-warning-system commented Oct 16, 2024 •

edited

Loading

EWS run on previous version of this PR (hash 25e89ac)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

Ahmad-S792 assigned siwei-li

carlosgcampos approved these changes

View reviewed changes

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

Comment on lines +441 to +442

Contributor

carlosgcampos Oct 17, 2024

Add g_return_val_if_fail(WPE_IS_DISPLAY_DRM(display), FALSE);

siwei-li force-pushed the eng/WPE-WPE-Platform-add-a-connect-method-to-WPEDisplayDRM-to-use-a-custom-device-file branch from 25e89ac to 29dec7b Compare

October 21, 2024 19:06

Collaborator

webkit-early-warning-system commented Oct 21, 2024 •

edited

Loading

EWS run on current version of this PR (hash 29dec7b)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	✅ 🧪 win-tests
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt		✅ 🛠 wpe-cairo
	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
	✅ 🛠 vision	⏳ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🧪 api-gtk~~
	🧪 vision-wk2	✅ 🧪 mac-intel-wk2
✅ 🛠 🧪 unsafe-merge	🛠 tv	✅ 🛠 mac-safer-cpp
	⏳ 🛠 tv-sim
	⏳ 🛠 watch
	⏳ 🛠 watch-sim

carlosgcampos added the unsafe-merge-queue label


          [WPE] WPE Platform: add a connect method to WPEDisplayDRM to use a cu…

f98baf3

…stom device file

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

Reviewed by Carlos Garcia Campos.

Adding a wpe_display_drm_connect() to the DRM platform's API, so that
the DRM device to connect to may be specified by the device name.

* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.cpp:
(wpeDisplayDRMSetup): a setup function to be called by the two functions
below
(wpeDisplayDRMConnect):
(wpe_display_drm_connect):
* Source/WebKit/WPEPlatform/wpe/drm/WPEDisplayDRM.h:

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

webkit-commit-queue force-pushed the eng/WPE-WPE-Platform-add-a-connect-method-to-WPEDisplayDRM-to-use-a-custom-device-file branch from 29dec7b to f98baf3 Compare

October 22, 2024 05:47

Collaborator

webkit-commit-queue commented Oct 22, 2024

Committed 285545@main (f98baf3): https://commits.webkit.org/285545@main

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

webkit-commit-queue merged commit f98baf3 into WebKit:main

webkit-commit-queue removed the unsafe-merge-queue label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet