Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2130042yba; Mon, 15 Apr 2019 05:40:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqzP6SiX70JAkFlov3z2cw6furmmydnJFsheET1w230ch8WKvjbMAuXMZWO62GA9sU0oGA+B X-Received: by 2002:a63:3287:: with SMTP id y129mr69778794pgy.9.1555332030159; Mon, 15 Apr 2019 05:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555332030; cv=none; d=google.com; s=arc-20160816; b=kNO6sF13aksAOF6W+BXmAwejsvrfrotNURl5hzFZkDNpexQi3QdsosTDOOueSYqVoT TzPK1SllR+rjBn3GuH/EaYpFWkUJwknav5krl8hgNd6y7n6yBMOVThABGMtzOV0G9DXU NknajcDzO0cNmKWjObTugvI6EVJ1TcYOnfpN6oQYqtp4J+sMTsvsV6mHN2aDbjr+4AKh DG+gM3igDxWfCRqb3dY+FKkbeL1V9cSvPmM60Y1kHgWWsp2TgTs1ck/A8s/uvgQrjoHF HDnNtBLQEPqp48R1gbD3gr3OQlcZbgTKePij7yQ6ZDKqpnX9Nx0Tf/pYPk3MtPvfR877 Tp5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=6eXqejpQsCx0DorZdtVFQXdIbEz7LBGp2CFSlIOTqJw=; b=EySQjZ6ck400R60cW5WyivOP4Z9zggdHxRj7+GiXppIenxPtvgqYTUplCgoKa3uEyy qEfNVrQe9jNh5iMqoM2Sg8gCtRv0v1NNP96hnkMCQL5aOYse6eh8SPbBRMIAHFZ53BcW a6hJ9OuUNm7CgNs9skum4ApaTtZ8HirgRDQIn5rkG22iAvKB2dQ//su2mEVyWt0RQc4i ku3SgIUJiHbdSLTXTkYgJ7oWBbET+fvpy5COjgvl9bwh4n2x0+5n3C0vucInww+ofBJf 1zNt5SjdmyyFZnklKVgjvaj9JuB/r+RRX9Q2YTWGRwS/SANAVWcKy8ag/YdoCPHx9PiT eXJw== ARC-Authentication-Results: i=1; mx.google.com; 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 d18si42997940pgo.525.2019.04.15.05.40.14; Mon, 15 Apr 2019 05:40:30 -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; 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 S1727542AbfDOMjY (ORCPT + 99 others); Mon, 15 Apr 2019 08:39:24 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:32951 "EHLO relay5-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727486AbfDOMjV (ORCPT ); Mon, 15 Apr 2019 08:39:21 -0400 X-Originating-IP: 90.88.18.121 Received: from localhost.localdomain (aaubervilliers-681-1-63-121.w90-88.abo.wanadoo.fr [90.88.18.121]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 4A0DD1C000B; Mon, 15 Apr 2019 12:39:18 +0000 (UTC) From: Paul Kocialkowski To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Eric Anholt , David Airlie , Daniel Vetter , Thomas Petazzoni , Maxime Ripard , Eben Upton , Paul Kocialkowski Subject: [PATCH v5 3/4] drm/vc4: Check for the binner bo before handling OOM interrupt Date: Mon, 15 Apr 2019 14:39:07 +0200 Message-Id: <20190415123908.28986-4-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415123908.28986-1-paul.kocialkowski@bootlin.com> References: <20190415123908.28986-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since the OOM interrupt directly deals with the binner bo, it doesn't make sense to try and handle it without a binner buffer registered. Signed-off-by: Paul Kocialkowski --- drivers/gpu/drm/vc4/vc4_irq.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index ffd0a4388752..723dc86b4511 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -64,6 +64,9 @@ vc4_overflow_mem_work(struct work_struct *work) struct vc4_exec_info *exec; unsigned long irqflags; + if (!bo) + return; + bin_bo_slot = vc4_v3d_get_bin_slot(vc4); if (bin_bo_slot < 0) { DRM_ERROR("Couldn't allocate binner overflow mem\n"); -- 2.21.0