Commit d6a209dd authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-intel-fixes-2024-03-01' of... 

Merge tag 'drm-intel-fixes-2024-03-01' of https://anongit.freedesktop.org/git/drm/drm-intel

 into drm-fixes

- Fix to extract HDCP information from primary connector
- Check for NULL mmu_interval_notifier before removing

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZeGOUTfiA0_FNKLg@jlahtine-mobl.ger.corp.intel.com
parents 9b467b42 01bb1ae3

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

+16 −31
Original line number Diff line number Diff line
@@ -330,23 +330,13 @@ static const struct hdcp2_dp_msg_data hdcp2_dp_msg_data[] = { 
	  0, 0 },

};



static struct drm_dp_aux *

intel_dp_hdcp_get_aux(struct intel_connector *connector)

{

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);



	if (intel_encoder_is_mst(connector->encoder))

		return &connector->port->aux;

	else

		return &dig_port->dp.aux;

}



static int

intel_dp_hdcp2_read_rx_status(struct intel_connector *connector,

			      u8 *rx_status)

{

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

	struct drm_dp_aux *aux = intel_dp_hdcp_get_aux(connector);

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct drm_dp_aux *aux = &dig_port->dp.aux;

	ssize_t ret;



	ret = drm_dp_dpcd_read(aux,
@@ -399,7 +389,9 @@ intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector, 
			    const struct hdcp2_dp_msg_data *hdcp2_msg_data)

{

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

	struct intel_hdcp *hdcp = &connector->hdcp;

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct intel_dp *dp = &dig_port->dp;

	struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;

	u8 msg_id = hdcp2_msg_data->msg_id;

	int ret, timeout;

	bool msg_ready = false;
@@ -454,8 +446,9 @@ int intel_dp_hdcp2_write_msg(struct intel_connector *connector, 
	unsigned int offset;

	u8 *byte = buf;

	ssize_t ret, bytes_to_write, len;

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct drm_dp_aux *aux = &dig_port->dp.aux;

	const struct hdcp2_dp_msg_data *hdcp2_msg_data;

	struct drm_dp_aux *aux;



	hdcp2_msg_data = get_hdcp2_dp_msg_data(*byte);

	if (!hdcp2_msg_data)
@@ -463,8 +456,6 @@ int intel_dp_hdcp2_write_msg(struct intel_connector *connector, 


	offset = hdcp2_msg_data->offset;



	aux = intel_dp_hdcp_get_aux(connector);



	/* No msg_id in DP HDCP2.2 msgs */

	bytes_to_write = size - 1;

	byte++;
@@ -490,7 +481,8 @@ static 
ssize_t get_receiver_id_list_rx_info(struct intel_connector *connector,

				     u32 *dev_cnt, u8 *byte)

{

	struct drm_dp_aux *aux = intel_dp_hdcp_get_aux(connector);

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct drm_dp_aux *aux = &dig_port->dp.aux;

	ssize_t ret;

	u8 *rx_info = byte;
@@ -515,8 +507,9 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector, 
{

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

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

	struct intel_hdcp *hdcp = &connector->hdcp;

	struct drm_dp_aux *aux;

	struct drm_dp_aux *aux = &dig_port->dp.aux;

	struct intel_dp *dp = &dig_port->dp;

	struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;

	unsigned int offset;

	u8 *byte = buf;

	ssize_t ret, bytes_to_recv, len;
@@ -530,8 +523,6 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector, 
		return -EINVAL;

	offset = hdcp2_msg_data->offset;



	aux = intel_dp_hdcp_get_aux(connector);



	ret = intel_dp_hdcp2_wait_for_msg(connector, hdcp2_msg_data);

	if (ret < 0)

		return ret;
@@ -561,11 +552,6 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector, 


		/* Entire msg read timeout since initiate of msg read */

		if (bytes_to_recv == size - 1 && hdcp2_msg_data->msg_read_timeout > 0) {

			if (intel_encoder_is_mst(connector->encoder))

				msg_end = ktime_add_ms(ktime_get_raw(),

						       hdcp2_msg_data->msg_read_timeout *

						       connector->port->parent->num_ports);

			else

			msg_end = ktime_add_ms(ktime_get_raw(),

					       hdcp2_msg_data->msg_read_timeout);

		}
@@ -651,12 +637,11 @@ static 
int intel_dp_hdcp2_capable(struct intel_connector *connector,

			   bool *capable)

{

	struct drm_dp_aux *aux;

	struct intel_digital_port *dig_port = intel_attached_dig_port(connector);

	struct drm_dp_aux *aux = &dig_port->dp.aux;

	u8 rx_caps[3];

	int ret;



	aux = intel_dp_hdcp_get_aux(connector);



	*capable = false;

	ret = drm_dp_dpcd_read(aux,

			       DP_HDCP_2_2_REG_RX_CAPS_OFFSET,

drivers/gpu/drm/i915/gem/i915_gem_userptr.c

+3 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ i915_gem_userptr_release(struct drm_i915_gem_object *obj) 
{

	GEM_WARN_ON(obj->userptr.page_ref);



	if (!obj->userptr.notifier.mm)

		return;



	mmu_interval_notifier_remove(&obj->userptr.notifier);

	obj->userptr.notifier.mm = NULL;

}