Commit 0d9f0ee1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2022-03-03' of... 

Merge tag 'drm-intel-fixes-2022-03-03' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix GuC SLPC unset command. (Vinay Belgaumkar)
- Fix misidentification of some Apple MacBook Pro laptops as Jasper Lake. (Ville Syrjälä)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YiCXHiTyCE7TbopG@tursulin-mobl2
parents e7c470a4 08783aa7

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

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int guc_action_slpc_unset_param(struct intel_guc *guc, u8 id) 
{

	u32 request[] = {

		GUC_ACTION_HOST2GUC_PC_SLPC_REQUEST,

		SLPC_EVENT(SLPC_EVENT_PARAMETER_UNSET, 2),

		SLPC_EVENT(SLPC_EVENT_PARAMETER_UNSET, 1),

		id,

	};

drivers/gpu/drm/i915/intel_pch.c

+1 −1
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
		/* Comet Lake V PCH is based on KBP, which is SPT compatible */

		return PCH_SPT;

	case INTEL_PCH_ICP_DEVICE_ID_TYPE:

	case INTEL_PCH_ICP2_DEVICE_ID_TYPE:

		drm_dbg_kms(&dev_priv->drm, "Found Ice Lake PCH\n");

		drm_WARN_ON(&dev_priv->drm, !IS_ICELAKE(dev_priv));

		return PCH_ICP;
@@ -123,7 +124,6 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) 
			    !IS_GEN9_BC(dev_priv));

		return PCH_TGP;

	case INTEL_PCH_JSP_DEVICE_ID_TYPE:

	case INTEL_PCH_JSP2_DEVICE_ID_TYPE:

		drm_dbg_kms(&dev_priv->drm, "Found Jasper Lake PCH\n");

		drm_WARN_ON(&dev_priv->drm, !IS_JSL_EHL(dev_priv));

		return PCH_JSP;

drivers/gpu/drm/i915/intel_pch.h

+1 −1
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ enum intel_pch { 
#define INTEL_PCH_CMP2_DEVICE_ID_TYPE		0x0680

#define INTEL_PCH_CMP_V_DEVICE_ID_TYPE		0xA380

#define INTEL_PCH_ICP_DEVICE_ID_TYPE		0x3480

#define INTEL_PCH_ICP2_DEVICE_ID_TYPE		0x3880

#define INTEL_PCH_MCC_DEVICE_ID_TYPE		0x4B00

#define INTEL_PCH_TGP_DEVICE_ID_TYPE		0xA080

#define INTEL_PCH_TGP2_DEVICE_ID_TYPE		0x4380

#define INTEL_PCH_JSP_DEVICE_ID_TYPE		0x4D80

#define INTEL_PCH_JSP2_DEVICE_ID_TYPE		0x3880

#define INTEL_PCH_ADP_DEVICE_ID_TYPE		0x7A80

#define INTEL_PCH_ADP2_DEVICE_ID_TYPE		0x5180

#define INTEL_PCH_ADP3_DEVICE_ID_TYPE		0x7A00