From 9a05c66feb0c3c7877999827ce70765c656338f1 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Fri, 9 Feb 2018 09:37:57 -0800 Subject: [PATCH] Revert "i965: prevent potentially null pointer access" This reverts commit 712332ed54f14b5ee34c2990e351ca48992488b2, which caused over 90k failures in Mesa i965 CI. Reviewed-by: Dylan Baker --- src/mesa/drivers/dri/i965/intel_screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 3f74ee7..1f866cf 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -315,7 +315,7 @@ modifier_is_supported(const struct gen_device_info *devinfo, int i; /* ISL had better know about the modifier */ - if (!fmt || !modinfo) + if (!modinfo) return false; if (modinfo->aux_usage == ISL_AUX_USAGE_CCS_E) { -- 2.7.4