Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 254e0931 authored by Michel Thierry's avatar Michel Thierry Committed by Ander Conselvan de Oliveira
Browse files

drm/i915/glk: Convert a few more IS_BROXTON() to IS_GEN9_LP() 



Commit cc3f90f0 ("drm/i915/glk: Reuse broxton code for geminilake")
missed a few of occurences of IS_BROXTON() that should have been
coverted to IS_GEN9_LP().

v2: Cite the right commit. (Ander)

Fixes: cc3f90f0 ("drm/i915/glk: Reuse broxton code for geminilake")
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Signed-off-by: default avatarTomasz Lis <tomasz.lis@intel.com>
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Tomasz Lis <tomasz.lis@intel.com> (v1)
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1483973495-15138-1-git-send-email-ander.conselvan.de.oliveira@intel.com
parent b9fd799e

drivers/gpu/drm/i915/i915_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static u32 calc_residency(struct drm_i915_private *dev_priv, 


		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)

			units <<= 8;

	} else if (IS_BROXTON(dev_priv)) {

	} else if (IS_GEN9_LP(dev_priv)) {

		units = 1;

		div = 1200;		/* 833.33ns */

	}

drivers/gpu/drm/i915/intel_device_info.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void gen9_sseu_info_init(struct drm_i915_private *dev_priv) 
		(IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) &&

		hweight8(sseu->slice_mask) > 1;

	sseu->has_subslice_pg =

		IS_BROXTON(dev_priv) && sseu_subslice_total(sseu) > 1;

		IS_GEN9_LP(dev_priv) && sseu_subslice_total(sseu) > 1;

	sseu->has_eu_pg = sseu->eu_per_subslice > 2;



	if (IS_BROXTON(dev_priv)) {

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -3412,7 +3412,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp) 
	if (HAS_DDI(dev_priv)) {

		signal_levels = ddi_signal_levels(intel_dp);



		if (IS_BROXTON(dev_priv))

		if (IS_GEN9_LP(dev_priv))

			signal_levels = 0;

		else

			mask = DDI_BUF_EMP_MASK;

drivers/gpu/drm/i915/intel_guc_loader.c

+2 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv) 
	u32 wopcm_size = GUC_WOPCM_TOP;



	/* On BXT, the top of WOPCM is reserved for RC6 context */

	if (IS_BROXTON(dev_priv))

	if (IS_GEN9_LP(dev_priv))

		wopcm_size -= BXT_GUC_WOPCM_RC6_RESERVED;



	return wopcm_size;
@@ -388,7 +388,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv) 
	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_B0))

		I915_WRITE(GEN6_GFXPAUSE, 0x30FFF);



	if (IS_BROXTON(dev_priv))

	if (IS_GEN9_LP(dev_priv))

		I915_WRITE(GEN9LP_GT_PM_CONFIG, GT_DOORBELL_ENABLE);

	else

		I915_WRITE(GEN9_GT_PM_CONFIG, GT_DOORBELL_ENABLE);