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=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 DC84CC00454 for ; Mon, 9 Dec 2019 20:14:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F1412068E for ; Mon, 9 Dec 2019 20:14:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S4PbTFYD"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="i+oqJhwO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F1412068E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+TYOO0LMaX+OG0ITsRCodHx45MLASBhoUpGMkQ8aFO0=; b=S4PbTFYDeHLC5w b4ODD5209QFpREZdC6+knoQvh0tNHVFxHo2afpjBgbTGP713/jHeLmywAYEdgQAioKjWwMVELVbv0 HilPiICwTx7d3vea0Y/7xyiLArWcQGos929TPaAz+7Y46edl1GcVFlKmBgEFU/R5P/8YlW9WrJsBy hlWduAh8BnII8cLQCgokxCNn8vLWZ9b98vRHx2KvG/q0Et6rSscB/0+VhjOhSeY6F+wknkuqoIx9D dAXTy5cVYdOUUFqBHlzCsCPUNmK58jhs46gBkRR58W5V16Yq0eIL4yBpNYAbhCL65CVBP1CO2mRds xsZ3JG0GZuyCbkbCbL4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iePQF-0000zg-Qs; Mon, 09 Dec 2019 20:14:23 +0000 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iePQC-0000zD-LL for linux-arm-kernel@lists.infradead.org; Mon, 09 Dec 2019 20:14:22 +0000 Received: by mail-ed1-x543.google.com with SMTP id c26so13843276eds.8 for ; Mon, 09 Dec 2019 12:14:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ywh/fPF8YzV1CmuZ62hC+sb8SV7PDn0YD92J60m8Z5M=; b=i+oqJhwOCqolWGBm00Kb49q5F64UWzI4eKGPOYSg82c77Vcdy6MUKcUvq221GTIz+Y UNZAZVriHXUTQMby8Ri8wlpb6vsz13OBffGka5hubzb1+7hly/pgr0P8fA+PHuaGqZAH oYYGOWx1X4xP91ed1+nvJ8sEaxcec6AWEMcBpZjq9e78oCtTSAC2i6zzL+2hvmq6GVA0 o0ZOVBJLNkNVhl48ndCk2TWWRzfDGckM7hwbd4fEk1+iWJrZmf/moO0nBEADNffU9oG4 CUxvRsITqNEf0gHOUb7zGqEj21+5CwCLsIpaL5wVHjwdhH1DD7Kv+EsCSr+4lU/uaHZS LFmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ywh/fPF8YzV1CmuZ62hC+sb8SV7PDn0YD92J60m8Z5M=; b=fFyw5nEi58nfpAYWLSxPEgCjFnJrQr8xK8DXFd0U7N72olQpZFvEvHhhOdUa28CSMa xkiMIpGz1d4lxh49823J/o/M3XyX4GPs84XinGC9vpp+mC1Bko2c1HyGW8U+2dPWY5HC 0OnWabOKNScUOciEeZLlTbvMFq9UDxqyVicyTg4mptc+ApWeSuNuWIPBIG66gcF+2yrg BPy3Tk6+rj6ucvbCnoN7Ro5wcTRmi3XlZ083n1vCrQsTorkawqz9O4e8E+jIz7O1X/+z +1kRW4x4rur6wUSrLRR6P28s3sccJmvMw1kVEsjdHtWP4FnNLihXiP/A97E13A32PixP CxSw== X-Gm-Message-State: APjAAAV55BwFgtHZaaGybmt/cqzNFVv6h++JMp9PEalJxZfJNNbKiBf+ fqIuuKRgt97RcxOP5F9EIourdtZ6Wh+En+xS5Y4= X-Google-Smtp-Source: APXvYqzgxjpqpYC6B6Zbo5mF6q/AeeF6hOLuvtN36iCGgPkDFJqnxamFeKgiFqz282EOMtXmox2F5xwbxEqK8nJSMaQ= X-Received: by 2002:a17:906:958e:: with SMTP id r14mr32492382ejx.228.1575922458351; Mon, 09 Dec 2019 12:14:18 -0800 (PST) MIME-Version: 1.0 References: <1574465484-7115-1-git-send-email-jcrouse@codeaurora.org> <0101016e95755c16-5ab6f6e7-83bb-4d01-b746-7cc6ea265ad7-000000@us-west-2.amazonses.com> In-Reply-To: <0101016e95755c16-5ab6f6e7-83bb-4d01-b746-7cc6ea265ad7-000000@us-west-2.amazonses.com> From: Rob Clark Date: Mon, 9 Dec 2019 12:14:08 -0800 Message-ID: Subject: Re: [PATCH v2 6/8] drm/msm: Refactor address space initialization To: Jordan Crouse X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191209_121420_708920_A7D6828F X-CRM114-Status: GOOD ( 23.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jeffrey Hugo , David Airlie , dri-devel , Linux Kernel Mailing List , AngeloGioacchino Del Regno , Sam Ravnborg , Thomas Gleixner , Jonathan Marek , Will Deacon , Mamta Shukla , Wen Yang , Ben Dooks , "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , Brian Masney , freedreno , linux-arm-msm , Sharat Masetty , Bruce Wang , Alexios Zavras , Jeykumar Sankaran , Sean Paul , Allison Randal , Greg Kroah-Hartman , Douglas Anderson , "list@263.net:IOMMU DRIVERS , Joerg Roedel , " , Daniel Vetter , Drew Davenport , Robin Murphy , Georgi Djakov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Nov 22, 2019 at 3:32 PM Jordan Crouse wrote: > > Refactor how address space initialization works. Instead of having the > address space function create the MMU object (and thus require separate but > equal functions for gpummu and iommu) use a single function and pass the > MMU struct in. Make the generic code cleaner by using target specific > functions to create the address space so a2xx can do its own thing in its > own space. For all the other targets use a generic helper to initialize > IOMMU but leave the door open for newer targets to use customization > if they need it. > > Signed-off-by: Jordan Crouse Reviewed-by: Rob Clark > --- > > drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 16 ++++++++++ > drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 1 + > drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 1 + > drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 1 + > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 23 ++++++++++---- > drivers/gpu/drm/msm/adreno/adreno_gpu.h | 8 +++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 +++--- > drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 14 +++++---- > drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 4 --- > drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +++++-- > drivers/gpu/drm/msm/msm_drv.h | 8 ++--- > drivers/gpu/drm/msm/msm_gem_vma.c | 52 +++++--------------------------- > drivers/gpu/drm/msm/msm_gpu.c | 40 ++---------------------- > drivers/gpu/drm/msm/msm_gpu.h | 4 +-- > drivers/gpu/drm/msm/msm_iommu.c | 3 ++ > 16 files changed, 83 insertions(+), 114 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c > index 1f83bc1..60f6472 100644 > --- a/drivers/gpu/drm/msm/adreno/a2xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a2xx_gpu.c > @@ -401,6 +401,21 @@ static struct msm_gpu_state *a2xx_gpu_state_get(struct msm_gpu *gpu) > return state; > } > > +static struct msm_gem_address_space * > +a2xx_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev) > +{ > + struct msm_mmu *mmu = msm_gpummu_new(&pdev->dev, gpu); > + struct msm_gem_address_space *aspace; > + > + aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M, > + SZ_16M + 0xfff * SZ_64K); > + > + if (IS_ERR(aspace) && !IS_ERR(mmu)) > + mmu->funcs->destroy(mmu); > + > + return aspace; > +} > + > /* Register offset defines for A2XX - copy of A3XX */ > static const unsigned int a2xx_register_offsets[REG_ADRENO_REGISTER_MAX] = { > REG_ADRENO_DEFINE(REG_ADRENO_CP_RB_BASE, REG_AXXX_CP_RB_BASE), > @@ -429,6 +444,7 @@ static const struct adreno_gpu_funcs funcs = { > #endif > .gpu_state_get = a2xx_gpu_state_get, > .gpu_state_put = adreno_gpu_state_put, > + .create_address_space = a2xx_create_address_space, > }, > }; > > diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c > index 7ad1493..41e51e0 100644 > --- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c > @@ -441,6 +441,7 @@ static const struct adreno_gpu_funcs funcs = { > #endif > .gpu_state_get = a3xx_gpu_state_get, > .gpu_state_put = adreno_gpu_state_put, > + .create_address_space = adreno_iommu_create_address_space, > }, > }; > > diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c > index b01388a..3655440 100644 > --- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c > @@ -532,6 +532,7 @@ static const struct adreno_gpu_funcs funcs = { > #endif > .gpu_state_get = a4xx_gpu_state_get, > .gpu_state_put = adreno_gpu_state_put, > + .create_address_space = adreno_iommu_create_address_space, > }, > .get_timestamp = a4xx_get_timestamp, > }; > diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > index b02e204..0f5db72 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c > @@ -1432,6 +1432,7 @@ static const struct adreno_gpu_funcs funcs = { > .gpu_busy = a5xx_gpu_busy, > .gpu_state_get = a5xx_gpu_state_get, > .gpu_state_put = a5xx_gpu_state_put, > + .create_address_space = adreno_iommu_create_address_space, > }, > .get_timestamp = a5xx_get_timestamp, > }; > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > index dc8ec2c..5dc0b2c 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > @@ -832,6 +832,7 @@ static const struct adreno_gpu_funcs funcs = { > #if defined(CONFIG_DRM_MSM_GPU_STATE) > .gpu_state_get = a6xx_gpu_state_get, > .gpu_state_put = a6xx_gpu_state_put, > + .create_address_space = adreno_iommu_create_address_space, > #endif > }, > .get_timestamp = a6xx_get_timestamp, > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 0783e4b..09c57891 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -157,6 +157,23 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid) > return zap_shader_load_mdt(gpu, adreno_gpu->info->zapfw, pasid); > } > > +struct msm_gem_address_space * > +adreno_iommu_create_address_space(struct msm_gpu *gpu, > + struct platform_device *pdev) > +{ > + struct iommu_domain *iommu = iommu_domain_alloc(&platform_bus_type); > + struct msm_mmu *mmu = msm_iommu_new(&pdev->dev, iommu); > + struct msm_gem_address_space *aspace; > + > + aspace = msm_gem_address_space_create(mmu, "gpu", SZ_16M, > + 0xfffffff); > + > + if (IS_ERR(aspace) && !IS_ERR(mmu)) > + mmu->funcs->destroy(mmu); > + > + return aspace; > +} > + > int adreno_get_param(struct msm_gpu *gpu, uint32_t param, uint64_t *value) > { > struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); > @@ -949,12 +966,6 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, > > adreno_gpu_config.ioname = "kgsl_3d0_reg_memory"; > > - adreno_gpu_config.va_start = SZ_16M; > - adreno_gpu_config.va_end = 0xffffffff; > - /* maximum range of a2xx mmu */ > - if (adreno_is_a2xx(adreno_gpu)) > - adreno_gpu_config.va_end = SZ_16M + 0xfff * SZ_64K; > - > adreno_gpu_config.nr_rings = nr_rings; > > adreno_get_pwrlevels(&pdev->dev, gpu); > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h > index e71a757..5c1aa12 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h > @@ -263,6 +263,14 @@ int adreno_gpu_state_get(struct msm_gpu *gpu, struct msm_gpu_state *state); > int adreno_gpu_state_put(struct msm_gpu_state *state); > > /* > + * Common helper function to initialize the default address space for arm-smmu > + * attached targets > + */ > +struct msm_gem_address_space * > +adreno_iommu_create_address_space(struct msm_gpu *gpu, > + struct platform_device *pdev); > + > +/* > * For a5xx and a6xx targets load the zap shader that is used to pull the GPU > * out of secure mode > */ > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index b082b23..4e6ebbd 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -704,18 +704,18 @@ static int _dpu_kms_mmu_init(struct dpu_kms *dpu_kms) > { > struct iommu_domain *domain; > struct msm_gem_address_space *aspace; > + struct msm_mmu *mmu; > > domain = iommu_domain_alloc(&platform_bus_type); > if (!domain) > return 0; > > - domain->geometry.aperture_start = 0x1000; > - domain->geometry.aperture_end = 0xffffffff; > + mmu = msm_iommu_new(dpu_kms->dev->dev, domain); > + aspace = msm_gem_address_space_create(mmu, "dpu1", > + 0x1000, 0xfffffff); > > - aspace = msm_gem_address_space_create(dpu_kms->dev->dev, > - domain, "dpu1"); > if (IS_ERR(aspace)) { > - iommu_domain_free(domain); > + mmu->funcs->destroy(mmu); > return PTR_ERR(aspace); > } > > diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c > index 9dba37c..0889718 100644 > --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c > +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c > @@ -510,9 +510,15 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) > mdelay(16); > > if (config->iommu) { > - aspace = msm_gem_address_space_create(&pdev->dev, > - config->iommu, "mdp4"); > + struct msm_mmu *mmu = msm_iommu_new(&pdev->dev, > + config->iommu); > + > + aspace = msm_gem_address_space_create(mmu, > + "mdp4", 0x1000, 0xffffffff); > + > if (IS_ERR(aspace)) { > + if (!IS_ERR(mmu)) > + mmu->funcs->destroy(mmu); > ret = PTR_ERR(aspace); > goto fail; > } > @@ -565,10 +571,6 @@ static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev) > /* TODO: Chips that aren't apq8064 have a 200 Mhz max_clk */ > config.max_clk = 266667000; > config.iommu = iommu_domain_alloc(&platform_bus_type); > - if (config.iommu) { > - config.iommu->geometry.aperture_start = 0x1000; > - config.iommu->geometry.aperture_end = 0xffffffff; > - } > > return &config; > } > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c > index 1f48f64..ebd651a 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c > @@ -941,10 +941,6 @@ static struct mdp5_cfg_platform *mdp5_get_config(struct platform_device *dev) > static struct mdp5_cfg_platform config = {}; > > config.iommu = iommu_domain_alloc(&platform_bus_type); > - if (config.iommu) { > - config.iommu->geometry.aperture_start = 0x1000; > - config.iommu->geometry.aperture_end = 0xffffffff; > - } > > return &config; > } > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > index 653dab2..20bdff9 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c > @@ -724,13 +724,20 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) > mdelay(16); > > if (config->platform.iommu) { > + struct msm_mmu *mmu; > + > iommu_dev = &pdev->dev; > if (!iommu_dev->iommu_fwspec) > iommu_dev = iommu_dev->parent; > > - aspace = msm_gem_address_space_create(iommu_dev, > - config->platform.iommu, "mdp5"); > + mmu = msm_iommu_new(iommu_dev, config->platform.iommu); > + > + aspace = msm_gem_address_space_create(mmu, "mdp5", > + 0x1000, 0xffffffff); > + > if (IS_ERR(aspace)) { > + if (!IS_ERR(mmu)) > + mmu->funcs->destroy(mmu); > ret = PTR_ERR(aspace); > goto fail; > } > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index 71547e7..2203729 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -247,12 +247,8 @@ void msm_gem_close_vma(struct msm_gem_address_space *aspace, > void msm_gem_address_space_put(struct msm_gem_address_space *aspace); > > struct msm_gem_address_space * > -msm_gem_address_space_create(struct device *dev, struct iommu_domain *domain, > - const char *name); > - > -struct msm_gem_address_space * > -msm_gem_address_space_create_a2xx(struct device *dev, struct msm_gpu *gpu, > - const char *name, uint64_t va_start, uint64_t va_end); > +msm_gem_address_space_create(struct msm_mmu *mmu, const char *name, > + u64 va_start, u64 va_end); > > int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu); > void msm_unregister_mmu(struct drm_device *dev, struct msm_mmu *mmu); > diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c > index 91d993a..075ce52 100644 > --- a/drivers/gpu/drm/msm/msm_gem_vma.c > +++ b/drivers/gpu/drm/msm/msm_gem_vma.c > @@ -125,63 +125,25 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace, > return 0; > } > > - > struct msm_gem_address_space * > -msm_gem_address_space_create(struct device *dev, struct iommu_domain *domain, > - const char *name) > -{ > - struct msm_gem_address_space *aspace; > - u64 start = domain->geometry.aperture_start; > - u64 size = domain->geometry.aperture_end - start; > - > - aspace = kzalloc(sizeof(*aspace), GFP_KERNEL); > - if (!aspace) > - return ERR_PTR(-ENOMEM); > - > - spin_lock_init(&aspace->lock); > - aspace->name = name; > - aspace->mmu = msm_iommu_new(dev, domain); > - if (IS_ERR(aspace->mmu)) { > - int ret = PTR_ERR(aspace->mmu); > - > - kfree(aspace); > - return ERR_PTR(ret); > - } > - > - /* > - * Attaching the IOMMU device changes the aperture values so use the > - * cached values instead > - */ > - drm_mm_init(&aspace->mm, start >> PAGE_SHIFT, size >> PAGE_SHIFT); > - > - kref_init(&aspace->kref); > - > - return aspace; > -} > - > -struct msm_gem_address_space * > -msm_gem_address_space_create_a2xx(struct device *dev, struct msm_gpu *gpu, > - const char *name, uint64_t va_start, uint64_t va_end) > +msm_gem_address_space_create(struct msm_mmu *mmu, const char *name, > + u64 va_start, u64 va_end) > { > struct msm_gem_address_space *aspace; > u64 size = va_end - va_start; > > + if (IS_ERR(mmu)) > + return ERR_CAST(mmu); > + > aspace = kzalloc(sizeof(*aspace), GFP_KERNEL); > if (!aspace) > return ERR_PTR(-ENOMEM); > > spin_lock_init(&aspace->lock); > aspace->name = name; > - aspace->mmu = msm_gpummu_new(dev, gpu); > - if (IS_ERR(aspace->mmu)) { > - int ret = PTR_ERR(aspace->mmu); > - > - kfree(aspace); > - return ERR_PTR(ret); > - } > + aspace->mmu = mmu; > > - drm_mm_init(&aspace->mm, (va_start >> PAGE_SHIFT), > - size >> PAGE_SHIFT); > + drm_mm_init(&aspace->mm, va_start >> PAGE_SHIFT, size >> PAGE_SHIFT); > > kref_init(&aspace->kref); > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index f7bf80e..f11df53 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -803,42 +803,6 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) > return 0; > } > > -static struct msm_gem_address_space * > -msm_gpu_create_address_space(struct msm_gpu *gpu, struct platform_device *pdev, > - uint64_t va_start, uint64_t va_end) > -{ > - struct msm_gem_address_space *aspace; > - > - /* > - * Setup IOMMU.. eventually we will (I think) do this once per context > - * and have separate page tables per context. For now, to keep things > - * simple and to get something working, just use a single address space: > - */ > - if (!adreno_is_a2xx(to_adreno_gpu(gpu))) { > - struct iommu_domain *iommu = iommu_domain_alloc(&platform_bus_type); > - if (!iommu) > - return NULL; > - > - iommu->geometry.aperture_start = va_start; > - iommu->geometry.aperture_end = va_end; > - > - DRM_DEV_INFO(gpu->dev->dev, "%s: using IOMMU\n", gpu->name); > - > - aspace = msm_gem_address_space_create(&pdev->dev, iommu, "gpu"); > - if (IS_ERR(aspace)) > - iommu_domain_free(iommu); > - } else { > - aspace = msm_gem_address_space_create_a2xx(&pdev->dev, gpu, "gpu", > - va_start, va_end); > - } > - > - if (IS_ERR(aspace)) > - DRM_DEV_ERROR(gpu->dev->dev, "failed to init mmu: %ld\n", > - PTR_ERR(aspace)); > - > - return aspace; > -} > - > int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, > const char *name, struct msm_gpu_config *config) > @@ -911,8 +875,8 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, > > msm_devfreq_init(gpu); > > - gpu->aspace = msm_gpu_create_address_space(gpu, pdev, > - config->va_start, config->va_end); > + > + gpu->aspace = gpu->funcs->create_address_space(gpu, pdev); > > if (gpu->aspace == NULL) > DRM_DEV_INFO(drm->dev, "%s: no IOMMU, fallback to VRAM carveout!\n", name); > diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h > index ab8f0f9c..41d86c2 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.h > +++ b/drivers/gpu/drm/msm/msm_gpu.h > @@ -21,8 +21,6 @@ struct msm_gpu_state; > > struct msm_gpu_config { > const char *ioname; > - uint64_t va_start; > - uint64_t va_end; > unsigned int nr_rings; > }; > > @@ -64,6 +62,8 @@ struct msm_gpu_funcs { > int (*gpu_state_put)(struct msm_gpu_state *state); > unsigned long (*gpu_get_freq)(struct msm_gpu *gpu); > void (*gpu_set_freq)(struct msm_gpu *gpu, unsigned long freq); > + struct msm_gem_address_space *(*create_address_space) > + (struct msm_gpu *gpu, struct platform_device *pdev); > }; > > struct msm_gpu { > diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c > index 544c519..e773ef8 100644 > --- a/drivers/gpu/drm/msm/msm_iommu.c > +++ b/drivers/gpu/drm/msm/msm_iommu.c > @@ -70,6 +70,9 @@ struct msm_mmu *msm_iommu_new(struct device *dev, struct iommu_domain *domain) > struct msm_iommu *iommu; > int ret; > > + if (!domain) > + return ERR_PTR(-ENODEV); > + > iommu = kzalloc(sizeof(*iommu), GFP_KERNEL); > if (!iommu) > return ERR_PTR(-ENOMEM); > -- > 2.7.4 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel