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.

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

VideoLayerBridgeDRMPRIME: set HDR metadata #16103

Merged
merged 2 commits into from
Oct 31, 2019
Merged

VideoLayerBridgeDRMPRIME: set HDR metadata #16103

merged 2 commits into from
Oct 31, 2019

Conversation

Kwiboo
Copy link
Member

@Kwiboo Kwiboo commented May 8, 2019 •
edited
Loading

Description

This PR adds code to set HDR metadata for the Direct-To-Plane renderer on the GBM platform.

This is created as a draft PR as this must not be merged before required patches land in kernel.

Motivation and Context

HDR

How Has This Been Tested?

This has been tested on a Rock64 and Rock Pi 4 with HDR patchset v9 and a patch to set DRM InfoFrame in dw-hdmi driver. HDR mode is successfully activated/deactivated on my LG OLED B7.

(HDR is not fully usable on dw-hdmi as the driver lacks support for a full 10-bit HDMI pipeline)

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@lrusak lrusak added the Don't merge PR that should not be merged (yet) label May 8, 2019
@lrusak
Copy link
Contributor

lrusak commented May 8, 2019

Looks good. I will add the intel properties on top of this

@Kwiboo
Copy link
Member Author

Kwiboo commented May 26, 2019

We should be able to merge this soon as basic HDR patches have been merged to drm-misc-next.
Also I just sent out a HDR patchset for DW-HDMI, see https://patchwork.freedesktop.org/series/61161/

Before merging we need to have a build test and a #ifdef around struct hdr_metadata_infoframe as it will take some time until that struct reaches libdrm.

@FernetMenta
Copy link
Contributor

This deteriorates the design. HDR metadata is already carried in CVideoPicture

@emersion
Copy link

Note that HDR patches have been merged upstream.

@Kwiboo Kwiboo mentioned this pull request Oct 17, 2019
Merged
13 tasks
@Kwiboo
Copy link
Member Author

Kwiboo commented Oct 17, 2019

Patches has been updated and is currently rebased on top of #16800

@Kwiboo Kwiboo added this to the Matrix 19.0-alpha 1 milestone Oct 18, 2019
@Kwiboo Kwiboo force-pushed the drmprime-hdr branch 3 times, most recently from e56d126 to 7af1329 Compare October 23, 2019 18:38
@Kwiboo Kwiboo marked this pull request as ready for review October 23, 2019 18:39
@Kwiboo Kwiboo removed the Don't merge PR that should not be merged (yet) label Oct 23, 2019
@Kwiboo
Copy link
Member Author

Kwiboo commented Oct 23, 2019

With #16800 merged and kernel HDR parts merged in linux v5.3 this should now be ready for a final round of review and then merge

lrusak
lrusak approved these changes Oct 23, 2019
View reviewed changes
Copy link
Contributor

@lrusak lrusak left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the changes to use the VideoPicture struct

@Kwiboo Kwiboo merged commit cce8119 into xbmc:master Oct 31, 2019
Maven85 pushed a commit to Maven85/kodi that referenced this pull request Jan 21, 2020
@Kwiboo @Maven85
Merge pull request xbmc#16103 from Kwiboo/drmprime-hdr
8a3ea43 
VideoLayerBridgeDRMPRIME: set HDR metadata
@LaserEyess LaserEyess mentioned this pull request Oct 28, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rechi Rechi Rechi left review comments

@a1rwulf a1rwulf a1rwulf left review comments

@emersion emersion emersion left review comments

@lrusak lrusak lrusak approved these changes

Assignees
No one assigned
Labels
Component: Video rendering Platform: Linux Type: Feature non-breaking change which adds functionality v19 Matrix
Projects
None yet
Milestone
Matrix 19.0-alpha 1
Development

Successfully merging this pull request may close these issues.
6 participants
@Kwiboo @lrusak @FernetMenta @emersion @a1rwulf @Rechi