Skip to content

Commit e7840e2

Browse files
jannaumarcan
authored andcommitted
drm: apple: Remove explicit asc-dram-mask handling
This is no longer necessary after introducing "apple,dma-range" for the dart driver. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent bbef3c1 commit e7840e2

3 files changed

Lines changed: 2 additions & 16 deletions

File tree

drivers/gpu/drm/apple/dcp-internal.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ struct apple_dcp {
108108
/* Coprocessor control register */
109109
void __iomem *coproc_reg;
110110

111-
/* mask for DCP IO virtual addresses shared over rtkit */
112-
u64 asc_dram_mask;
113-
114111
/* DCP has crashed */
115112
bool crashed;
116113

drivers/gpu/drm/apple/dcp.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ static int dcp_rtk_shmem_setup(void *cookie, struct apple_rtkit_shmem *bfr)
146146
return -ENOMEM;
147147

148148
// TODO: get map from device-tree
149-
phy_addr = iommu_iova_to_phys(domain,
150-
bfr->iova & ~dcp->asc_dram_mask);
149+
phy_addr = iommu_iova_to_phys(domain, bfr->iova);
151150
if (!phy_addr)
152151
return -ENOMEM;
153152

@@ -167,8 +166,6 @@ static int dcp_rtk_shmem_setup(void *cookie, struct apple_rtkit_shmem *bfr)
167166
if (!bfr->buffer)
168167
return -ENOMEM;
169168

170-
bfr->iova |= dcp->asc_dram_mask;
171-
172169
dev_info(dcp->dev, "shmem_setup: iova: %lx, buffer: %lx",
173170
(uintptr_t)bfr->iova, (uintptr_t)bfr->buffer);
174171
}
@@ -183,8 +180,7 @@ static void dcp_rtk_shmem_destroy(void *cookie, struct apple_rtkit_shmem *bfr)
183180
if (bfr->is_mapped)
184181
memunmap(bfr->buffer);
185182
else
186-
dma_free_coherent(dcp->dev, bfr->size, bfr->buffer,
187-
bfr->iova & ~dcp->asc_dram_mask);
183+
dma_free_coherent(dcp->dev, bfr->size, bfr->buffer, bfr->iova);
188184
}
189185

190186
static struct apple_rtkit_ops rtkit_ops = {
@@ -541,12 +537,6 @@ static int dcp_comp_bind(struct device *dev, struct device *main, void *data)
541537
return dev_err_probe(dev, PTR_ERR(dcp->clk),
542538
"Unable to find clock\n");
543539

544-
ret = of_property_read_u64(dev->of_node, "apple,asc-dram-mask",
545-
&dcp->asc_dram_mask);
546-
if (ret)
547-
dev_warn(dev, "failed read 'apple,asc-dram-mask': %d\n", ret);
548-
dev_dbg(dev, "'apple,asc-dram-mask': 0x%011llx\n", dcp->asc_dram_mask);
549-
550540
bitmap_zero(dcp->memdesc_map, DCP_MAX_MAPPINGS);
551541
// TDOD: mem_desc IDs start at 1, for simplicity just skip '0' entry
552542
set_bit(0, dcp->memdesc_map);

drivers/gpu/drm/apple/iomfb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,6 @@ int iomfb_start_rtkit(struct apple_dcp *dcp)
557557
dcp->shmem = dma_alloc_coherent(dcp->dev, DCP_SHMEM_SIZE, &shmem_iova,
558558
GFP_KERNEL);
559559

560-
shmem_iova |= dcp->asc_dram_mask;
561560
dcp_send_message(dcp, IOMFB_ENDPOINT, dcpep_set_shmem(shmem_iova));
562561

563562
return 0;

0 commit comments

Comments
 (0)