Commit bec8ff17 authored Jun 19, 2025 by Dave Airlie

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

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

 into drm-fixes

- Fix MIPI vtotal programming off by one on Broxton
- Fix PMU code for GCOV and AutoFDO enabled build

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://lore.kernel.org/r/aFJfykDpUwtmpilE@jlahtine-mobl

parents 49a5fdc0 c464ce6a

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1056,7 +1056,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,
		BXT_MIPI_TRANS_VACTIVE(port));
		adjusted_mode->crtc_vtotal =
		intel_de_read(display,
		BXT_MIPI_TRANS_VTOTAL(port));
		BXT_MIPI_TRANS_VTOTAL(port)) + 1;

		hactive = adjusted_mode->crtc_hdisplay;
		hfp = intel_de_read(display, MIPI_HFP_COUNT(display, port));
		@@ -1260,7 +1260,7 @@ static void set_dsi_timings(struct intel_encoder *encoder,
		intel_de_write(display, BXT_MIPI_TRANS_VACTIVE(port),
		adjusted_mode->crtc_vdisplay);
		intel_de_write(display, BXT_MIPI_TRANS_VTOTAL(port),
		adjusted_mode->crtc_vtotal);
		adjusted_mode->crtc_vtotal - 1);
		}

		intel_de_write(display, MIPI_HACTIVE_AREA_COUNT(display, port),

drivers/gpu/drm/i915/i915_pmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ static u32 config_mask(const u64 config)
		{
		unsigned int bit = config_bit(config);

		if (__builtin_constant_p(config))
		if (__builtin_constant_p(bit))
		BUILD_BUG_ON(bit >
		BITS_PER_TYPE(typeof_member(struct i915_pmu,
		enable)) - 1);
		@@ -121,7 +121,7 @@ static u32 config_mask(const u64 config)
		BITS_PER_TYPE(typeof_member(struct i915_pmu,
		enable)) - 1);

		return BIT(config_bit(config));
		return BIT(bit);
		}

		static bool is_engine_event(struct perf_event *event)