Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1861878yba; Thu, 25 Apr 2019 06:58:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxekoIwdealo/ITNOf2M727HJqhzSzOQQ+oW8zRyMxB/POV6a/v9iUHAcc/XBL3tkr6FnZ2 X-Received: by 2002:a65:6088:: with SMTP id t8mr37628001pgu.2.1556200696032; Thu, 25 Apr 2019 06:58:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556200696; cv=none; d=google.com; s=arc-20160816; b=yKUqxwmdp9InLU8SQQam56xuWvaQ5Akb/9kSLFR7RQdABE7sa5AZ92OPOtRdBtoSPi dZGQBjF9ghxhSPM/BphE5zfQzlQVzx18iMKRKd+zCW2oDE8UWT9QWHHupP0h6H6iLlOb O9pqbzPBksmInMatliHPGDUvqpFYxQrLAhGA9LTUZi6dIC5eQ5ZYsqNE1Gv68IPXQhPk 5NaHDlcIBQju4wuJA1uhSNv218qnw6Cka6pbfitVeJbPFwAZJIlArfHirtJ089q0XyHY aXcbfTPFpOIZ7ld1SZqOxSvzeuVPEnWTuHa4NEGMwJvRL7K+G5xFzGJ3U+8rP/7QyOzx pJLQ== 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=kW7rcjeKwJX3NHOgdVAMi0eAJWai2tkJRigZCr3+xGH2HEXxhWYoR5x2abyD6JvwAW 0n+wHWJLDWvX2vU+Wk/OHQoOFxKSjt2qAdVh2N3FV82b54idW5MHmpyS49ioGdtWI12y rU7bRrhCmT6meEkkar2IOiEBqHxKBArVuegPz4w2NtXnhCLGEKH1EsCumURBGGLUERHb ZBMy45ej/8+VfvNVlEWEQUE18n9pCkVm2sGmSbSXupFwhe7+9GDUNfmxLA8s/OdDk0qp IQ2ygfd58CG+ZpT8hfKRLvlG3vSzroGgXAjjE4QLu3rlkNkb0krn9cebOpcLrsTeBaJw D88w== 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 e6si15562907pga.251.2019.04.25.06.58.00; Thu, 25 Apr 2019 06:58:16 -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 S1727391AbfDYM35 (ORCPT + 99 others); Thu, 25 Apr 2019 08:29:57 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:43083 "EHLO relay1-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726067AbfDYM34 (ORCPT ); Thu, 25 Apr 2019 08:29:56 -0400 X-Originating-IP: 90.88.147.33 Received: from localhost.localdomain (aaubervilliers-681-1-27-33.w90-88.abo.wanadoo.fr [90.88.147.33]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 2545B240008; Thu, 25 Apr 2019 12:29:49 +0000 (UTC) From: Paul Kocialkowski To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Eric Anholt , David Airlie , Daniel Vetter , Maxime Ripard , Eben Upton , Paul Kocialkowski Subject: [PATCH v7 3/4] drm/vc4: Check for the binner bo before handling OOM interrupt Date: Thu, 25 Apr 2019 14:29:16 +0200 Message-Id: <20190425122917.26536-4-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190425122917.26536-1-paul.kocialkowski@bootlin.com> References: <20190425122917.26536-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