Commit 4ae5a097 authored by Suraj Kandpal's avatar Suraj Kandpal Committed by Ankit Nautiyal
Browse files

drm/i915/hdcp: Pass drm_dp_aux to read_bcaps function 



Pass drm_dp_aux to intel_dp_hdcp_read_bcaps function
so as to aid in reading the bcaps for the remote monitor
later on.

Signed-off-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240223081453.1576918-6-suraj.kandpal@intel.com
parent 55d9b2b8

drivers/gpu/drm/i915/display/intel_dp_hdcp.c

+7 −5
Original line number Diff line number Diff line
@@ -125,13 +125,13 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port, 
}



static

int intel_dp_hdcp_read_bcaps(struct intel_digital_port *dig_port,

int intel_dp_hdcp_read_bcaps(struct drm_dp_aux *aux,

			     struct drm_i915_private *i915,

			     u8 *bcaps)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	ssize_t ret;



	ret = drm_dp_dpcd_read(&dig_port->dp.aux, DP_AUX_HDCP_BCAPS,

	ret = drm_dp_dpcd_read(aux, DP_AUX_HDCP_BCAPS,

			       bcaps, 1);

	if (ret != 1) {

		drm_dbg_kms(&i915->drm,
@@ -146,10 +146,11 @@ static 
int intel_dp_hdcp_repeater_present(struct intel_digital_port *dig_port,

				   bool *repeater_present)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	ssize_t ret;

	u8 bcaps;



	ret = intel_dp_hdcp_read_bcaps(dig_port, &bcaps);

	ret = intel_dp_hdcp_read_bcaps(&dig_port->dp.aux, i915,  &bcaps);

	if (ret)

		return ret;
@@ -271,10 +272,11 @@ static 
int intel_dp_hdcp_capable(struct intel_digital_port *dig_port,

			  bool *hdcp_capable)

{

	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);

	ssize_t ret;

	u8 bcaps;



	ret = intel_dp_hdcp_read_bcaps(dig_port, &bcaps);

	ret = intel_dp_hdcp_read_bcaps(&dig_port->dp.aux, i915, &bcaps);

	if (ret)

		return ret;