Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp295128yba; Wed, 3 Apr 2019 08:53:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7/8MNHTeeesG+80kPceX9S/oGpZcsDKqa/kETdrj4RF6MFfW+l0tjq0sqd4HgBfPSumi5 X-Received: by 2002:a17:902:6b03:: with SMTP id o3mr697733plk.226.1554306800294; Wed, 03 Apr 2019 08:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554306800; cv=none; d=google.com; s=arc-20160816; b=HWZQa1Q+y9Ihr1g/Vj3zW23Z7a1fzcUPrZa31bLrDjxNQialj3ubwoGuHO4Ygny+QI NmlrLgCSKLtNreRRwNb8xPGELAwvb5o/EWiqVwtdZKTQCn+1qcbsiwS1skJ5Avv1+qAV dQw8pCxQgrPLbxYvBzrcrHyWlDpr3WYy3Foc+sV0hM4TIIJP2gHfgbutlGqqbKAd6ucL X38cswybj/wKP84V+aHLq09/5q2DHB+MLa/LO4y0JHgoh0gpuWoqci/2JcCGMuCe97Rj I/6bGX09YLLAbbu3aEmTRwOkQ1YRWvqufudXZnGj6S36VwE8FA658ZjnqEMN3Duewe/U 3RZg== 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=mde2upctbZNGR55oeYE5jDG64NgCPD9Yv/7G4N8pzKQ=; b=mjA0T+aya/7wFWmm5yIIBDMqokra4zxrg/3MJQCI39ROJCBJpmui4WUlcd/NhCuCav zDrphdzAAh9YN4yYsiEYwUysxVufnE94nxD/WfJX0X4c/D37UlNrzQX+IQ/r2Fq8ED37 qBFAKiWEMQ0IpPhZhWGAjrQf2QzS4tSsYgrva3VamHqRLr+T9YYcHGNhX5ue2K1tvaA0 8Zae8KRERB5rphrqIQW5hGPsmVqhFtti/PmkbmkTF+SUkVsCK7S1mSXcN28mCwfDcNd0 Z3cC+YK2CIrgtqSIc7Cb/awUSin6Rgm13uaJiG6pV+4SydHZ4R1cLTlzOGjVcnZZB5BM QKPQ== 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 a9si14213095pfc.46.2019.04.03.08.53.05; Wed, 03 Apr 2019 08:53:20 -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 S1726867AbfDCPvx (ORCPT + 99 others); Wed, 3 Apr 2019 11:51:53 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:52157 "EHLO relay8-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726756AbfDCPuD (ORCPT ); Wed, 3 Apr 2019 11:50:03 -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 471B81BF20E; Wed, 3 Apr 2019 15:50:00 +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 2/4] drm/vc4: Check for V3D before binner bo alloc Date: Wed, 3 Apr 2019 17:48:54 +0200 Message-Id: <20190403154856.9470-3-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 Check that we have a V3D device registered before attempting to allocate a binner buffer object. Signed-off-by: Paul Kocialkowski --- drivers/gpu/drm/vc4/vc4_drv.h | 1 + drivers/gpu/drm/vc4/vc4_v3d.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index e61734af059b..37941f0e212a 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -833,6 +833,7 @@ void vc4_plane_async_set_fb(struct drm_plane *plane, extern struct platform_driver vc4_v3d_driver; extern const struct of_device_id vc4_v3d_dt_match[]; int vc4_v3d_get_bin_slot(struct vc4_dev *vc4); +int vc4_v3d_allocate_bin_bo(struct vc4_dev *vc4); int vc4_v3d_pm_get(struct vc4_dev *vc4); void vc4_v3d_pm_put(struct vc4_dev *vc4); diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c index fe091256800d..70204c38074a 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -241,6 +241,9 @@ int vc4_v3d_allocate_bin_bo(struct vc4_dev *vc4) int ret = 0; struct list_head list; + if (!v3d) + return -ENODEV; + /* We may need to try allocating more than once to get a BO * that doesn't cross 256MB. Track the ones we've allocated * that failed so far, so that we can free them when we've got -- 2.21.0