Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp4109915yba; Tue, 7 May 2019 12:15:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqy8KWHYnSxsMwxo8hkzm7DkZ1w6DwECghE+tPVLHJEHaT2oLgyyJqqDrs/HIA71w/tZO1m1 X-Received: by 2002:a65:6659:: with SMTP id z25mr41204541pgv.10.1557256532702; Tue, 07 May 2019 12:15:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557256532; cv=none; d=google.com; s=arc-20160816; b=HbGVImzG0ifzZn/c3InTIevGmgFWdT7uXbLxtXwlzvBgM3LdeWjGqPcvd2iy2uDDA1 1ZOamG1F4Z/l8cHWNpt2FWEERtcbZf8g1Lw5hoEw74rZvG279bbeOUlFxglLu8LTQybV NqdnkH4G0agm30CPLBdlF7TAur1fY4S6CY2mnbkSt4BmqPtP4kbXG37zgE+/BWV4TiOM M0YcW7bFcmiagGUoW5fRJkbTlaE/ljtBgIt8JRW1oesYo1++VG6CrdpLIQPWwJkUZNHj Z97wXyKOpL+p+zDXDWeV9dV9JVnm5tI5tW2/sM7fE29pOaF4exoK2eizI8vgQ/4I/Ih7 ZUnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=9oSsOeNQVEv6b4Taw4s6HKhPKAX22GniTcJZIoQFo3Q=; b=wVxB53z9+euqvt8mkUTh+i2Fwmhe/jn7UUc6zA5Ni72I81qX1R9EWz88aoi8JIHZeH qA8jHneTc9wiKXCY5Uderw3oAXj+QqdA+BUx/lwjV8irkVkXUzpdYJeTTO1kQsz90ThW HmZN4uXyaUQ1JufP8LV2wGoGtJzA/xmimjeh7TP6w9QuBY4fETfB3Aq+lUgpozHHqO4f 5kq0ls+2GsQMs9ChG07mJ1025NCbrzd+DFiwuhhbEQ/2kj8mhkHTxYQlvxErkX1Hm+cd MRqz9vk+cPO5Dhi+6LK8iQHwuQAGewxUMnEABAzGg5oJodqMKzPfGnBXiQ8vHzGYcu06 8Atw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=R6OYhfE6; dkim=pass header.i=@codeaurora.org header.s=default header.b=lWdVLrBN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y7si22412459pfo.257.2019.05.07.12.15.16; Tue, 07 May 2019 12:15:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=R6OYhfE6; dkim=pass header.i=@codeaurora.org header.s=default header.b=lWdVLrBN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726713AbfEGTOR (ORCPT + 99 others); Tue, 7 May 2019 15:14:17 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:48626 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726642AbfEGTOQ (ORCPT ); Tue, 7 May 2019 15:14:16 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5940D609F3; Tue, 7 May 2019 19:14:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557256456; bh=fOdzMX7nkWBq97wocFIszly8aNfD4psiyZU/x1LQois=; h=From:To:Cc:Subject:Date:From; b=R6OYhfE6g8aa0cZBAnPiB/JFrOV0itf15UMPQ2zQpb1LcYcCqEnPUmXHP+q9q8X/k LOcJCXJzysFIo2NHBF/6jWN+MGz6AP4IJgE4H4WznlEjalc1ls6Wr8iUsuK01+VOdN 8Sb2mqcejGbeKAfbk0WhKQdKBNQnkojsZ148b6Mw= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from jcrouse1-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id F3D8C609F3; Tue, 7 May 2019 19:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557256455; bh=fOdzMX7nkWBq97wocFIszly8aNfD4psiyZU/x1LQois=; h=From:To:Cc:Subject:Date:From; b=lWdVLrBN2AlTjCxGhuxp6fugiuSz7j4xPZ5/SC/6JPZ8U8VBYDIfJQQ2CC9xVy0Wl Uxx2hU6ksXcgRdHfkc/HDBUMJyREpm1KoZLSbG8K/hPFGptuzRPc4PfVoNk5vrwWyW OSWFiOm9FHwznwXGv8ixPo8ZckrW1vBm4Qgmz4G8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org F3D8C609F3 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org From: Jordan Crouse To: freedreno@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, Sean Paul , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , Maarten Lankhorst , Maxime Ripard , Daniel Vetter Subject: [PATCH] drm/atomic: Check that the config funcs exist drm_mode_alloc Date: Tue, 7 May 2019 13:14:11 -0600 Message-Id: <1557256451-24950-1-git-send-email-jcrouse@codeaurora.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An error while initializing the msm driver ends up calling drm_atomic_helper_shutdown() without first initializing the funcs in mode_config. While I'm not 100% sure this isn't a ordering problem in msm adding a check to drm_mode_alloc seems like a nice and safe solution. Signed-off-by: Jordan Crouse --- drivers/gpu/drm/drm_atomic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 5eb4013..1729428 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -114,6 +114,9 @@ drm_atomic_state_alloc(struct drm_device *dev) { struct drm_mode_config *config = &dev->mode_config; + if (!config->funcs) + return NULL; + if (!config->funcs->atomic_state_alloc) { struct drm_atomic_state *state; -- 2.7.4