Fix up desktop display init regression #428
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chadmed
force-pushed
the
fix-dev-info
branch
2 times, most recently
from
8a01413 to
361580f
Compare
chadmed
changed the title
chadmed
force-pushed
the
fix-dev-info
branch
from
361580f to
a3e6362
Compare
jannau
reviewed
Dec 18, 2024
| @@ -51,7 +51,7 @@ void get_device_info(void) | |||
| printf(" Target: %s\n", target); | |||
|
|
|||
| is_mac = !!strstr(model, "Mac"); | |||
| has_dcp = adt_path_offset(adt, "/arm-io/dcp") > 0; | |||
| has_dcp = !!adt_path_offset(adt, "/arm-io/dcp") || !!adt_path_offset(adt, "/arm-io/dcpext0"); | |||
There was a problem hiding this comment.
unrelated to the fix. this should use the display_config from display.c. I also don't see the need to handle this outside display.c. The called functions should just return immediately when running on device without dcp. I can fix that tonight
|
get_device_info() call was moved to |
Desktops do not have /arm-io/dcp. They have /arm-io/dcpext0. Only checking for the former means we were essentially unconditionally skipping display init on desktops. Check for both so that DCP is always initialised when required. Signed-off-by: James Calligeros <jcalligeros99@gmail.com>
chadmed
force-pushed
the
fix-dev-info
branch
from
a3e6362 to
675df20
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 869d2ae
inadvertently dropped the call toprevented DCP from initialising on Mac desktops. This series fixesget_device_info()and alsoboth of those things.I'm not entirely happy with the way we're checking for a DCP, it's a bit ugly.