Commit 6b76bf8f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-11-14' of... 

Merge tag 'drm-intel-fixes-2024-11-14' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Don't load GSC on ARL-H and ARL-U if too old FW
- Avoid potential OOPS in enabling/disabling TV output

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZzWksU6CMGLPfjkT@jlahtine-mobl.ger.corp.intel.com
parents 2d5404ca 67e023b9

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

+2 −2
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ intel_enable_tv(struct intel_atomic_state *state, 
		const struct intel_crtc_state *pipe_config,

		const struct drm_connector_state *conn_state)

{

	struct intel_display *display = to_intel_display(state);

	struct intel_display *display = to_intel_display(encoder);



	/* Prevents vblank waits from timing out in intel_tv_detect_type() */

	intel_crtc_wait_for_next_vblank(to_intel_crtc(pipe_config->uapi.crtc));
@@ -942,7 +942,7 @@ intel_disable_tv(struct intel_atomic_state *state, 
		 const struct intel_crtc_state *old_crtc_state,

		 const struct drm_connector_state *old_conn_state)

{

	struct intel_display *display = to_intel_display(state);

	struct intel_display *display = to_intel_display(encoder);



	intel_de_rmw(display, TV_CTL, TV_ENC_ENABLE, 0);

}

drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c

+32 −18
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ int intel_gsc_fw_get_binary_info(struct intel_uc_fw *gsc_fw, const void *data, s 
	const struct intel_gsc_cpd_header_v2 *cpd_header = NULL;

	const struct intel_gsc_cpd_entry *cpd_entry = NULL;

	const struct intel_gsc_manifest_header *manifest;

	struct intel_uc_fw_ver min_ver = { 0 };

	size_t min_size = sizeof(*layout);

	int i;
@@ -212,33 +213,46 @@ int intel_gsc_fw_get_binary_info(struct intel_uc_fw *gsc_fw, const void *data, s 
		}

	}



	if (IS_ARROWLAKE(gt->i915)) {

		bool too_old = false;



	/*

		 * ARL requires a newer firmware than MTL did (102.0.10.1878) but the

		 * firmware is actually common. So, need to do an explicit version check

		 * here rather than using a separate table entry. And if the older

		 * MTL-only version is found, then just don't use GSC rather than aborting

		 * the driver load.

	 * ARL SKUs require newer firmwares, but the blob is actually common

	 * across all MTL and ARL SKUs, so we need to do an explicit version check

	 * here rather than using a separate table entry. If a too old version

	 * is found, then just don't use GSC rather than aborting the driver load.

	 * Note that the major number in the GSC FW version is used to indicate

	 * the platform, so we expect it to always be 102 for MTL/ARL binaries.

	 */

		if (gsc->release.major < 102) {

	if (IS_ARROWLAKE_S(gt->i915))

		min_ver = (struct intel_uc_fw_ver){ 102, 0, 10, 1878 };

	else if (IS_ARROWLAKE_H(gt->i915) || IS_ARROWLAKE_U(gt->i915))

		min_ver = (struct intel_uc_fw_ver){ 102, 1, 15, 1926 };



	if (IS_METEORLAKE(gt->i915) && gsc->release.major != 102) {

		gt_info(gt, "Invalid GSC firmware for MTL/ARL, got %d.%d.%d.%d but need 102.x.x.x",

			gsc->release.major, gsc->release.minor,

			gsc->release.patch, gsc->release.build);

			return -EINVAL;

	}



	if (min_ver.major) {

		bool too_old = false;



		if (gsc->release.minor < min_ver.minor) {

			too_old = true;

		} else if (gsc->release.major == 102) {

			if (gsc->release.minor == 0) {

				if (gsc->release.patch < 10) {

		} else if (gsc->release.minor == min_ver.minor) {

			if (gsc->release.patch < min_ver.patch) {

				too_old = true;

				} else if (gsc->release.patch == 10) {

					if (gsc->release.build < 1878)

			} else if (gsc->release.patch == min_ver.patch) {

				if (gsc->release.build < min_ver.build)

					too_old = true;

			}

		}

		}



		if (too_old) {

			gt_info(gt, "GSC firmware too old for ARL, got %d.%d.%d.%d but need at least 102.0.10.1878",

			gt_info(gt, "GSC firmware too old for ARL, got %d.%d.%d.%d but need at least %d.%d.%d.%d",

				gsc->release.major, gsc->release.minor,

				gsc->release.patch, gsc->release.build);

				gsc->release.patch, gsc->release.build,

				min_ver.major, min_ver.minor,

				min_ver.patch, min_ver.build);

			return -EINVAL;

		}

	}

drivers/gpu/drm/i915/i915_drv.h

+6 −2
Original line number Diff line number Diff line
@@ -540,8 +540,12 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_LUNARLAKE(i915) (0 && i915)

#define IS_BATTLEMAGE(i915)  (0 && i915)



#define IS_ARROWLAKE(i915) \

	IS_SUBPLATFORM(i915, INTEL_METEORLAKE, INTEL_SUBPLATFORM_ARL)

#define IS_ARROWLAKE_H(i915) \

	IS_SUBPLATFORM(i915, INTEL_METEORLAKE, INTEL_SUBPLATFORM_ARL_H)

#define IS_ARROWLAKE_U(i915) \

	IS_SUBPLATFORM(i915, INTEL_METEORLAKE, INTEL_SUBPLATFORM_ARL_U)

#define IS_ARROWLAKE_S(i915) \

	IS_SUBPLATFORM(i915, INTEL_METEORLAKE, INTEL_SUBPLATFORM_ARL_S)

#define IS_DG2_G10(i915) \

	IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G10)

#define IS_DG2_G11(i915) \

drivers/gpu/drm/i915/intel_device_info.c

+19 −5
Original line number Diff line number Diff line
@@ -200,8 +200,16 @@ static const u16 subplatform_g12_ids[] = { 
	INTEL_DG2_G12_IDS(ID),

};



static const u16 subplatform_arl_ids[] = {

	INTEL_ARL_IDS(ID),

static const u16 subplatform_arl_h_ids[] = {

	INTEL_ARL_H_IDS(ID),

};



static const u16 subplatform_arl_u_ids[] = {

	INTEL_ARL_U_IDS(ID),

};



static const u16 subplatform_arl_s_ids[] = {

	INTEL_ARL_S_IDS(ID),

};



static bool find_devid(u16 id, const u16 *p, unsigned int num)
@@ -261,9 +269,15 @@ static void intel_device_info_subplatform_init(struct drm_i915_private *i915) 
	} else if (find_devid(devid, subplatform_g12_ids,

			      ARRAY_SIZE(subplatform_g12_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_G12);

	} else if (find_devid(devid, subplatform_arl_ids,

			      ARRAY_SIZE(subplatform_arl_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_ARL);

	} else if (find_devid(devid, subplatform_arl_h_ids,

			      ARRAY_SIZE(subplatform_arl_h_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_ARL_H);

	} else if (find_devid(devid, subplatform_arl_u_ids,

			      ARRAY_SIZE(subplatform_arl_u_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_ARL_U);

	} else if (find_devid(devid, subplatform_arl_s_ids,

			      ARRAY_SIZE(subplatform_arl_s_ids))) {

		mask = BIT(INTEL_SUBPLATFORM_ARL_S);

	}



	GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_MASK);

drivers/gpu/drm/i915/intel_device_info.h

+3 −1
Original line number Diff line number Diff line
@@ -128,7 +128,9 @@ enum intel_platform { 
#define INTEL_SUBPLATFORM_RPLU  2



/* MTL */

#define INTEL_SUBPLATFORM_ARL	0

#define INTEL_SUBPLATFORM_ARL_H	0

#define INTEL_SUBPLATFORM_ARL_U	1

#define INTEL_SUBPLATFORM_ARL_S	2



enum intel_ppgtt_type {

	INTEL_PPGTT_NONE = I915_GEM_PPGTT_NONE,