Commit a809b92e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2024-08-13' of... 

Merge tag 'drm-intel-next-2024-08-13' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Type-C programming fix for MTL+ (Gustavo)
 - Fix display clock workaround (Mitul)
 - Fix DP LTTPR detection (Imre)
 - Calculate vblank delay more accurately (Ville)
 - Make vrr_{enabling,disabling}() usable outside intel_display.c (Ville)
 - FBC clean-up (Ville)
 - DP link-training fixes and clean-up (Imre)
 - Make I2C terminology more inclusive (Easwar)
 - Make read-only array bw_gbps static const (Colin)
 - HDCP fixes and improvements (Suraj)
 - DP VSC SDP fixes and clean-ups (Suraj, Mitul)
 - Fix opregion leak in Xe code (Lucas)
 - Fix possible int overflow in skl_ddi_calculate_wrpll (Nikita)]
 - General display clean-ups and conversion towards intel_display (Jani)
 - On DP MST, Enable LT fallback for UHBR<->non-UHBR rates (Imre)
 - Add VRR condition for DPKGC Enablement (Suraj)
 - Use backlight power constants (Zimmermann)
 - Correct dual pps handling for MTL_PCH+ (Dnyaneshwar)
 - Dump DSC HW state (Imre)
 - Replace double blank with single blank after comma (Andi)
 - Read display register timeout on BMG (Mitul)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZruWsyTv3nzdArDk@intel.com
parents 4e996697 db639278

drivers/gpu/drm/display/drm_dp_mst_topology.c

+42 −13
Original line number Diff line number Diff line
@@ -2339,7 +2339,7 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, 
{

	struct drm_dp_mst_topology_mgr *mgr = mstb->mgr;

	struct drm_dp_mst_port *port;

	int old_ddps = 0, ret;

	int ret;

	u8 new_pdt = DP_PEER_DEVICE_NONE;

	bool new_mcs = 0;

	bool created = false, send_link_addr = false, changed = false;
@@ -2372,7 +2372,6 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, 
		 */

		drm_modeset_lock(&mgr->base.lock, NULL);



		old_ddps = port->ddps;

		changed = port->ddps != port_msg->ddps ||

			(port->ddps &&

			 (port->ldps != port_msg->legacy_device_plug_status ||
@@ -2407,7 +2406,6 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, 
	 * Reprobe PBN caps on both hotplug, and when re-probing the link

	 * for our parent mstb

	 */

	if (old_ddps != port->ddps || !created) {

	if (port->ddps && !port->input) {

		ret = drm_dp_send_enum_path_resources(mgr, mstb,

						      port);
@@ -2416,7 +2414,6 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, 
	} else {

		port->full_pbn = 0;

	}

	}



	ret = drm_dp_port_set_pdt(port, new_pdt, new_mcs);

	if (ret == 1) {
@@ -2692,6 +2689,11 @@ static void drm_dp_mst_link_probe_work(struct work_struct *work) 
		drm_kms_helper_hotplug_event(dev);

}



static void drm_dp_mst_queue_probe_work(struct drm_dp_mst_topology_mgr *mgr)

{

	queue_work(system_long_wq, &mgr->work);

}



static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr,

				 u8 *guid)

{
@@ -3685,7 +3687,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms 
		/* Write reset payload */

		drm_dp_dpcd_write_payload(mgr, 0, 0, 0x3f);



		queue_work(system_long_wq, &mgr->work);

		drm_dp_mst_queue_probe_work(mgr);



		ret = 0;

	} else {
@@ -3723,6 +3725,33 @@ drm_dp_mst_topology_mgr_invalidate_mstb(struct drm_dp_mst_branch *mstb) 
			drm_dp_mst_topology_mgr_invalidate_mstb(port->mstb);

}



/**

 * drm_dp_mst_topology_queue_probe - Queue a topology probe

 * @mgr: manager to probe

 *

 * Queue a work to probe the MST topology. Driver's should call this only to

 * sync the topology's HW->SW state after the MST link's parameters have

 * changed in a way the state could've become out-of-sync. This is the case

 * for instance when the link rate between the source and first downstream

 * branch device has switched between UHBR and non-UHBR rates. Except of those

 * cases - for instance when a sink gets plugged/unplugged to a port - the SW

 * state will get updated automatically via MST UP message notifications.

 */

void drm_dp_mst_topology_queue_probe(struct drm_dp_mst_topology_mgr *mgr)

{

	mutex_lock(&mgr->lock);



	if (drm_WARN_ON(mgr->dev, !mgr->mst_state || !mgr->mst_primary))

		goto out_unlock;



	drm_dp_mst_topology_mgr_invalidate_mstb(mgr->mst_primary);

	drm_dp_mst_queue_probe_work(mgr);



out_unlock:

	mutex_unlock(&mgr->lock);

}

EXPORT_SYMBOL(drm_dp_mst_topology_queue_probe);



/**

 * drm_dp_mst_topology_mgr_suspend() - suspend the MST manager

 * @mgr: manager to suspend
@@ -3809,7 +3838,7 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, 
	 * state of our in-memory topology back into sync with reality. So,

	 * restart the probing process as if we're probing a new hub

	 */

	queue_work(system_long_wq, &mgr->work);

	drm_dp_mst_queue_probe_work(mgr);

	mutex_unlock(&mgr->lock);



	if (sync) {

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

+7 −7
Original line number Diff line number Diff line
@@ -170,13 +170,13 @@ static bool ch7017_read(struct intel_dvo_device *dvo, u8 addr, u8 *val) 
{

	struct i2c_msg msgs[] = {

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = 0,

			.len = 1,

			.buf = &addr,

		},

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD,

			.len = 1,

			.buf = val,
@@ -189,7 +189,7 @@ static bool ch7017_write(struct intel_dvo_device *dvo, u8 addr, u8 val) 
{

	u8 buf[2] = { addr, val };

	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 2,

		.buf = buf,
@@ -197,7 +197,7 @@ static bool ch7017_write(struct intel_dvo_device *dvo, u8 addr, u8 val) 
	return i2c_transfer(dvo->i2c_bus, &msg, 1) == 1;

}



/** Probes for a CH7017 on the given bus and slave address. */

/** Probes for a CH7017 on the given bus and target address. */

static bool ch7017_init(struct intel_dvo_device *dvo,

			struct i2c_adapter *adapter)

{
@@ -227,13 +227,13 @@ static bool ch7017_init(struct intel_dvo_device *dvo, 
		break;

	default:

		DRM_DEBUG_KMS("ch701x not detected, got %d: from %s "

			      "slave %d.\n",

			      val, adapter->name, dvo->slave_addr);

			      "target %d.\n",

			      val, adapter->name, dvo->target_addr);

		goto fail;

	}



	DRM_DEBUG_KMS("%s detected on %s, addr %d\n",

		      str, adapter->name, dvo->slave_addr);

		      str, adapter->name, dvo->target_addr);

	return true;



fail:

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

+9 −9
Original line number Diff line number Diff line
@@ -153,13 +153,13 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	struct i2c_msg msgs[] = {

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = 0,

			.len = 1,

			.buf = out_buf,

		},

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD,

			.len = 1,

			.buf = in_buf,
@@ -176,7 +176,7 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	if (!ch7xxx->quiet) {

		DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}

	return false;

}
@@ -188,7 +188,7 @@ static bool ch7xxx_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 
	struct i2c_adapter *adapter = dvo->i2c_bus;

	u8 out_buf[2];

	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 2,

		.buf = out_buf,
@@ -202,7 +202,7 @@ static bool ch7xxx_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 


	if (!ch7xxx->quiet) {

		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}



	return false;
@@ -229,8 +229,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, 


	name = ch7xxx_get_id(vendor);

	if (!name) {

		DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s slave %d.\n",

			      vendor, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s target %d.\n",

			      vendor, adapter->name, dvo->target_addr);

		goto out;

	}
@@ -240,8 +240,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, 


	devid = ch7xxx_get_did(device);

	if (!devid) {

		DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s slave %d.\n",

			      device, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s target %d.\n",

			      device, adapter->name, dvo->target_addr);

		goto out;

	}

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

+8 −8
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, u16 *data) 


	struct i2c_msg msgs[] = {

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD,

			.len = 0,

		},
@@ -209,7 +209,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, u16 *data) 
			.buf = out_buf,

		},

		{

			.addr = dvo->slave_addr,

			.addr = dvo->target_addr,

			.flags = I2C_M_RD | I2C_M_NOSTART,

			.len = 2,

			.buf = in_buf,
@@ -226,7 +226,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, u16 *data) 
	if (!priv->quiet) {

		DRM_DEBUG_KMS("Unable to read register 0x%02x from "

				"%s:%02x.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}

	return false;

}
@@ -238,7 +238,7 @@ static bool ivch_write(struct intel_dvo_device *dvo, int addr, u16 data) 
	struct i2c_adapter *adapter = dvo->i2c_bus;

	u8 out_buf[3];

	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 3,

		.buf = out_buf,
@@ -253,13 +253,13 @@ static bool ivch_write(struct intel_dvo_device *dvo, int addr, u16 data) 


	if (!priv->quiet) {

		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n",

			  addr, adapter->name, dvo->slave_addr);

			  addr, adapter->name, dvo->target_addr);

	}



	return false;

}



/* Probes the given bus and slave address for an ivch */

/* Probes the given bus and target address for an ivch */

static bool ivch_init(struct intel_dvo_device *dvo,

		      struct i2c_adapter *adapter)

{
@@ -283,10 +283,10 @@ static bool ivch_init(struct intel_dvo_device *dvo, 
	 * very unique, check that the value in the base address field matches

	 * the address it's responding on.

	 */

	if ((temp & VR00_BASE_ADDRESS_MASK) != dvo->slave_addr) {

	if ((temp & VR00_BASE_ADDRESS_MASK) != dvo->target_addr) {

		DRM_DEBUG_KMS("ivch detect failed due to address mismatch "

			  "(%d vs %d)\n",

			  (temp & VR00_BASE_ADDRESS_MASK), dvo->slave_addr);

			  (temp & VR00_BASE_ADDRESS_MASK), dvo->target_addr);

		goto out;

	}

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

+9 −9
Original line number Diff line number Diff line
@@ -398,13 +398,13 @@ static bool ns2501_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 


	struct i2c_msg msgs[] = {

		{

		 .addr = dvo->slave_addr,

		 .addr = dvo->target_addr,

		 .flags = 0,

		 .len = 1,

		 .buf = out_buf,

		 },

		{

		 .addr = dvo->slave_addr,

		 .addr = dvo->target_addr,

		 .flags = I2C_M_RD,

		 .len = 1,

		 .buf = in_buf,
@@ -422,7 +422,7 @@ static bool ns2501_readb(struct intel_dvo_device *dvo, int addr, u8 *ch) 
	if (!ns->quiet) {

		DRM_DEBUG_KMS

		    ("Unable to read register 0x%02x from %s:0x%02x.\n", addr,

		     adapter->name, dvo->slave_addr);

		     adapter->name, dvo->target_addr);

	}



	return false;
@@ -441,7 +441,7 @@ static bool ns2501_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 
	u8 out_buf[2];



	struct i2c_msg msg = {

		.addr = dvo->slave_addr,

		.addr = dvo->target_addr,

		.flags = 0,

		.len = 2,

		.buf = out_buf,
@@ -456,7 +456,7 @@ static bool ns2501_writeb(struct intel_dvo_device *dvo, int addr, u8 ch) 


	if (!ns->quiet) {

		DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d\n",

			      addr, adapter->name, dvo->slave_addr);

			      addr, adapter->name, dvo->target_addr);

	}



	return false;
@@ -487,8 +487,8 @@ static bool ns2501_init(struct intel_dvo_device *dvo, 
		goto out;



	if (ch != (NS2501_VID & 0xff)) {

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",

			      ch, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Target %d.\n",

			      ch, adapter->name, dvo->target_addr);

		goto out;

	}
@@ -496,8 +496,8 @@ static bool ns2501_init(struct intel_dvo_device *dvo, 
		goto out;



	if (ch != (NS2501_DID & 0xff)) {

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Slave %d.\n",

			      ch, adapter->name, dvo->slave_addr);

		DRM_DEBUG_KMS("ns2501 not detected got %d: from %s Target %d.\n",

			      ch, adapter->name, dvo->target_addr);

		goto out;

	}

	ns->quiet = false;