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

Commit fe48d8de authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Reject fence stride=0 on gen4+ 



Our checks for an invalid fence stride forgot to guard against
zero stride on gen4+. Fix it.

v2: Avoid duplicated code (danvet)

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a6f429a5

drivers/gpu/drm/i915/i915_gem_tiling.c

+3 −3
Original line number Diff line number Diff line
@@ -235,6 +235,9 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode) 
		}

	}



	if (stride < tile_width)

		return false;



	/* 965+ just needs multiples of tile width */

	if (INTEL_INFO(dev)->gen >= 4) {

		if (stride & (tile_width - 1))
@@ -243,9 +246,6 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode) 
	}



	/* Pre-965 needs power of two tile widths */

	if (stride < tile_width)

		return false;



	if (stride & (stride - 1))

		return false;