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

Commit 3c779a49 authored by Joonas Lahtinen's avatar Joonas Lahtinen
Browse files

drm/i915: Avoid BIT(max) - 1 and use GENMASK(max - 1, 0) 



"BIT(max) - 1" will overflow when max = 32, and GCC will complain.
We already have GENMASK for generating the mask, use it!

v2: Majestic off by one spotted (Chris)

Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 038c95a3

drivers/gpu/drm/i915/intel_device_info.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void broadwell_sseu_info_init(struct drm_i915_private *dev_priv) 
	 * The subslice disable field is global, i.e. it applies

	 * to each of the enabled slices.

	 */

	sseu->subslice_mask = BIT(ss_max) - 1;

	sseu->subslice_mask = GENMASK(ss_max - 1, 0);

	sseu->subslice_mask &= ~((fuse2 & GEN8_F2_SS_DIS_MASK) >>

				 GEN8_F2_SS_DIS_SHIFT);

drivers/gpu/drm/i915/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, 
		return false;



	memcpy(save_enabled, enabled, count);

	mask = BIT(count) - 1;

	mask = GENMASK(count - 1, 0);

	conn_configured = 0;

retry:

	for (i = 0; i < count; i++) {

drivers/gpu/drm/i915/intel_runtime_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv, 
	vlv_set_power_well(dev_priv, power_well, false);

}



#define POWER_DOMAIN_MASK (BIT(POWER_DOMAIN_NUM) - 1)

#define POWER_DOMAIN_MASK (GENMASK(POWER_DOMAIN_NUM - 1, 0))



static struct i915_power_well *lookup_power_well(struct drm_i915_private *dev_priv,

						 int power_well_id)