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

windowing/gbm: preseve crtc index when adding crtcs #17736

Merged
merged 1 commit into from
Apr 28, 2020

Conversation

lrusak
Copy link
Contributor

@lrusak lrusak commented Apr 23, 2020

This fixes an issue introduced in #16237

The crtc index needs to be preserved to allow properly checking planes against possible_crtcs

This preserves the crtc index even when the crtc isn't desired.

We got lucky before because all the systems we tested on must of had the desired crtc as index 0. When testing on the raspberry pi the desired crtc is at index 2 so when we threw away the invalid crtcs the index became invalid also.

Thanks @MilhouseVH for catching this.

@sigmaris can you test to make sure this still works on your platform with this change?

@lrusak lrusak added this to the Matrix 19.0-alpha 1 milestone Apr 23, 2020
Copy link
Contributor

@sigmaris sigmaris left a comment

Choose a reason for hiding this comment

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

This still works OK on my Rockpro64 platform, including the DRM-PRIME hardware acceleration with FFmpeg. I noticed a spot which could do with an extra error check after this change.

xbmc/windowing/gbm/DRMUtils.cpp Show resolved Hide resolved
xbmc/windowing/gbm/DRMUtils.cpp Outdated Show resolved Hide resolved
@lrusak lrusak merged commit ae741e6 into xbmc:master Apr 28, 2020
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Apr 29, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Apr 29, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request May 5, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 3, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020
windowing/gbm: preseve crtc index when adding crtcs
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 7, 2020
windowing/gbm: preseve crtc index when adding crtcs
@lrusak lrusak deleted the drm-fix-crtc-index branch February 11, 2022 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants