diff options
| author | Joonas Lahtinen | 2017-02-08 14:12:09 +0100 |
|---|---|---|
| committer | Joonas Lahtinen | 2017-02-08 16:22:00 +0100 |
| commit | 3c779a49bd7ce6c9ecc35a679f28f94fe3cfaeab (patch) | |
| tree | a2db24065313d5907e5179baad66ab3ef5948d33 /drivers/gpu/drm/i915/intel_device_info.c | |
| parent | drm/i915: Always convert incoming exec offsets to non-canonical (diff) | |
| download | kernel-qcow2-linux-3c779a49bd7ce6c9ecc35a679f28f94fe3cfaeab.tar.gz kernel-qcow2-linux-3c779a49bd7ce6c9ecc35a679f28f94fe3cfaeab.tar.xz kernel-qcow2-linux-3c779a49bd7ce6c9ecc35a679f28f94fe3cfaeab.zip | |
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: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_device_info.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_device_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index fcf81815daff..0891cc0e8626 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -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); |