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

Commit 920a14b2 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make IS_CHERRYVIEW only take dev_priv 



Saves 864 bytes of .rodata strings and ~100 of .text.

v2: Add parantheses around dev_priv. (Ville Syrjala)
v3: Rebase.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 9beb5fea

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ intel_setup_mchbar(struct drm_device *dev) 
	u32 temp;

	bool enabled;



	if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))

	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		return;



	dev_priv->mchbar_need_disable = false;

drivers/gpu/drm/i915/i915_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -2656,7 +2656,7 @@ struct drm_i915_cmd_table { 
				 INTEL_DEVID(dev_priv) == 0x0152 || \

				 INTEL_DEVID(dev_priv) == 0x015a)

#define IS_VALLEYVIEW(dev)	(INTEL_INFO(dev)->is_valleyview)

#define IS_CHERRYVIEW(dev)	(INTEL_INFO(dev)->is_cherryview)

#define IS_CHERRYVIEW(dev_priv)	((dev_priv)->info.is_cherryview)

#define IS_HASWELL(dev_priv)	((dev_priv)->info.is_haswell)

#define IS_BROADWELL(dev_priv)	((dev_priv)->info.is_broadwell)

#define IS_SKYLAKE(dev_priv)	((dev_priv)->info.is_skylake)
@@ -3847,11 +3847,11 @@ __raw_write(64, q) 
#define INTEL_BROADCAST_RGB_FULL 1

#define INTEL_BROADCAST_RGB_LIMITED 2



static inline i915_reg_t i915_vgacntrl_reg(struct drm_device *dev)

static inline i915_reg_t i915_vgacntrl_reg(struct drm_i915_private *dev_priv)

{

	if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))

	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		return VLV_VGACNTRL;

	else if (INTEL_INFO(dev)->gen >= 5)

	else if (INTEL_GEN(dev_priv) >= 5)

		return CPU_VGACNTRL;

	else

		return VGACNTRL;

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -2135,7 +2135,7 @@ static void gtt_write_workarounds(struct drm_device *dev) 
	/* WaIncreaseDefaultTLBEntries:chv,bdw,skl,bxt */

	if (IS_BROADWELL(dev_priv))

		I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW);

	else if (IS_CHERRYVIEW(dev))

	else if (IS_CHERRYVIEW(dev_priv))

		I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_CHV);

	else if (IS_SKYLAKE(dev_priv))

		I915_WRITE(GEN8_L3_LRA_1_GPGPU, GEN9_L3_LRA_1_GPGPU_DEFAULT_VALUE_SKL);

drivers/gpu/drm/i915/intel_audio.c

+2 −2
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, 
		aud_config = IBX_AUD_CFG(pipe);

		aud_cntl_st = IBX_AUD_CNTL_ST(pipe);

		aud_cntrl_st2 = IBX_AUD_CNTL_ST2;

	} else if (IS_VALLEYVIEW(connector->dev) ||

		   IS_CHERRYVIEW(connector->dev)) {

	} else if (IS_VALLEYVIEW(dev_priv) ||

		   IS_CHERRYVIEW(dev_priv)) {

		hdmiw_hdmiedid = VLV_HDMIW_HDMIEDID(pipe);

		aud_config = VLV_AUD_CFG(pipe);

		aud_cntl_st = VLV_AUD_CNTL_ST(pipe);

drivers/gpu/drm/i915/intel_color.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ void intel_color_init(struct drm_crtc *crtc) 


	drm_mode_crtc_set_gamma_size(crtc, 256);



	if (IS_CHERRYVIEW(dev)) {

	if (IS_CHERRYVIEW(dev_priv)) {

		dev_priv->display.load_csc_matrix = cherryview_load_csc_matrix;

		dev_priv->display.load_luts = cherryview_load_luts;

	} else if (IS_HASWELL(dev_priv)) {