drm:i915:display: add checks for Gen9 devices with hdr capability
Subsystems (3)
PATCH v2 1/1 drm:i915:display: add checks for Gen9 devices with hdr capability
this patch adds hdr capabilities checks for Gen9 devices with lspcon support.
This patch is dependent on patch series
https://patchwork.kernel.org/cover/11192807/
--- drivers/gpu/drm/i915/display/intel_lspcon.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_lspcon.c +9 -2
@@ -116,6 +116,10 @@ static bool lspcon_detect_hdr_capability(struct intel_lspcon *lspcon)if (lspcon->vendor ==LSPCON_VENDOR_MCA ) ret =drm_dp_dpcd_read (&dp->aux,DPCD_MCA_LSPCON_HDR_STATUS , &hdr_caps,1 ); +else if (lspcon->vendor ==LSPCON_VENDOR_PARADE ) { + lspcon->hdr_supported = true; +return true; + }else return false;
@@ -474,7 +478,8 @@ void lspcon_write_infoframe(struct intel_encoder *encoder,* Todo: Add support for Parade later */ if (type ==HDMI_PACKET_TYPE_GAMUT_METADATA && - lspcon->vendor !=LSPCON_VENDOR_MCA ) + (lspcon->vendor !=LSPCON_VENDOR_MCA || + lspcon->vendor !=LSPCON_VENDOR_PARADE ))return ;if (lspcon->vendor ==LSPCON_VENDOR_MCA ) {
@@ -646,7 +651,9 @@ bool lspcon_init(struct intel_digital_port *intel_dig_port)return false; } -if (lspcon->vendor ==LSPCON_VENDOR_MCA && lspcon->hdr_supported) +if ((lspcon->vendor ==LSPCON_VENDOR_MCA || + lspcon->vendor ==LSPCON_VENDOR_PARADE ) && + lspcon->hdr_supported)drm_object_attach_property (&connector->base, connector->dev->mode_config.hdr_output_metadata_property,0 );
Signature · 6 lines
2.26.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm:i915:display: add checks for Gen9 devices with hdr capability (rev2)
== Series Details ==
== Series Details ==
Series: drm:i915:display: add checks for Gen9 devices with hdr capability (rev2)
URL : https://patchwork.freedesktop.org/series/75114/
State : failure
== Summary ==
Applying: drm:i915:display: add checks for Gen9 devices with hdr capability Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_lspcon.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_lspcon.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_lspcon.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm:i915:display: add checks for Gen9 devices with hdr capability When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx