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

Commit 6e266956 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Make INTEL_PCH_TYPE & co only take dev_priv 



This saves 1872 bytes of .rodata strings.

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

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 4f8036a2

drivers/gpu/drm/i915/i915_drv.h

+8 −8
Original line number Diff line number Diff line
@@ -2846,18 +2846,18 @@ struct drm_i915_cmd_table { 
#define INTEL_PCH_P3X_DEVICE_ID_TYPE		0x7000

#define INTEL_PCH_QEMU_DEVICE_ID_TYPE		0x2900 /* qemu q35 has 2918 */



#define INTEL_PCH_TYPE(dev) (__I915__(dev)->pch_type)

#define HAS_PCH_KBP(dev) (INTEL_PCH_TYPE(dev) == PCH_KBP)

#define HAS_PCH_SPT(dev) (INTEL_PCH_TYPE(dev) == PCH_SPT)

#define HAS_PCH_LPT(dev) (INTEL_PCH_TYPE(dev) == PCH_LPT)

#define INTEL_PCH_TYPE(dev_priv) ((dev_priv)->pch_type)

#define HAS_PCH_KBP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_KBP)

#define HAS_PCH_SPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_SPT)

#define HAS_PCH_LPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_LPT)

#define HAS_PCH_LPT_LP(dev_priv) \

	((dev_priv)->pch_id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE)

#define HAS_PCH_LPT_H(dev_priv) \

	((dev_priv)->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE)

#define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT)

#define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX)

#define HAS_PCH_NOP(dev) (INTEL_PCH_TYPE(dev) == PCH_NOP)

#define HAS_PCH_SPLIT(dev) (INTEL_PCH_TYPE(dev) != PCH_NONE)

#define HAS_PCH_CPT(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_CPT)

#define HAS_PCH_IBX(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_IBX)

#define HAS_PCH_NOP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_NOP)

#define HAS_PCH_SPLIT(dev_priv) (INTEL_PCH_TYPE(dev_priv) != PCH_NONE)



#define HAS_GMCH_DISPLAY(dev) (INTEL_INFO(dev)->has_gmch_display)

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -4433,7 +4433,7 @@ i915_gem_init_hw(struct drm_device *dev) 
		I915_WRITE(MI_PREDICATE_RESULT_2, IS_HSW_GT3(dev) ?

			   LOWER_SLICE_ENABLED : LOWER_SLICE_DISABLED);



	if (HAS_PCH_NOP(dev)) {

	if (HAS_PCH_NOP(dev_priv)) {

		if (IS_IVYBRIDGE(dev)) {

			u32 temp = I915_READ(GEN7_MSG_CTL);

			temp &= ~(WAIT_FOR_PCH_FLR_ACK | WAIT_FOR_PCH_RESET_ACK);

drivers/gpu/drm/i915/i915_gpu_error.c

+2 −2
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, 
		for (i = 0; i < 4; i++)

			err_printf(m, "GTIER gt %d: 0x%08x\n", i,

				   error->gtier[i]);

	} else if (HAS_PCH_SPLIT(dev) || IS_VALLEYVIEW(dev))

	} else if (HAS_PCH_SPLIT(dev_priv) || IS_VALLEYVIEW(dev_priv))

		err_printf(m, "GTIER: 0x%08x\n", error->gtier[0]);

	err_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er);

	err_printf(m, "FORCEWAKE: 0x%08x\n", error->forcewake);
@@ -1468,7 +1468,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, 
		error->ier = I915_READ(GEN8_DE_MISC_IER);

		for (i = 0; i < 4; i++)

			error->gtier[i] = I915_READ(GEN8_GT_IER(i));

	} else if (HAS_PCH_SPLIT(dev)) {

	} else if (HAS_PCH_SPLIT(dev_priv)) {

		error->ier = I915_READ(DEIER);

		error->gtier[0] = I915_READ(GTIER);

	} else if (IS_GEN2(dev)) {

drivers/gpu/drm/i915/i915_irq.c

+10 −10
Original line number Diff line number Diff line
@@ -3234,12 +3234,12 @@ static void ibx_irq_reset(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = to_i915(dev);



	if (HAS_PCH_NOP(dev))

	if (HAS_PCH_NOP(dev_priv))

		return;



	GEN5_IRQ_RESET(SDE);



	if (HAS_PCH_CPT(dev) || HAS_PCH_LPT(dev))

	if (HAS_PCH_CPT(dev_priv) || HAS_PCH_LPT(dev_priv))

		I915_WRITE(SERR_INT, 0xffffffff);

}
@@ -3255,7 +3255,7 @@ static void ibx_irq_pre_postinstall(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = to_i915(dev);



	if (HAS_PCH_NOP(dev))

	if (HAS_PCH_NOP(dev_priv))

		return;



	WARN_ON(I915_READ(SDEIER) != 0);
@@ -3380,7 +3380,7 @@ static void gen8_irq_reset(struct drm_device *dev) 
	GEN5_IRQ_RESET(GEN8_DE_MISC_);

	GEN5_IRQ_RESET(GEN8_PCU_);



	if (HAS_PCH_SPLIT(dev))

	if (HAS_PCH_SPLIT(dev_priv))

		ibx_irq_reset(dev);

}
@@ -3569,10 +3569,10 @@ static void ibx_irq_postinstall(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = to_i915(dev);

	u32 mask;



	if (HAS_PCH_NOP(dev))

	if (HAS_PCH_NOP(dev_priv))

		return;



	if (HAS_PCH_IBX(dev))

	if (HAS_PCH_IBX(dev_priv))

		mask = SDE_GMBUS | SDE_AUX_MASK | SDE_POISON;

	else

		mask = SDE_GMBUS_CPT | SDE_AUX_MASK_CPT;
@@ -3793,13 +3793,13 @@ static int gen8_irq_postinstall(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = to_i915(dev);



	if (HAS_PCH_SPLIT(dev))

	if (HAS_PCH_SPLIT(dev_priv))

		ibx_irq_pre_postinstall(dev);



	gen8_gt_irq_postinstall(dev_priv);

	gen8_de_irq_postinstall(dev_priv);



	if (HAS_PCH_SPLIT(dev))

	if (HAS_PCH_SPLIT(dev_priv))

		ibx_irq_postinstall(dev);



	I915_WRITE(GEN8_MASTER_IRQ, GEN8_MASTER_IRQ_CONTROL);
@@ -4596,11 +4596,11 @@ void intel_irq_init(struct drm_i915_private *dev_priv) 
		dev->driver->disable_vblank = gen8_disable_vblank;

		if (IS_BROXTON(dev))

			dev_priv->display.hpd_irq_setup = bxt_hpd_irq_setup;

		else if (HAS_PCH_SPT(dev) || HAS_PCH_KBP(dev))

		else if (HAS_PCH_SPT(dev_priv) || HAS_PCH_KBP(dev_priv))

			dev_priv->display.hpd_irq_setup = spt_hpd_irq_setup;

		else

			dev_priv->display.hpd_irq_setup = ilk_hpd_irq_setup;

	} else if (HAS_PCH_SPLIT(dev)) {

	} else if (HAS_PCH_SPLIT(dev_priv)) {

		dev->driver->irq_handler = ironlake_irq_handler;

		dev->driver->irq_preinstall = ironlake_irq_reset;

		dev->driver->irq_postinstall = ironlake_irq_postinstall;

drivers/gpu/drm/i915/intel_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, 
	 * infrastructure is not there yet.

	 */



	if (HAS_PCH_IBX(connector->dev)) {

	if (HAS_PCH_IBX(dev_priv)) {

		hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID(pipe);

		aud_config = IBX_AUD_CFG(pipe);

		aud_cntl_st = IBX_AUD_CNTL_ST(pipe);