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

Merge tag 'drm-intel-next-2021-08-10-1' of... 

Merge tag 'drm-intel-next-2021-08-10-1' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

drm/i915 changes for v5.15:

Features:
- Basic DG2 platform enabling (Matt, Animesh, Gwan-gyeong, José)
- Add PSF GV point support for display bandwidth calculation (Stan)
- Add platform release id version support (Lucas)
- Add support for forcing DSC BPP for testing (Vandita, Patnana)

Refactoring and cleanups:
- Remove CNL support completely (Lucas)
- Revid/stepping cleanup (Matt, Anusha)
- Make display stepping check upper bounds exclusive (Matt)
- Remove old GEN macros (Lucas)
- Refactor DG1 interrupt handler (Paulo)
- Refactor DMC stepping info (Anusha)

Fixes:
- Fix XELPD color capability reporting; it's not yet enabled (Uma)
- Fix DG1 memory bandwidth computation (Clint)
- Fix mux on certain HP laptops (Kai-Heng)
- Various display workarounds (José, Matt, Imre)
- Fix error state dumps wrt SFC_DONE (Matt)
- Fix DG1 and XEPLD audio power domains (Anshuman)
- Fix ADL-P and ADL-S ddi buf translation tables (Matt)
- Fix DP/HDMI modeset sequences causing issues on ADL-P (José)
- PSR2 fixes (José)
- Fix DP MST modeset with FEC on TGL+
- Fix MBUS DBOX A credits on ADL-P (José)
- Fix DP PHY test training set programming (Khaled)
- Fix dgfx pcode uncore init done wait (Badal)
- Fix DSC disable fuse check on GLK (Lucas)
- Fix shared dpll mismatch for bigjoiner secondary pipe (Manasi)
- Fix ADL-P underrun recovery (Matt)
- Fix permissions on FEC support debugfs file (Vandita)

Misc:
- Backmerge drm-next (Rodrigo)
- Bump RKL and TGL DMC firmware version (Anusha)

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

# Conflicts:
#	drivers/gpu/drm/i915/i915_drv.h
#	drivers/gpu/drm/i915/intel_device_info.h
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87a6lpo1a9.fsf@intel.com
parents cb22f12f 3bfa7d40

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ i915-y += \ 
	display/intel_pps.o \

	display/intel_qp_tables.o \

	display/intel_sdvo.o \

	display/intel_snps_phy.o \

	display/intel_tv.o \

	display/intel_vdsc.o \

	display/intel_vrr.o \

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

+1 −1
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
	zpos = 0;

	drm_plane_create_zpos_immutable_property(&plane->base, zpos);



	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);

	intel_plane_helper_add(plane);



	return plane;

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

+19 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ static const guid_t intel_dsm_guid = 
	GUID_INIT(0x7ed873d3, 0xc2d0, 0x4e4f,

		  0xa8, 0x54, 0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c);



#define INTEL_DSM_FN_GET_BIOS_DATA_FUNCS_SUPPORTED 0 /* No args */



static const guid_t intel_dsm_guid2 =

	GUID_INIT(0x3e5b41c6, 0xeb1d, 0x4260,

		  0x9d, 0x15, 0xc7, 0x1f, 0xba, 0xda, 0xe4, 0x14);



static char *intel_dsm_port_name(u8 id)

{

	switch (id) {
@@ -176,6 +182,19 @@ void intel_unregister_dsm_handler(void) 
{

}



void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915)

{

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);

	acpi_handle dhandle;



	dhandle = ACPI_HANDLE(&pdev->dev);

	if (!dhandle)

		return;



	acpi_evaluate_dsm(dhandle, &intel_dsm_guid2, INTEL_DSM_REVISION_ID,

			  INTEL_DSM_FN_GET_BIOS_DATA_FUNCS_SUPPORTED, NULL);

}



/*

 * ACPI Specification, Revision 5.0, Appendix B.3.2 _DOD (Enumerate All Devices

 * Attached to the Display Adapter).

drivers/gpu/drm/i915/display/intel_acpi.h

+3 −0
Original line number Diff line number Diff line
@@ -11,11 +11,14 @@ struct drm_i915_private; 
#ifdef CONFIG_ACPI

void intel_register_dsm_handler(void);

void intel_unregister_dsm_handler(void);

void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915);

void intel_acpi_device_id_update(struct drm_i915_private *i915);

#else

static inline void intel_register_dsm_handler(void) { return; }

static inline void intel_unregister_dsm_handler(void) { return; }

static inline

void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915) { return; }

static inline

void intel_acpi_device_id_update(struct drm_i915_private *i915) { return; }

#endif /* CONFIG_ACPI */

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

+6 −1
Original line number Diff line number Diff line
@@ -601,7 +601,12 @@ int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state, 
	return 0;

}



const struct drm_plane_helper_funcs intel_plane_helper_funcs = {

static const struct drm_plane_helper_funcs intel_plane_helper_funcs = {

	.prepare_fb = intel_prepare_plane_fb,

	.cleanup_fb = intel_cleanup_plane_fb,

};



void intel_plane_helper_add(struct intel_plane *plane)

{

	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);

}