evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: kgsl: Make the "scratch" global buffer use a random GPU address

Browse source 
Select a random global GPU address for the "scratch" buffer that is used
by the ringbuffer for various tasks.

Change-Id: Ic0dedbaddda71dbf9cb2adab3c6c33a24d6a604c
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Harshitha Sai Neelati <hsaine@codeaurora.org>
This commit is contained in:
Jordan Crouse 2019-09-11 08:32:15 -06:00 • committed by Gerrit - the friendly Code Review server
parent 19f118bcf5
commit 5ffb9e5b7a
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/msm/adreno_ringbuffer.c
View file

@ -277,7 +277,7 @@ int adreno_ringbuffer_probe(struct adreno_device *adreno_dev, bool nopreempt)
if (!adreno_is_a3xx(adreno_dev)) {
status = kgsl_allocate_global(device, &device->scratch,
PAGE_SIZE, 0, 0, "scratch");
PAGE_SIZE, 0, KGSL_MEMDESC_RANDOM, "scratch");
if (status != 0)
return status;
}

4
drivers/gpu/msm/kgsl.h
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2008-2016, 2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2008-2016,2018-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -189,6 +189,8 @@ struct kgsl_memdesc_ops {
#define KGSL_MEMDESC_TZ_LOCKED BIT(7)
/* The memdesc is allocated through contiguous memory */
#define KGSL_MEMDESC_CONTIG BIT(8)
/* For global buffers, randomly assign an address from the region */
#define KGSL_MEMDESC_RANDOM BIT(9)
/**
* struct kgsl_memdesc - GPU memory object descriptor

25
drivers/gpu/msm/kgsl_iommu.c
View file

@ -20,6 +20,7 @@
#include <linux/msm_kgsl.h>
#include <linux/ratelimit.h>
#include <linux/of_platform.h>
#include <linux/random.h>
#include <soc/qcom/scm.h>
#include <soc/qcom/secure_buffer.h>
#include <stddef.h>
@ -198,7 +199,7 @@ static void kgsl_iommu_remove_global(struct kgsl_mmu *mmu,
static void kgsl_iommu_add_global(struct kgsl_mmu *mmu,
struct kgsl_memdesc *memdesc, const char *name)
{
int bit;
u32 bit, start = 0;
u64 size = kgsl_memdesc_footprint(memdesc);
if (memdesc->gpuaddr != 0)
@ -207,10 +208,26 @@ static void kgsl_iommu_add_global(struct kgsl_mmu *mmu,
if (WARN_ON(global_pt_count >= GLOBAL_PT_ENTRIES))
return;
bit = bitmap_find_next_zero_area(global_map, GLOBAL_MAP_PAGES,
0, size >> PAGE_SHIFT, 0);
if (WARN_ON(size > KGSL_IOMMU_GLOBAL_MEM_SIZE))
return;
if (WARN_ON(bit >= GLOBAL_MAP_PAGES))
if (memdesc->priv & KGSL_MEMDESC_RANDOM) {
u32 range = GLOBAL_MAP_PAGES - (size >> PAGE_SHIFT);
start = get_random_int() % range;
}
while (start >= 0) {
bit = bitmap_find_next_zero_area(global_map, GLOBAL_MAP_PAGES,
start, size >> PAGE_SHIFT, 0);
if (bit < GLOBAL_MAP_PAGES)
break;
start--;
}
if (WARN_ON(start < 0))
return;
memdesc->gpuaddr =