Commit 9e783375 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915: Prefer IS_GEN<n> check with bitmask. 



Whenever possible we should stick with IS_GEN<n> checks.

Bitmaks has been introduced on commit ae7617f0 ("drm/i915:
Allow optimized platform checks") for efficiency.

Let's stick with it whenever possible.

This patch was generated with coccinelle:

spatch -sp_file is_gen.cocci *{c,h} --in-place

is_gen.cocci:
@gen2@ expression e; @@
-INTEL_GEN(e) == 2
+IS_GEN2(e)
@gen3@ expression e; @@
-INTEL_GEN(e) == 3
+IS_GEN3(e)
@gen4@ expression e; @@
-INTEL_GEN(e) == 4
+IS_GEN4(e)
@gen5@ expression e; @@
-INTEL_GEN(e) == 5
+IS_GEN5(e)
@gen6@ expression e; @@
-INTEL_GEN(e) == 6
+IS_GEN6(e)
@gen7@ expression e; @@
-INTEL_GEN(e) == 7
+IS_GEN7(e)
@gen8@ expression e; @@
-INTEL_GEN(e) == 8
+IS_GEN8(e)
@gen9@ expression e; @@
-INTEL_GEN(e) == 9
+IS_GEN9(e)
@gen10@ expression e; @@
-INTEL_GEN(e) == 10
+IS_GEN10(e)
@gen11@ expression e; @@
-INTEL_GEN(e) == 11
+IS_GEN11(e)

Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181026195143.20353-1-rodrigo.vivi@intel.com
parent 3ab0a6ed

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -1330,7 +1330,7 @@ intel_get_dram_info(struct drm_i915_private *dev_priv) 
	/* Need to calculate bandwidth only for Gen9 */

	if (IS_BROXTON(dev_priv))

		ret = bxt_get_dram_info(dev_priv);

	else if (INTEL_GEN(dev_priv) == 9)

	else if (IS_GEN9(dev_priv))

		ret = skl_get_dram_info(dev_priv);

	else

		ret = skl_dram_get_channels_info(dev_priv);

drivers/gpu/drm/i915/intel_atomic.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta 
	if (plane_state && plane_state->base.fb &&

	    plane_state->base.fb->format->is_yuv &&

	    plane_state->base.fb->format->num_planes > 1) {

		if (INTEL_GEN(dev_priv) == 9 &&

		if (IS_GEN9(dev_priv) &&

		    !IS_GEMINILAKE(dev_priv)) {

			mode = SKL_PS_SCALER_MODE_NV12;

		} else if (icl_is_hdr_plane(to_intel_plane(plane_state->base.plane))) {

drivers/gpu/drm/i915/intel_device_info.c

+3 −3
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info) 
	if (INTEL_GEN(dev_priv) >= 10) {

		for_each_pipe(dev_priv, pipe)

			info->num_scalers[pipe] = 2;

	} else if (INTEL_GEN(dev_priv) == 9) {

	} else if (IS_GEN9(dev_priv)) {

		info->num_scalers[PIPE_A] = 2;

		info->num_scalers[PIPE_B] = 2;

		info->num_scalers[PIPE_C] = 1;
@@ -847,9 +847,9 @@ void intel_device_info_runtime_init(struct intel_device_info *info) 
		cherryview_sseu_info_init(dev_priv);

	else if (IS_BROADWELL(dev_priv))

		broadwell_sseu_info_init(dev_priv);

	else if (INTEL_GEN(dev_priv) == 9)

	else if (IS_GEN9(dev_priv))

		gen9_sseu_info_init(dev_priv);

	else if (INTEL_GEN(dev_priv) == 10)

	else if (IS_GEN10(dev_priv))

		gen10_sseu_info_init(dev_priv);

	else if (INTEL_GEN(dev_priv) >= 11)

		gen11_sseu_info_init(dev_priv);

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -5238,7 +5238,7 @@ static bool needs_nv12_wa(struct drm_i915_private *dev_priv, 
	if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))

		return false;



	if ((INTEL_GEN(dev_priv) == 9 && !IS_GEMINILAKE(dev_priv)) ||

	if ((IS_GEN9(dev_priv) && !IS_GEMINILAKE(dev_priv)) ||

	    IS_CANNONLAKE(dev_priv))

		return true;

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) 
	if (INTEL_GEN(dev_priv) >= 10) {

		source_rates = cnl_rates;

		size = ARRAY_SIZE(cnl_rates);

		if (INTEL_GEN(dev_priv) == 10)

		if (IS_GEN10(dev_priv))

			max_rate = cnl_max_source_rate(intel_dp);

		else

			max_rate = icl_max_source_rate(intel_dp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE