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

only fail INVALID format when it's set as that #122

Merged
merged 1 commit into from
Dec 21, 2024

Conversation

ikalco
Copy link
Contributor

@ikalco ikalco commented Dec 21, 2024

fixes hyprwm/Hyprland#8790

edit:
it think fixes #117 also

Copy link
Member

@vaxerski vaxerski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how the fuck would format be invalid otherwise?

@ikalco
Copy link
Contributor Author

ikalco commented Dec 21, 2024

default is DRM_FORMAT_INVALID

so on first connect, rule says disabled, HL commits with no buffer or format set, which is fine since it's a disable commit
but it fails because the default is DRM_FORMAT_INVALID, so drm: No format for output

@vaxerski
Copy link
Member

shouldnt we check for a format then only if it's enabled and not only if format committed?

@ikalco ikalco force-pushed the fix_no_format_failing_disable_commit branch from d6cee56 to 9e0290e Compare December 21, 2024 19:29
@ikalco
Copy link
Contributor Author

ikalco commented Dec 21, 2024

yeah your right

src/backend/drm/DRM.cpp Outdated Show resolved Hide resolved
@ikalco ikalco force-pushed the fix_no_format_failing_disable_commit branch from 9e0290e to 27c9cb7 Compare December 21, 2024 20:43
Copy link
Member

@vaxerski vaxerski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@vaxerski vaxerski merged commit 5e3f601 into hyprwm:main Dec 21, 2024
1 check passed
@ikalco ikalco deleted the fix_no_format_failing_disable_commit branch December 21, 2024 22:28
UjinT34 pushed a commit to UjinT34/aquamarine that referenced this pull request Jan 9, 2025
vaxerski added a commit that referenced this pull request Jan 10, 2025
* do not set cursor planeProps unless smth changed

* do not skip cursor state flag setting

* drm: scan only cards and not outputs, safeguard against null renderer (#106)

* drm: dont scan card outputs

no need to scan for card[0-9]* and probe card0-eDP etc if they are kms,
bootvga and rendernodes etc. skip the wildcard and remove a unused
size_t variable.

* drm: dont commit state if renderer is missing

setting certain env vars to force egl implentations makes the render
creation fail on the second gpu. instead of causing a coredump,
safeguard commitState and let the monitor turn blank instead.

* props: bump version to 0.5.0

* drm: Validate conn before dereference in CDRMAtomicRequest::commit() (#108)

During startup, CDRMAtomicImpl::reset() may emit a call to method
commit of a CDRMAtomicRequest instance with member "conn" uninitialized,
leading to a segfault. Validate the the pointer before dereference it as
a workaround.

Fixes: 55ac962 ("DRM: preliminary atomic support")
Closes: #107

Signed-off-by: Yao Zi <[email protected]>

* buffer: remove useless forward def

* drm: clearer flow when rescanning connectors (#113)

* consolidates into checkOutput for clearer flow when rescanning connectors

* add error log

* drm: allow multigpu blit from explicit to implicit (#114)

* version: bump to 0.5.1

* flake.lock: update

* flake.nix: gcc13 -> gcc14 (#118)

* drm: udev scan only drm_minor, not connectors (#119)

* drm: log errno set by drmModeAtomicCommit (#120)

* drm: moved null check for renderer to shouldBlit() (#109) (#121)

* drm: only fail INVALID format when enabled (#122)

* flake.lock: update

* drm: only clear buffers when fullReconfigure succeeds (#124)

* core/drm: Add HDR Support (#112)

* version: bump to 0.6.0

* drm: limit udev drm_minor to Linux after a132fa4 (#129)

Not implemented by libudev-devd yet:

[ERR] [AQ] drm: No gpus in scanGPUs.
[ERR] [AQ] drm: Found no gpus to use, cannot continue
[ERR] [AQ] DRM Backend failed

* do not set cursor planeProps unless smth changed

* test separate cursor commits

* do not change hdr blob unless asked to

* rebase

* split atomic commit processing and move hdr & colorspace into modeset

* fix wide color gamut flag & cleanup

* remove unused debug var

---------

Signed-off-by: Yao Zi <[email protected]>
Co-authored-by: Tom Englund <[email protected]>
Co-authored-by: Vaxry <[email protected]>
Co-authored-by: Ziyao <[email protected]>
Co-authored-by: Ikalco <[email protected]>
Co-authored-by: Mihai Fufezan <[email protected]>
Co-authored-by: Austin Horstman <[email protected]>
Co-authored-by: Richard Henninger <[email protected]>
Co-authored-by: Jan Beich <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Monitor disabling problem Disabled interal display doesn't turn black
2 participants