Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp294578yba; Wed, 3 Apr 2019 08:52:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqyR+kwBxtkuaauGvMdGkuhcQk/ku9frhcDZa7viwNNe0mdLiexLsmjLynZMz283RVTof+hc X-Received: by 2002:a63:4e10:: with SMTP id c16mr398353pgb.302.1554306757329; Wed, 03 Apr 2019 08:52:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554306757; cv=none; d=google.com; s=arc-20160816; b=nmprf3O/o3s6qPQA601KWZGT5l4DYCIwjzSuYWGrqj3DZMQ6QMmDGkhjJhbaAdJcED cABAV81ESBJOM6xkmDCUHXZwXronkjOi9BfbNC7wY8QFFERMY6o4wEpOdPkevITGCuat /2SmXpAmV6ZW5x44QW67AN0LdZIIB7i6FccJ3nHO8BFBdptDUFUtaONH0g1IBgGrKFJC ptjNxPuMV7AH4aenTdZSSoYfk/cXCE4hhCv/seebJipIDC2mPwwFJBd/6szFJfAeTHyA JHvXJ7pF6A+v8XMEFSbUXSEXGB+n+hd9d1iXdPZHFf1g3d+EWQeT27aEbnyaERPLDQRs ijXQ== 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=Q4+4YwCmxGLSTtAbudt3hj/SAyhbDK6oPyk8ZvD7bME=; b=x3OgidYoHG7HVIVYT5e4CiLfMBPF6Gu6hGN7l8yEDYxeUNRZMF1P5K+UMGCHDgvNX5 B7czC8eusjFbUXitQZatNF/auLKgCx1mW9tjDt6ZwXcJw7QXAOlUzFWl/dJeywsIfWqG k4Gnj8gfjOLe76cp1ccyJaBWqoL+l7Og8dt+JZNlHah1q8xId/niiKnKhXVnLFVxByqK H++gHErcApusIcmTbdb8ZL1nGarGE6wayhqN79KIeT3KMKFuFnOvZjpTAIoVc9qL7z7Y cFvK1ZsA/5E9L+7mw8eNXzEfbsfQFBf2eyzWq+/TL7DMC/bYrCJwRyWAYSfnN3pLsv5h /hLg== 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 i70si14221851pfj.236.2019.04.03.08.52.22; Wed, 03 Apr 2019 08:52:37 -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 S1727344AbfDCPuJ (ORCPT + 99 others); Wed, 3 Apr 2019 11:50:09 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:40205 "EHLO relay8-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726920AbfDCPuF (ORCPT ); Wed, 3 Apr 2019 11:50:05 -0400 X-Originating-IP: 90.88.30.125 Received: from localhost.localdomain (aaubervilliers-681-1-89-125.w90-88.abo.wanadoo.fr [90.88.30.125]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 30FF51BF210; Wed, 3 Apr 2019 15:50:01 +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 , Daniel Stone , Paul Kocialkowski Subject: [PATCH v4 3/4] drm/vc4: Check for the binner bo before handling OOM interrupt Date: Wed, 3 Apr 2019 17:48:55 +0200 Message-Id: <20190403154856.9470-4-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190403154856.9470-1-paul.kocialkowski@bootlin.com> References: <20190403154856.9470-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. The interrupt will kick again in due time, so we can safely ignore it without a binner bo allocated. 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