Commit 389af786 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2023-09-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



drm/i915 feature pull for v6.7:

Features and functionality:
- Early Xe2 LPD / Lunarlake (LNL) display enabling (Lucas, Matt, Gustavo,
  Stanislav, Luca, Clint, Juha-Pekka, Balasubramani, Ravi)
- Plenty of various DSC improvements and fixes (Ankit)
- Add DSC PPS state readout and verification (Suraj)
- Improve fastsets for VRR, LRR and M/N updates (Ville)
- Use connector->ddc to create (non-DP MST) connector sysfs ddc symlinks (Ville)
- Various DSB improvements, load LUTs using DSB (Ville)
- Improve shared link bandwidth management, starting with FDI (Imre)
- Optimize get param ioctl for PXP status (Alan)
- Remove DG2 pre-production hardware workarounds (Matt)
- Add more RPL P/U PCI IDs (Dnyaneshwar)
- Add new DG2-G12 stepping (Swati)
- Add PSR sink error status to debugfs (Jouni)
- Add DP enhanced framing to crtc state checker (Ville)

Refactoring and cleanups:
- Simplify TileY/Tile4 tiling selftest enumeration (Matt)
- Remove some unused power domain code (Gustavo)
- Check stepping of display IP version rather than MTL platform (Matt)
- DP audio compute config cleanups (Vinod)
- SDVO cleanups and refactoring, more robust failure handling (Ville)
- Color register definition and readout cleanups (Jani)
- Reduce header interdependencies for frontbuffer tracking (Jani)
- Continue replacing struct edid with struct drm_edid (Jani)
- Use source physical address instead of EDID for CEC (Jani)
- Clean up Type-C port lane count functions (Luca)
- Clean up DSC PPS register definitions and readout (Jani)
- Stop using GEM_BUG_ON()/GEM_WARN_ON() in display code (Jani)
- Move more of the display probe to display code (Jani)
- Remove redundant runtime suspended state flag (Jouni)
- Move display info printing to display code (Balasubramani)
- Frontbuffer tracking improvements (Jouni)
- Add trailing newlines to debug logging (Jim Cromie)
- Separate display workarounds from clock gating init (Matt)
- Reduce dmesg log spamming for combo PHY, PLL state, FEC, DP MST (Ville, Imre)

Fixes:
- Fix hotplug poll detect loops via suspend/resume (Imre)
- Fix hotplug detect for forced connectors (Imre)
- Fix DSC first_line_bpg_offset calculation (Suraj)
- Fix debug prints for SDP CRC16 (Arun)
- Fix PXP runtime resume (Alan)
- Fix cx0 PHY lane handling (Gustavo)
- Fix frontbuffer tracking locking in debugfs (Juha-Pekka)
- Fix SDVO detect on some models (Ville)
- Fix SDP split configuration for DP MST (Vinod)
- Fix AUX usage and reads for HDCP on DP MST (Suraj)
- Fix PSR workaround (Jouni)
- Fix redundant AUX power get/put in DP force (Imre)
- Fix ICL DSI TCLK POST by letting hardware handle it (William)
- Fix IRQ reset for XE LP+ (Gustavo)
- Fix h/vsync_end instead of h/vtotal in VBT (Ville)
- Fix C20 PHY msgbus timeout issues (Gustavo)
- Fix pre-TGL FEC pipe A vs. DDI A mixup (Ville)
- Fix FEC state readout for DP MST (Ville)

DRM subsystem core changes:
- Assume sink supports 8 bpc when DSC is supported (Ankit)
- Add drm_edid_is_digital() helper (Jani)
- Parse source physical address from EDID (Jani)
- Add function to attach CEC without EDID (Jani)
- Reorder connector sysfs/debugfs remove (Ville)
- Register connector sysfs ddc symlink later (Ville)

Media subsystem changes:
- Add comments about CEC source physical address usage (Jani)

Merges:
- Backmerge drm-next to get v6.6-rc1 (Jani)

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

# Conflicts:
#	drivers/gpu/drm/i915/i915_drv.h
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87r0mhi7a6.fsf@intel.com
parents caacbdc2 3570bd98

drivers/gpu/drm/display/drm_dp_cec.c

+20 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <drm/display/drm_dp_helper.h>

#include <drm/drm_connector.h>

#include <drm/drm_device.h>

#include <drm/drm_edid.h>



/*

 * Unfortunately it turns out that we have a chicken-and-egg situation
@@ -297,7 +298,7 @@ static void drm_dp_cec_unregister_work(struct work_struct *work) 
 * were unchanged and just update the CEC physical address. Otherwise

 * unregister the old CEC adapter and create a new one.

 */

void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid)

void drm_dp_cec_attach(struct drm_dp_aux *aux, u16 source_physical_address)

{

	struct drm_connector *connector = aux->cec.connector;

	u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD |
@@ -339,7 +340,7 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) 
		if (aux->cec.adap->capabilities == cec_caps &&

		    aux->cec.adap->available_log_addrs == num_las) {

			/* Unchanged, so just set the phys addr */

			cec_s_phys_addr_from_edid(aux->cec.adap, edid);

			cec_s_phys_addr(aux->cec.adap, source_physical_address, false);

			goto unlock;

		}

		/*
@@ -370,11 +371,27 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) 
		 * from drm_dp_cec_register_connector() edid == NULL, so in

		 * that case the phys addr is just invalidated.

		 */

		cec_s_phys_addr_from_edid(aux->cec.adap, edid);

		cec_s_phys_addr(aux->cec.adap, source_physical_address, false);

	}

unlock:

	mutex_unlock(&aux->cec.lock);

}

EXPORT_SYMBOL(drm_dp_cec_attach);



/*

 * Note: Prefer calling drm_dp_cec_attach() with

 * connector->display_info.source_physical_address if possible.

 */

void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid)

{

	u16 pa = CEC_PHYS_ADDR_INVALID;



	if (edid && edid->extensions)

		pa = cec_get_edid_phys_addr((const u8 *)edid,

					    EDID_LENGTH * (edid->extensions + 1), NULL);



	drm_dp_cec_attach(aux, pa);

}

EXPORT_SYMBOL(drm_dp_cec_set_edid);



/*

drivers/gpu/drm/display/drm_dp_helper.c

+6 −2
Original line number Diff line number Diff line
@@ -2449,11 +2449,15 @@ int drm_dp_dsc_sink_supported_input_bpcs(const u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_S 
	int num_bpc = 0;

	u8 color_depth = dsc_dpcd[DP_DSC_DEC_COLOR_DEPTH_CAP - DP_DSC_SUPPORT];



	if (!drm_dp_sink_supports_dsc(dsc_dpcd))

		return 0;



	if (color_depth & DP_DSC_12_BPC)

		dsc_bpc[num_bpc++] = 12;

	if (color_depth & DP_DSC_10_BPC)

		dsc_bpc[num_bpc++] = 10;

	if (color_depth & DP_DSC_8_BPC)



	/* A DP DSC Sink device shall support 8 bpc. */

	dsc_bpc[num_bpc++] = 8;



	return num_bpc;

drivers/gpu/drm/drm_connector.c

+10 −1
Original line number Diff line number Diff line
@@ -631,6 +631,10 @@ int drm_connector_register(struct drm_connector *connector) 
			goto err_debugfs;

	}



	ret = drm_sysfs_connector_add_late(connector);

	if (ret)

		goto err_late_register;



	drm_mode_object_register(connector->dev, &connector->base);



	connector->registration_state = DRM_CONNECTOR_REGISTERED;
@@ -647,6 +651,9 @@ int drm_connector_register(struct drm_connector *connector) 
	mutex_unlock(&connector_list_lock);

	goto unlock;



err_late_register:

	if (connector->funcs->early_unregister)

		connector->funcs->early_unregister(connector);

err_debugfs:

	drm_debugfs_connector_remove(connector);

	drm_sysfs_connector_remove(connector);
@@ -681,11 +688,13 @@ void drm_connector_unregister(struct drm_connector *connector) 
					connector->privacy_screen,

					&connector->privacy_screen_notifier);



	drm_sysfs_connector_remove_early(connector);



	if (connector->funcs->early_unregister)

		connector->funcs->early_unregister(connector);



	drm_sysfs_connector_remove(connector);

	drm_debugfs_connector_remove(connector);

	drm_sysfs_connector_remove(connector);



	connector->registration_state = DRM_CONNECTOR_UNREGISTERED;

	mutex_unlock(&connector->mutex);

drivers/gpu/drm/drm_edid.c

+20 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
 */



#include <linux/bitfield.h>

#include <linux/cec.h>

#include <linux/hdmi.h>

#include <linux/i2c.h>

#include <linux/kernel.h>
@@ -3110,7 +3111,7 @@ drm_monitor_supports_rb(const struct drm_edid *drm_edid) 
		return ret;

	}



	return ((drm_edid->edid->input & DRM_EDID_INPUT_DIGITAL) != 0);

	return drm_edid_is_digital(drm_edid);

}



static void
@@ -6200,6 +6201,8 @@ drm_parse_hdmi_vsdb_video(struct drm_connector *connector, const u8 *db) 


	info->is_hdmi = true;



	info->source_physical_address = (db[4] << 8) | db[5];



	if (len >= 6)

		info->dvi_dual = db[6] & 1;

	if (len >= 7)
@@ -6478,6 +6481,8 @@ static void drm_reset_display_info(struct drm_connector *connector) 
	info->vics_len = 0;



	info->quirks = 0;



	info->source_physical_address = CEC_PHYS_ADDR_INVALID;

}



static void update_displayid_info(struct drm_connector *connector,
@@ -6527,7 +6532,7 @@ static void update_display_info(struct drm_connector *connector, 
	if (edid->revision < 3)

		goto out;



	if (!(edid->input & DRM_EDID_INPUT_DIGITAL))

	if (!drm_edid_is_digital(drm_edid))

		goto out;



	info->color_formats |= DRM_COLOR_FORMAT_RGB444;
@@ -7343,3 +7348,16 @@ static void _drm_update_tile_info(struct drm_connector *connector, 
		connector->tile_group = NULL;

	}

}



/**

 * drm_edid_is_digital - is digital?

 * @drm_edid: The EDID

 *

 * Return true if input is digital.

 */

bool drm_edid_is_digital(const struct drm_edid *drm_edid)

{

	return drm_edid && drm_edid->edid &&

		drm_edid->edid->input & DRM_EDID_INPUT_DIGITAL;

}

EXPORT_SYMBOL(drm_edid_is_digital);

drivers/gpu/drm/drm_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ int drm_sysfs_init(void); 
void drm_sysfs_destroy(void);

struct device *drm_sysfs_minor_alloc(struct drm_minor *minor);

int drm_sysfs_connector_add(struct drm_connector *connector);

int drm_sysfs_connector_add_late(struct drm_connector *connector);

void drm_sysfs_connector_remove_early(struct drm_connector *connector);

void drm_sysfs_connector_remove(struct drm_connector *connector);



void drm_sysfs_lease_event(struct drm_device *dev);