From 4667c2d54cff89d6413a49f60c784a7d17d3e7a7 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 15 Nov 2017 13:17:05 +0000 Subject: [PATCH] drm/i915: Initialise entry in intel_ppat_get() for older compilers Mime-version: 1.0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: 8bit Git-commit: 4667c2d54cff89d6413a49f60c784a7d17d3e7a7 Patch-mainline: v4.16-rc1 References: FATE#322643 bsc#1055900 gcc-4.7.3 is confused by the guards inside intel_ppat_get() and reports: Drivers/gpu/drm/i915/i915_gem_gtt.c: In function ‘intel_ppat_get’: drivers/gpu/drm/i915/i915_gem_gtt.c:3044:27: warning: ‘entry’ may be used uninitialized in this function [-Wmaybe-uninitialized] Forgive the compiler this once, and rearrange the code so that entry is always initialised. V2: Flavour with a bit of NULL (instead of ERR_PTR(-ENOSPC)) Signed-off-by: Chris Wilson Cc: Joonas Lahtinen Cc: Zhi Wang Cc: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20171115131705.16341-1-chris@chris-wilson.co.uk Reviewed-by: Ville Syrjälä Acked-by: Takashi Iwai --- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -3076,7 +3076,7 @@ const struct intel_ppat_entry * intel_ppat_get(struct drm_i915_private *i915, u8 value) { struct intel_ppat *ppat = &i915->ppat; - struct intel_ppat_entry *entry; + struct intel_ppat_entry *entry = NULL; unsigned int scanned, best_score; int i; @@ -3099,7 +3099,7 @@ intel_ppat_get(struct drm_i915_private * } if (scanned == ppat->max_entries) { - if (!best_score) + if (!entry) return ERR_PTR(-ENOSPC); kref_get(&entry->ref);