Commit 67fdd8ea authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: s/hdcp2_hdmi_msg_data/hdcp2_hdmi_msg_timeout/ 



The array is there only for timeout, "data" doesn't mean anything
so let's rename the thing to be more descriptive.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191010145127.7487-2-ville.syrjala@linux.intel.com


Reviewed-by: default avatarRamalingam C <ramalingam.c@intel.com>
parent 2edb3de9

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

+7 −7
Original line number Diff line number Diff line
@@ -1535,13 +1535,13 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port) 
	return true;

}



struct hdcp2_hdmi_msg_data {

struct hdcp2_hdmi_msg_timeout {

	u8 msg_id;

	u32 timeout;

	u32 timeout2;

};



static const struct hdcp2_hdmi_msg_data hdcp2_msg_data[] = {

static const struct hdcp2_hdmi_msg_timeout hdcp2_msg_timeout[] = {

	{ HDCP_2_2_AKE_INIT, 0, 0 },

	{ HDCP_2_2_AKE_SEND_CERT, HDCP_2_2_CERT_TIMEOUT_MS, 0 },

	{ HDCP_2_2_AKE_NO_STORED_KM, 0, 0 },
@@ -1572,12 +1572,12 @@ static int get_hdcp2_msg_timeout(u8 msg_id, bool is_paired) 
{

	int i;



	for (i = 0; i < ARRAY_SIZE(hdcp2_msg_data); i++)

		if (hdcp2_msg_data[i].msg_id == msg_id &&

	for (i = 0; i < ARRAY_SIZE(hdcp2_msg_timeout); i++)

		if (hdcp2_msg_timeout[i].msg_id == msg_id &&

		    (msg_id != HDCP_2_2_AKE_SEND_HPRIME || is_paired))

			return hdcp2_msg_data[i].timeout;

		else if (hdcp2_msg_data[i].msg_id == msg_id)

			return hdcp2_msg_data[i].timeout2;

			return hdcp2_msg_timeout[i].timeout;

		else if (hdcp2_msg_timeout[i].msg_id == msg_id)

			return hdcp2_msg_timeout[i].timeout2;



	return -EINVAL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE