Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp308012yba; Fri, 3 May 2019 02:10:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqwhfzyyXSM/DHdrBp5EpxvMFMfLy1eIbjFo+WupiZzNj2qTW5JY/yueGCjDxSeAarn0y0Ji X-Received: by 2002:a63:5742:: with SMTP id h2mr8842537pgm.194.1556874656222; Fri, 03 May 2019 02:10:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556874656; cv=none; d=google.com; s=arc-20160816; b=LR3JF8XADWIGavqkxDu00YMlGY6iFtEvcAlbmIAIGoyDGm9pcNFir5hxfw1l7ECfTu lh036tQAUGQ5taAiEssQDmr7HG0bUSIzHI3WX+fC3Ib0KitKDHXehrQzr6Gve5FXvK61 JS7rnpLJZFOIqb1oEbMypBaS9J4R4T4aH/DHFsNvZDVJGl+AGa8fCe0bPLlWcx/PPc0G OkbFcSQJXmJOk7AsNq71819WMFeCKtyz/q8NWqI3jSOOnVOawDcvR3KA29q//Zbq9882 oIMp3ZCet9dP6L0Uy5K02cp3pI2ppfLsU0gCC13NC63n3cYtJEv3iGqtOJWbAGhcR9rD J6Ww== 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=zTYB01aUzaFhb+xxzx047e7+8jx1xPSh3nxelc/B1TVbCdk0keprZACHK+mGzWDpFD NhWZuG0QvSqPYoWlwB4R5Ldu4V8MzKsucwOgCJvJjDKp+RIrhWLxBmGuFUE2mVTgwQcr fbIvU/DtBooEYfWd9s69HMaY++TA55bTISaMUt734iw63wgx74B+FsaXF9Jq8lPw0DCX ZVsuPqbYbB6beb0LlZ85Jmy4Gohaw1YXUSHdbkwm3Fr8pje2pkujhBVDis1li68Sld7Q 7lblZMMnFR2CzCxvnlSI547XLxlpc2nCI+Gx3F/W5iNkVMb90ubHekMdkkMju3bFtVH2 fpWw== 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 o8si1583916pll.391.2019.05.03.02.10.39; Fri, 03 May 2019 02:10:56 -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 S1726789AbfECINP (ORCPT + 99 others); Fri, 3 May 2019 04:13:15 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:59221 "EHLO relay7-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725775AbfECINO (ORCPT ); Fri, 3 May 2019 04:13:14 -0400 X-Originating-IP: 90.88.149.145 Received: from localhost.localdomain (aaubervilliers-681-1-29-145.w90-88.abo.wanadoo.fr [90.88.149.145]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id F0DE020013; Fri, 3 May 2019 08:13:10 +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 , Thomas Petazzoni , Paul Kocialkowski Subject: [PATCH v8 3/4] drm/vc4: Check for the binner bo before handling OOM interrupt Date: Fri, 3 May 2019 10:12:41 +0200 Message-Id: <20190503081242.29039-4-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190503081242.29039-1-paul.kocialkowski@bootlin.com> References: <20190503081242.29039-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