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

Commit c7fb3c6c authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Use sseu size for determining eu_regs[] 

eu_regs[] is written 2*max_slices times (like s_reg[]) but oddly read
2*max_slices + max_subslices/2 times. Allocate the array large enough
for the writes to avoid overwriting our stack and worry about the logic
later.

Fixes: 7aa0b14e ("drm/i915: Remove variable length arrays from sseu debugfs printers")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105479


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180313113149.1094-1-chris@chris-wilson.co.uk
parent c5c2b118

drivers/gpu/drm/i915/i915_debugfs.c

+6 −2
Original line number Diff line number Diff line
@@ -4345,8 +4345,9 @@ static void cherryview_sseu_device_status(struct drm_i915_private *dev_priv, 
static void gen10_sseu_device_status(struct drm_i915_private *dev_priv,

				     struct sseu_dev_info *sseu)

{

#define SS_MAX 6

	const struct intel_device_info *info = INTEL_INFO(dev_priv);

	u32 s_reg[6], eu_reg[2 * 4], eu_mask[2];

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	int s, ss;



	for (s = 0; s < info->sseu.max_slices; s++) {
@@ -4394,13 +4395,15 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, 
						      eu_cnt);

		}

	}

#undef SS_MAX

}



static void gen9_sseu_device_status(struct drm_i915_private *dev_priv,

				    struct sseu_dev_info *sseu)

{

#define SS_MAX 3

	const struct intel_device_info *info = INTEL_INFO(dev_priv);

	u32 s_reg[3], eu_reg[2 * 4], eu_mask[2];

	u32 s_reg[SS_MAX], eu_reg[2 * SS_MAX], eu_mask[2];

	int s, ss;



	for (s = 0; s < info->sseu.max_slices; s++) {
@@ -4448,6 +4451,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, 
						      eu_cnt);

		}

	}

#undef SS_MAX

}



static void broadwell_sseu_device_status(struct drm_i915_private *dev_priv,