From patchwork Mon Jan 22 18:10:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jordan Crouse X-Patchwork-Id: 10179017 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0BCCB601D5 for ; Mon, 22 Jan 2018 18:11:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04C0228464 for ; Mon, 22 Jan 2018 18:11:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED78C2846C; Mon, 22 Jan 2018 18:11:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8CA5628464 for ; Mon, 22 Jan 2018 18:11:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD9166E295; Mon, 22 Jan 2018 18:10:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB06D6E28F; Mon, 22 Jan 2018 18:10:53 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9D5F960A63; Mon, 22 Jan 2018 18:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516644653; bh=5NzMuQ3FQJmlQDJrE7ZG1jts6iG4yGk+HkR0oH0p+m0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfCgHtSWO8XrBP/FLM3Bd9A7AbDBleGSkb43IVazGQgbcbyz4kKR3ZH6I3YHYrAHQ tK8MUdMPUMD6+FAJdKtIrWEGqvxdKDJjsiXP7HH9DuFLmX4ctHLtSSwaqR1ACrZyqN NLMmHW/abqwdsPfZFHwtRp7eME84ucZ7WGpVQHQY= Received: from jcrouse-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 0579560A08; Mon, 22 Jan 2018 18:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1516644653; bh=5NzMuQ3FQJmlQDJrE7ZG1jts6iG4yGk+HkR0oH0p+m0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfCgHtSWO8XrBP/FLM3Bd9A7AbDBleGSkb43IVazGQgbcbyz4kKR3ZH6I3YHYrAHQ tK8MUdMPUMD6+FAJdKtIrWEGqvxdKDJjsiXP7HH9DuFLmX4ctHLtSSwaqR1ACrZyqN NLMmHW/abqwdsPfZFHwtRp7eME84ucZ7WGpVQHQY= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 0579560A08 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org From: Jordan Crouse To: freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 4/5] drm/msm: Pass the correct aperture end to drm_mm_init Date: Mon, 22 Jan 2018 11:10:46 -0700 Message-Id: <1516644647-7507-5-git-send-email-jcrouse@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516644647-7507-1-git-send-email-jcrouse@codeaurora.org> References: <1516644647-7507-1-git-send-email-jcrouse@codeaurora.org> Cc: linux-arm-msm@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_mm_init() takes the start and length of the intended virtual memory address region but the msm code is passing the end of the region instead. That would work out if the region started at 0 but it doesn't so the top of the region sneaks above the 32 bit boundary which won't work because the driver doesn't support 64 bit addresses for the GPU yet. Signed-off-by: Jordan Crouse --- drivers/gpu/drm/msm/msm_gem_vma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c index d34e331..ffbec22 100644 --- a/drivers/gpu/drm/msm/msm_gem_vma.c +++ b/drivers/gpu/drm/msm/msm_gem_vma.c @@ -96,6 +96,8 @@ struct msm_gem_address_space * const char *name) { struct msm_gem_address_space *aspace; + u64 size = domain->geometry.aperture_end - + domain->geometry.aperture_start; aspace = kzalloc(sizeof(*aspace), GFP_KERNEL); if (!aspace) @@ -106,7 +108,7 @@ struct msm_gem_address_space * aspace->mmu = msm_iommu_new(dev, domain); drm_mm_init(&aspace->mm, (domain->geometry.aperture_start >> PAGE_SHIFT), - (domain->geometry.aperture_end >> PAGE_SHIFT) - 1); + size >> PAGE_SHIFT); kref_init(&aspace->kref);