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

Commit e3589908 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Consolidate FUSE_STRAP in one set of defines 



We had 2 set of defines for the same register, so make it one.

Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 22d3fd46

drivers/gpu/drm/i915/i915_reg.h

+8 −10
Original line number Diff line number Diff line
@@ -4110,12 +4110,13 @@ 
#define  ILK_ELPIN_409_SELECT	(1 << 25)

#define  ILK_DPARB_GATE	(1<<22)

#define  ILK_VSDPFD_FULL	(1<<21)

#define ILK_DISPLAY_CHICKEN_FUSES	0x42014

#define FUSE_STRAP			0x42014

#define  ILK_INTERNAL_GRAPHICS_DISABLE	(1 << 31)

#define  ILK_INTERNAL_DISPLAY_DISABLE	(1 << 30)

#define  ILK_DISPLAY_DEBUG_DISABLE	(1 << 29)

#define  ILK_HDCP_DISABLE		(1 << 25)

#define  ILK_eDP_A_DISABLE		(1 << 24)

#define  HSW_CDCLK_LIMIT		(1 << 24)

#define  ILK_DESKTOP			(1 << 23)



#define ILK_DSPCLK_GATE_D			0x42020
@@ -4179,9 +4180,6 @@ 
#define HSW_SCRATCH1				0xb038

#define  HSW_SCRATCH1_L3_DATA_ATOMICS_DISABLE	(1<<27)



#define HSW_FUSE_STRAP		0x42014

#define  HSW_CDCLK_LIMIT	(1 << 24)



/* PCH */



/* south display engine interrupt: IBX */

drivers/gpu/drm/i915/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -1415,7 +1415,7 @@ int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv) 


	if (lcpll & LCPLL_CD_SOURCE_FCLK) {

		return 800000;

	} else if (I915_READ(HSW_FUSE_STRAP) & HSW_CDCLK_LIMIT) {

	} else if (I915_READ(FUSE_STRAP) & HSW_CDCLK_LIMIT) {

		return 450000;

	} else if (freq == LCPLL_CLK_FREQ_450) {

		return 450000;

drivers/gpu/drm/i915/intel_display.c

+1 −2
Original line number Diff line number Diff line
@@ -10373,8 +10373,7 @@ static bool has_edp_a(struct drm_device *dev) 
	if ((I915_READ(DP_A) & DP_DETECTED) == 0)

		return false;



	if (IS_GEN5(dev) &&

	    (I915_READ(ILK_DISPLAY_CHICKEN_FUSES) & ILK_eDP_A_DISABLE))

	if (IS_GEN5(dev) && (I915_READ(FUSE_STRAP) & ILK_eDP_A_DISABLE))

		return false;



	return true;