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

Merge tag 'drm-intel-fixes-2025-06-26' of... 

Merge tag 'drm-intel-fixes-2025-06-26' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Fix for SNPS PHY HDMI for 1080p@120Hz
- Correct DP AUX DPCD probe address
- Followup build fix for GCOV and AutoFDO enabled config

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://lore.kernel.org/r/aFzsHR9WLYsxg8jy@jlahtine-mobl
parents 06f6516e d02b2103

drivers/gpu/drm/display/drm_dp_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ ssize_t drm_dp_dpcd_read(struct drm_dp_aux *aux, unsigned int offset, 
	 * monitor doesn't power down exactly after the throw away read.

	 */

	if (!aux->is_remote) {

		ret = drm_dp_dpcd_probe(aux, DP_DPCD_REV);

		ret = drm_dp_dpcd_probe(aux, DP_LANE0_1_STATUS);

		if (ret < 0)

			return ret;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void get_ana_cp_int_prop(u64 vco_clk, 
			    DIV_ROUND_DOWN_ULL(curve_1_interpolated, CURVE0_MULTIPLIER)));



	ana_cp_int_temp =

		DIV_ROUND_CLOSEST_ULL(DIV_ROUND_DOWN_ULL(adjusted_vco_clk1, curve_2_scaled1),

		DIV64_U64_ROUND_CLOSEST(DIV_ROUND_DOWN_ULL(adjusted_vco_clk1, curve_2_scaled1),

					CURVE2_MULTIPLIER);



	*ana_cp_int = max(1, min(ana_cp_int_temp, 127));

drivers/gpu/drm/i915/i915_pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static unsigned int config_bit(const u64 config) 
		return other_bit(config);

}



static u32 config_mask(const u64 config)

static __always_inline u32 config_mask(const u64 config)

{

	unsigned int bit = config_bit(config);