Commit c56b89f1 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Chris Wilson
Browse files

drm/i915: Use INTEL_GEN everywhere 



Coccinelle patch:

 @@
 identifier p;
 @@
 -INTEL_INFO(p)->gen
 +INTEL_GEN(p)

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180208130606.15556-12-tvrtko.ursulin@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180209215847.6660-1-chris@chris-wilson.co.uk
parent 6a20fe7b

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2801,7 +2801,7 @@ intel_info(const struct drm_i915_private *dev_priv) 


#define HAS_FW_BLC(dev_priv) 	(INTEL_GEN(dev_priv) > 2)

#define HAS_FBC(dev_priv)	((dev_priv)->info.has_fbc)

#define HAS_CUR_FBC(dev_priv)	(!HAS_GMCH_DISPLAY(dev_priv) && INTEL_INFO(dev_priv)->gen >= 7)

#define HAS_CUR_FBC(dev_priv)	(!HAS_GMCH_DISPLAY(dev_priv) && INTEL_GEN(dev_priv) >= 7)



#define HAS_IPS(dev_priv)	(IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv))

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -5424,10 +5424,10 @@ i915_gem_load_init_fences(struct drm_i915_private *dev_priv) 
{

	int i;



	if (INTEL_INFO(dev_priv)->gen >= 7 && !IS_VALLEYVIEW(dev_priv) &&

	if (INTEL_GEN(dev_priv) >= 7 && !IS_VALLEYVIEW(dev_priv) &&

	    !IS_CHERRYVIEW(dev_priv))

		dev_priv->num_fence_regs = 32;

	else if (INTEL_INFO(dev_priv)->gen >= 4 ||

	else if (INTEL_GEN(dev_priv) >= 4 ||

		 IS_I945G(dev_priv) || IS_I945GM(dev_priv) ||

		 IS_G33(dev_priv) || IS_PINEVIEW(dev_priv))

		dev_priv->num_fence_regs = 16;

drivers/gpu/drm/i915/i915_gem_fence_reg.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void i965_write_fence_reg(struct drm_i915_fence_reg *fence, 
	int fence_pitch_shift;

	u64 val;



	if (INTEL_INFO(fence->i915)->gen >= 6) {

	if (INTEL_GEN(fence->i915) >= 6) {

		fence_reg_lo = FENCE_REG_GEN6_LO(fence->id);

		fence_reg_hi = FENCE_REG_GEN6_HI(fence->id);

		fence_pitch_shift = GEN6_FENCE_PITCH_SHIFT;

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -2109,7 +2109,7 @@ static int __hw_ppgtt_init(struct i915_hw_ppgtt *ppgtt, 
	ppgtt->base.i915 = dev_priv;

	ppgtt->base.dma = &dev_priv->drm.pdev->dev;



	if (INTEL_INFO(dev_priv)->gen < 8)

	if (INTEL_GEN(dev_priv) < 8)

		return gen6_ppgtt_init(ppgtt);

	else

		return gen8_ppgtt_init(ppgtt);

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv) 
	reserved_base = 0;

	reserved_size = 0;



	switch (INTEL_INFO(dev_priv)->gen) {

	switch (INTEL_GEN(dev_priv)) {

	case 2:

	case 3:

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE