From: Dave Airlie <airlied@redhat.com>
Date: Fri, 24 Jun 2022 02:07:36 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-2022-06-22' of git://anongit.freedesktop.org/drm/drm-intel... 
X-Git-Tag: v6.0-rc1~138^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=805ada63ba0567b15d10d40419bcc5e6f0b461e6;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'drm-intel-next-2022-06-22' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

- General driver clean-up (Jani, Ville, Julia)
- DG2 enabling (Anusha, Vandita)
- Fix sparse warnings (Imre, Jani)
- DMC MMIO range checks (Anusha)
- Audio related fixes (Jani)
- Runtime PM fixes (Anshuman)
- PSR fixes (Jouni, Jose)
- Media freq factor and per-gt enhancements (Ashutosh, Dale)
- DSI fixes for ICL+ (Jani)
- Disable DMC flip queue handlers (Imre)
- ADL_P voltage swing updates (Balasubramani)
- Use more the VBT for panel information (Ville, Animesh)
- Fix on Type-C ports with TBT mode (Vivek)
- Improve fastset and allow seamless M/N changes (Ville)
- Accept more fixed modes with VRR/DMRRS panels (Ville)
- FBC fix (Jose)
- Remove noise logs (Luca)
- Disable connector polling for a headless SKU (Jouni)
- Sanitize display underrun reporting (Ville)
- ADL-S display PLL w/a (Ville)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YrNzP2WTf3WBvpvd@intel.com
---

805ada63ba0567b15d10d40419bcc5e6f0b461e6
diff --cc drivers/gpu/drm/i915/gt/intel_rps.c
index 3476a11f294ce,ce61ceb071144..9b991df2cfbb4
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@@ -1138,15 -1095,13 +1138,16 @@@ static void gen6_rps_init(struct intel_
  	if (IS_HASWELL(i915) || IS_BROADWELL(i915) ||
  	    IS_GEN9_BC(i915) || GRAPHICS_VER(i915) >= 11) {
  		u32 ddcc_status = 0;
 +		u32 mult = 1;
  
 +		if (IS_GEN9_BC(i915) || GRAPHICS_VER(i915) >= 11)
 +			mult = GEN9_FREQ_SCALER;
- 		if (snb_pcode_read(i915, HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL,
+ 		if (snb_pcode_read(rps_to_gt(rps)->uncore,
+ 				   HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL,
  				   &ddcc_status, NULL) == 0)
  			rps->efficient_freq =
 -				clamp_t(u8,
 -					(ddcc_status >> 8) & 0xff,
 +				clamp_t(u32,
 +					((ddcc_status >> 8) & 0xff) * mult,
  					rps->min_freq,
  					rps->max_freq);
  	}
diff --cc drivers/gpu/drm/i915/i915_pci.c
index acf688b698c39,1e5c40f36798f..47b2a2631c5bd
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1052,8 -1051,8 +1053,9 @@@ static const struct intel_device_info x
  	.has_4tile = 1, \
  	.has_64k_pages = 1, \
  	.has_guc_deprivilege = 1, \
 +	.has_heci_pxp = 1, \
  	.needs_compact_pt = 1, \
+ 	.has_media_ratio_mode = 1, \
  	.platform_engine_mask = \
  		BIT(RCS0) | BIT(BCS0) | \
  		BIT(VECS0) | BIT(VECS1) | \