Skip to content

Commit

Permalink
drm/msm/a6xx: use msm_gem for GMU memory objects
Browse files Browse the repository at this point in the history 
This gives more fine-grained control over how memory is allocated over the
DMA api. In particular, it allows using an address range or pinning to
a fixed address.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
  • Loading branch information
Jonathan Marek authored and Rob Clark committed May 18, 2020
1 parent 0b462d7 commit 29ac897
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 42 deletions.
115 changes: 79 additions & 36 deletions drivers/gpu/drm/msm/adreno/a6xx_gmu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
/* Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. */

#include <linux/clk.h>
#include <linux/dma-mapping.h>
#include <linux/interconnect.h>
#include <linux/pm_domain.h>
#include <linux/pm_opp.h>
#include <soc/qcom/cmd-db.h>
#include <drm/drm_gem.h>

#include "a6xx_gpu.h"
#include "a6xx_gmu.xml.h"
#include "msm_gem.h"
#include "msm_mmu.h"

static void a6xx_gmu_fault(struct a6xx_gmu *gmu)
{
Expand Down Expand Up @@ -628,7 +630,7 @@ static int a6xx_gmu_fw_start(struct a6xx_gmu *gmu, unsigned int state)
gmu_write(gmu, REG_A6XX_GMU_CM3_BOOT_CONFIG, 0x02);

/* Write the iova of the HFI table */
gmu_write(gmu, REG_A6XX_GMU_HFI_QTBL_ADDR, gmu->hfi->iova);
gmu_write(gmu, REG_A6XX_GMU_HFI_QTBL_ADDR, gmu->hfi.iova);
gmu_write(gmu, REG_A6XX_GMU_HFI_QTBL_INFO, 1);

gmu_write(gmu, REG_A6XX_GMU_AHB_FENCE_RANGE_0,
Expand Down Expand Up @@ -927,34 +929,77 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)
return 0;
}

static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo)
static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu)
{
if (IS_ERR_OR_NULL(bo))
return;
msm_gem_kernel_put(gmu->hfi.obj, gmu->aspace, false);
msm_gem_kernel_put(gmu->debug.obj, gmu->aspace, false);

gmu->aspace->mmu->funcs->detach(gmu->aspace->mmu);
msm_gem_address_space_put(gmu->aspace);
}

static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo,
size_t size, u64 iova)
{
struct a6xx_gpu *a6xx_gpu = container_of(gmu, struct a6xx_gpu, gmu);
struct drm_device *dev = a6xx_gpu->base.base.dev;
uint32_t flags = MSM_BO_WC;
u64 range_start, range_end;
int ret;

size = PAGE_ALIGN(size);
if (!iova) {
/* no fixed address - use GMU's uncached range */
range_start = 0x60000000;
range_end = 0x80000000;
} else {
/* range for fixed address */
range_start = iova;
range_end = iova + size;
}

bo->obj = msm_gem_new(dev, size, flags);
if (IS_ERR(bo->obj))
return PTR_ERR(bo->obj);

dma_free_wc(gmu->dev, bo->size, bo->virt, bo->iova);
kfree(bo);
ret = msm_gem_get_and_pin_iova_range(bo->obj, gmu->aspace, &bo->iova,
range_start >> PAGE_SHIFT, range_end >> PAGE_SHIFT);
if (ret) {
drm_gem_object_put(bo->obj);
return ret;
}

bo->virt = msm_gem_get_vaddr(bo->obj);
bo->size = size;

return 0;
}

static struct a6xx_gmu_bo *a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu,
size_t size)
static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu)
{
struct a6xx_gmu_bo *bo;
struct iommu_domain *domain;
int ret;

bo = kzalloc(sizeof(*bo), GFP_KERNEL);
if (!bo)
return ERR_PTR(-ENOMEM);
domain = iommu_domain_alloc(&platform_bus_type);
if (!domain)
return -ENODEV;

bo->size = PAGE_ALIGN(size);
domain->geometry.aperture_start = 0x00000000;
domain->geometry.aperture_end = 0x7fffffff;

bo->virt = dma_alloc_wc(gmu->dev, bo->size, &bo->iova, GFP_KERNEL);
gmu->aspace = msm_gem_address_space_create(gmu->dev, domain, "gmu");
if (IS_ERR(gmu->aspace)) {
iommu_domain_free(domain);
return PTR_ERR(gmu->aspace);
}

if (!bo->virt) {
kfree(bo);
return ERR_PTR(-ENOMEM);
ret = gmu->aspace->mmu->funcs->attach(gmu->aspace->mmu);
if (ret) {
msm_gem_address_space_put(gmu->aspace);
return ret;
}

return bo;
return 0;
}

/* Return the 'arc-level' for the given frequency */
Expand Down Expand Up @@ -1212,7 +1257,7 @@ void a6xx_gmu_remove(struct a6xx_gpu *a6xx_gpu)
iounmap(gmu->mmio);
gmu->mmio = NULL;

a6xx_gmu_memory_free(gmu, gmu->hfi);
a6xx_gmu_memory_free(gmu);

free_irq(gmu->gmu_irq, gmu);
free_irq(gmu->hfi_irq, gmu);
Expand All @@ -1234,15 +1279,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)

gmu->dev = &pdev->dev;

/* Pass force_dma false to require the DT to set the dma region */
ret = of_dma_configure(gmu->dev, node, false);
if (ret)
return ret;

/* Set the mask after the of_dma_configure() */
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(31));
if (ret)
return ret;
of_dma_configure(gmu->dev, node, true);

/* Fow now, don't do anything fancy until we get our feet under us */
gmu->idle_level = GMU_IDLE_STATE_ACTIVE;
Expand All @@ -1254,20 +1291,26 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
if (ret)
goto err_put_device;

ret = a6xx_gmu_memory_probe(gmu);
if (ret)
goto err_put_device;

/* Allocate memory for for the HFI queues */
gmu->hfi = a6xx_gmu_memory_alloc(gmu, SZ_16K);
if (IS_ERR(gmu->hfi))
ret = a6xx_gmu_memory_alloc(gmu, &gmu->hfi, SZ_16K, 0);
if (ret)
goto err_memory;

/* Allocate memory for the GMU debug region */
gmu->debug = a6xx_gmu_memory_alloc(gmu, SZ_16K);
if (IS_ERR(gmu->debug))
ret = a6xx_gmu_memory_alloc(gmu, &gmu->debug, SZ_16K, 0);
if (ret)
goto err_memory;

/* Map the GMU registers */
gmu->mmio = a6xx_gmu_get_mmio(pdev, "gmu");
if (IS_ERR(gmu->mmio))
if (IS_ERR(gmu->mmio)) {
ret = PTR_ERR(gmu->mmio);
goto err_memory;
}

/* Get the HFI and GMU interrupts */
gmu->hfi_irq = a6xx_gmu_get_irq(gmu, pdev, "hfi", a6xx_hfi_irq);
Expand Down Expand Up @@ -1296,11 +1339,11 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
iounmap(gmu->mmio);
free_irq(gmu->gmu_irq, gmu);
free_irq(gmu->hfi_irq, gmu);
err_memory:
a6xx_gmu_memory_free(gmu, gmu->hfi);

ret = -ENODEV;

err_memory:
a6xx_gmu_memory_free(gmu);
err_put_device:
/* Drop reference taken in of_find_device_by_node */
put_device(gmu->dev);
Expand Down
9 changes: 6 additions & 3 deletions drivers/gpu/drm/msm/adreno/a6xx_gmu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@
#include "a6xx_hfi.h"

struct a6xx_gmu_bo {
struct drm_gem_object *obj;
void *virt;
size_t size;
dma_addr_t iova;
u64 iova;
};

/*
Expand Down Expand Up @@ -43,6 +44,8 @@ struct a6xx_gmu_bo {
struct a6xx_gmu {
struct device *dev;

struct msm_gem_address_space *aspace;

void * __iomem mmio;

int hfi_irq;
Expand All @@ -52,8 +55,8 @@ struct a6xx_gmu {

int idle_level;

struct a6xx_gmu_bo *hfi;
struct a6xx_gmu_bo *debug;
struct a6xx_gmu_bo hfi;
struct a6xx_gmu_bo debug;

int nr_clocks;
struct clk_bulk_data *clocks;
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/msm/adreno/a6xx_hfi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ static int a6xx_hfi_send_gmu_init(struct a6xx_gmu *gmu, int boot_state)
{
struct a6xx_hfi_msg_gmu_init_cmd msg = { 0 };

msg.dbg_buffer_addr = (u32) gmu->debug->iova;
msg.dbg_buffer_size = (u32) gmu->debug->size;
msg.dbg_buffer_addr = (u32) gmu->debug.iova;
msg.dbg_buffer_size = (u32) gmu->debug.size;
msg.boot_state = boot_state;

return a6xx_hfi_send_msg(gmu, HFI_H2F_MSG_INIT, &msg, sizeof(msg),
Expand Down Expand Up @@ -385,7 +385,7 @@ static void a6xx_hfi_queue_init(struct a6xx_hfi_queue *queue,

void a6xx_hfi_init(struct a6xx_gmu *gmu)
{
struct a6xx_gmu_bo *hfi = gmu->hfi;
struct a6xx_gmu_bo *hfi = &gmu->hfi;
struct a6xx_hfi_queue_table_header *table = hfi->virt;
struct a6xx_hfi_queue_header *headers = hfi->virt + sizeof(*table);
u64 offset;
Expand Down

0 comments on commit 29ac897

Please sign in to comment.