Commit da44edbb authored by Sean Paul's avatar Sean Paul Committed by Ramalingam C
Browse files

drm/i915: Print HDCP version info for all connectors 



De-duplicate the HDCP version code for each connector and print it for
all connectors.

Cc: Juston Li <juston.li@intel.com>
Cc: Ramalingam C <ramalingam.c@intel.com>
Reviewed-by: default avatarJuston Li <juston.li@intel.com>
Reviewed-by: default avatarRamalingam C <ramalingam.c@intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>

Link: https://patchwork.freedesktop.org/patch/msgid/20200227185714.171466-1-sean@poorly.run #v4
Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-16-sean@poorly.run #v5
Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-16-sean@poorly.run #v6
Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-17-sean@poorly.run

 #v7

Changes in v4:
- Added to the set
Changes in v5:
-Print "No connector support" for hdcp sink capability as well (Ram)
Changes in v6:
-None
Changes in v7:
-None
Changes in v8:
-None

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200818153910.27894-17-sean@poorly.run
parent e38c298f

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

+9 −12
Original line number Diff line number Diff line
@@ -601,6 +601,11 @@ static void intel_hdcp_info(struct seq_file *m, 
{

	bool hdcp_cap, hdcp2_cap;



	if (!intel_connector->hdcp.shim) {

		seq_puts(m, "No Connector Support");

		goto out;

	}



	hdcp_cap = intel_hdcp_capable(intel_connector);

	hdcp2_cap = intel_hdcp2_capable(intel_connector);
@@ -612,6 +617,7 @@ static void intel_hdcp_info(struct seq_file *m, 
	if (!hdcp_cap && !hdcp2_cap)

		seq_puts(m, "None");



out:

	seq_puts(m, "\n");

}
@@ -628,10 +634,6 @@ static void intel_dp_info(struct seq_file *m, 


	drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,

				&intel_dp->aux);

	if (intel_connector->hdcp.shim) {

		seq_puts(m, "\tHDCP version: ");

		intel_hdcp_info(m, intel_connector);

	}

}



static void intel_dp_mst_info(struct seq_file *m,
@@ -649,10 +651,6 @@ static void intel_hdmi_info(struct seq_file *m, 
	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(intel_encoder);



	seq_printf(m, "\taudio support: %s\n", yesno(intel_hdmi->has_audio));

	if (intel_connector->hdcp.shim) {

		seq_puts(m, "\tHDCP version: ");

		intel_hdcp_info(m, intel_connector);

	}

}



static void intel_lvds_info(struct seq_file *m,
@@ -708,6 +706,9 @@ static void intel_connector_info(struct seq_file *m, 
		break;

	}



	seq_puts(m, "\tHDCP version: ");

	intel_hdcp_info(m, intel_connector);



	seq_printf(m, "\tmodes:\n");

	list_for_each_entry(mode, &connector->modes, head)

		intel_seq_print_mode(m, 2, mode);
@@ -2037,10 +2038,6 @@ static int i915_hdcp_sink_capability_show(struct seq_file *m, void *data) 
	if (connector->status != connector_status_connected)

		return -ENODEV;



	/* HDCP is supported by connector */

	if (!intel_connector->hdcp.shim)

		return -EINVAL;



	seq_printf(m, "%s:%d HDCP version: ", connector->name,

		   connector->base.id);

	intel_hdcp_info(m, intel_connector);

CRA Git | Maintained and supported by SUSTech CRA and CCSE