From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.20 107/304] drm/v3d: Fix prime imports of buffers from other drivers. Date: Mon, 28 Jan 2019 10:40:24 -0500 Message-ID: <20190128154341.47195-107-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10A716E4ED for ; Mon, 28 Jan 2019 15:48:22 +0000 (UTC) In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogRXJpYyBBbmhvbHQgPGVyaWNAYW5ob2x0Lm5ldD4KClsgVXBzdHJlYW0gY29tbWl0IDYy ZDFhNzUyODc0OTYyZjA3MmRlOGE3NzllOTYwZmNkMmFiNDg0N2IgXQoKdjNkX2JvX2dldF9wYWdl cygpIGNoZWNrcyB0aGlzIHRvIGRlY2lkZSB0byBtYXAgdGhlIGltcG9ydGVkIGJ1ZmZlcgppbnN0 ZWFkIG9mIHRoZSBiYWNraW5nIHNobWVtIGZpbGUuICBUaGUgY2FsbGVyIHdhcyBhYm91dCB0byBz ZXQgdGhpcwp2YWx1ZSBhbnl3YXksIGFuZCB0aGVyZSdzIG5vIGVycm9yIHBhdGggaW4gYmV0d2Vl bi4gIElkZWFsbHkgd2UKd291bGRuJ3QgZXZlbiBhbGxvY2F0ZSB0aGUgc2htZW0gZmlsZSBmb3Ig b3VyIGltcG9ydHMsIGJ1dCB0aGF0J3MgYQptb3JlIGludmFzaXZlIGZpeC4KClNpZ25lZC1vZmYt Ynk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+CkZpeGVzOiA1NzY5MmM5NGRjYmUgKCJk cm0vdjNkOiBJbnRyb2R1Y2UgYSBuZXcgRFJNIGRyaXZlciBmb3IgQnJvYWRjb20gVjNEIFYzLngr IikKTGluazogaHR0cHM6Ly9wYXRjaHdvcmsuZnJlZWRlc2t0b3Aub3JnL3BhdGNoL21zZ2lkLzIw MTgxMTI4MjMwOTI3LjEwOTUxLTMtZXJpY0BhbmhvbHQubmV0CkFja2VkLWJ5OiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpSZXZpZXdlZC1ieTogRGF2ZSBFbWV0dCA8ZGF2 aWQuZW1ldHRAYnJvYWRjb20uY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFs QGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfYm8uYyB8IDEgKwogMSBm aWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3YzZC92M2RfYm8uYyBiL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNkX2JvLmMKaW5kZXggNTRkOTY1 MThhMTMxLi5hMDg3NjZkMzllYWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92M2QvdjNk X2JvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3YzZC92M2RfYm8uYwpAQCAtMjkzLDYgKzI5Myw3 IEBAIHYzZF9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAli by0+cmVzdiA9IGF0dGFjaC0+ZG1hYnVmLT5yZXN2OwogCiAJYm8tPnNndCA9IHNndDsKKwlvYmot PmltcG9ydF9hdHRhY2ggPSBhdHRhY2g7CiAJdjNkX2JvX2dldF9wYWdlcyhibyk7CiAKIAl2M2Rf bW11X2luc2VydF9wdGVzKGJvKTsKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72F61C282C8 for ; Mon, 28 Jan 2019 15:48:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42B8D20880 for ; Mon, 28 Jan 2019 15:48:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690505; bh=beHVS2Iu1Tzax3T2S2GlQfVdgWYSSvUUhhfJczYpivQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yi7wfbamTj8NY7BTQDBZBM8PJseyfWdDkkBXMk4JhdSCKaMnlY50ziaJ/9r7+LNIQ gQg8+PzTFo1ZnRUK9hc2mtuVn3M+/rzjH86RRk96noGkzYm16c19RuSJOxZ6K7NCpe Mk+TZQVSrswj457KbgYj5Fd9CitiWgUvUmy676+I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728500AbfA1PsX (ORCPT ); Mon, 28 Jan 2019 10:48:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:33764 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726919AbfA1PsW (ORCPT ); Mon, 28 Jan 2019 10:48:22 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C19862147A; Mon, 28 Jan 2019 15:48:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690502; bh=beHVS2Iu1Tzax3T2S2GlQfVdgWYSSvUUhhfJczYpivQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l6IccMmj4J2RSMmwxX6Ac9XjFshjL2oYrrBtPO2GdXKUZfkXWxsP71Nj3f8tJ1Lqy 9LGHrMD4X5n33g0napBn3xhyK5Omz9v12B7DlkPP7O7ieOCffKY5bhheHQm5RWaPpK CSo+5gbYJXbVUEUoFPWBq44TjIfAy8n5TAsFWb7g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Anholt , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.20 107/304] drm/v3d: Fix prime imports of buffers from other drivers. Date: Mon, 28 Jan 2019 10:40:24 -0500 Message-Id: <20190128154341.47195-107-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Anholt [ Upstream commit 62d1a752874962f072de8a779e960fcd2ab4847b ] v3d_bo_get_pages() checks this to decide to map the imported buffer instead of the backing shmem file. The caller was about to set this value anyway, and there's no error path in between. Ideally we wouldn't even allocate the shmem file for our imports, but that's a more invasive fix. Signed-off-by: Eric Anholt Fixes: 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") Link: https://patchwork.freedesktop.org/patch/msgid/20181128230927.10951-3-eric@anholt.net Acked-by: Daniel Vetter Reviewed-by: Dave Emett Signed-off-by: Sasha Levin --- drivers/gpu/drm/v3d/v3d_bo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/v3d/v3d_bo.c b/drivers/gpu/drm/v3d/v3d_bo.c index 54d96518a131..a08766d39eab 100644 --- a/drivers/gpu/drm/v3d/v3d_bo.c +++ b/drivers/gpu/drm/v3d/v3d_bo.c @@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev, bo->resv = attach->dmabuf->resv; bo->sgt = sgt; + obj->import_attach = attach; v3d_bo_get_pages(bo); v3d_mmu_insert_ptes(bo); -- 2.19.1