| Message ID | 20230830073437.666263-1-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Fix HDCP2 capability check | expand |
> -----Original Message----- > From: Kandpal, Suraj <suraj.kandpal@intel.com> > Sent: Wednesday, August 30, 2023 1:05 PM > To: intel-gfx@lists.freedesktop.org > Cc: Nautiyal, Ankit K <ankit.k.nautiyal@intel.com>; Shankar, Uma > <uma.shankar@intel.com>; Murthy, Arun R <arun.r.murthy@intel.com>; Kandpal, > Suraj <suraj.kandpal@intel.com> > Subject: [PATCH 0/2] Fix HDCP2 capability check > > In DP MST scenarios we derive the connector and in turn the aux from > intel_digital_port which always gave the primary monitors aux, this caused the > capability of the primary monitor to be checked twice rather than enumerating the > different HDCP capabilities for each monitor because of this we saw the below > issues -primary monitor = HDCP 1.4 secondary monitor : HDCP 2.2 1.4 > i915_display_info reads as : HDCP 1.4 for both monitor > > -primary monitor = HDCP 2.2 1.4 secondary monitor : HDCP 1.4 i915_display_info > reads as : HDCP 2.2 1.4 for both monitor > > Solution is to derive the aux from intel_connector instead. Pushed to drm-intel-next. Thanks for the change. Regards, Uma Shankar > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > > Suraj Kandpal (2): > drm/i915/hdcp: Use intel_connector as argument for hdcp_2_2_capable > drm/i915/hdcp: Use correct aux for capability check scenario > > drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- > drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 7 +++++-- > drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +-- > drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- > 4 files changed, 9 insertions(+), 6 deletions(-) > > -- > 2.25.1
In DP MST scenarios we derive the connector and in turn the aux from intel_digital_port which always gave the primary monitors aux, this caused the capability of the primary monitor to be checked twice rather than enumerating the different HDCP capabilities for each monitor because of this we saw the below issues -primary monitor = HDCP 1.4 secondary monitor : HDCP 2.2 1.4 i915_display_info reads as : HDCP 1.4 for both monitor -primary monitor = HDCP 2.2 1.4 secondary monitor : HDCP 1.4 i915_display_info reads as : HDCP 2.2 1.4 for both monitor Solution is to derive the aux from intel_connector instead. Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> Suraj Kandpal (2): drm/i915/hdcp: Use intel_connector as argument for hdcp_2_2_capable drm/i915/hdcp: Use correct aux for capability check scenario drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 7 +++++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 3 +-- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-)