A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 00:00:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: kgsl: Move ringbuffer global allocations to init time

Browse source 
With eCP, kgsl will not be allocating these buffers or anything
related to the ringbuffers. Move this to init time so that this
only gets called when eCP is disabled.

Change-Id: I3c492581d904e35e4a58931bdd1f6e83546a3d2c
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>
This commit is contained in:
Harshdeep Dhatt 2019-11-03 12:50:42 -08:00
commit 840f7b8ab9
3 changed files with 50 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/gpu/msm/adreno.c
View file

@ -1368,6 +1368,8 @@ static const struct kgsl_functable adreno_functable;
static void adreno_setup_device(struct adreno_device *adreno_dev)
{
u32 i;
memset(adreno_dev, 0, sizeof(*adreno_dev));
adreno_dev->dev.name = "kgsl-3d0";
@ -1403,6 +1405,12 @@ static void adreno_setup_device(struct adreno_device *adreno_dev)
/* Enable use of the LLC slices where applicable */
adreno_dev->gpu_llc_slice_enable = true;
adreno_dev->gpuhtw_llc_slice_enable = true;
for (i = 0; i < ARRAY_SIZE(adreno_dev->ringbuffers); i++) {
struct adreno_ringbuffer *rb = &adreno_dev->ringbuffers[i];
INIT_LIST_HEAD(&rb->events.group);
}
}
static int adreno_probe(struct platform_device *pdev)
@ -1525,10 +1533,6 @@ static int adreno_probe(struct platform_device *pdev)
kgsl_device_snapshot_probe(device, size);
status = adreno_ringbuffer_probe(adreno_dev);
if (status)
goto out;
status = adreno_dispatcher_init(adreno_dev);
if (status)
goto out;
@ -1575,7 +1579,6 @@ static int adreno_probe(struct platform_device *pdev)
#endif
out:
if (status) {
adreno_ringbuffer_close(adreno_dev);
kgsl_device_platform_remove(device);
device->pdev = NULL;
}
@ -1813,6 +1816,10 @@ static int adreno_init(struct kgsl_device *device)
if (test_bit(ADRENO_DEVICE_INITIALIZED, &adreno_dev->priv))
return 0;
ret = adreno_ringbuffer_init(adreno_dev);
if (ret)
return ret;
/*
* Either the microcode read failed because the usermodehelper isn't
* available or the microcode was corrupted. Fail the init and force

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

@ -255,13 +255,42 @@ static int _rb_readtimestamp(struct kgsl_device *device,
timestamp);
}
static int _adreno_ringbuffer_probe(struct adreno_device *adreno_dev,
static int _adreno_ringbuffer_init(struct adreno_device *adreno_dev,
int id)
{
struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
struct adreno_ringbuffer *rb = &adreno_dev->ringbuffers[id];
unsigned int priv = 0;
/*
* Allocate mem for storing RB pagetables and commands to
* switch pagetable
*/
if (IS_ERR_OR_NULL(rb->pagetable_desc)) {
rb->pagetable_desc = kgsl_allocate_global(device, PAGE_SIZE,
0, KGSL_MEMDESC_PRIVILEGED, "pagetable_desc");
if (IS_ERR(rb->pagetable_desc))
return PTR_ERR(rb->pagetable_desc);
}
/* allocate a chunk of memory to create user profiling IB1s */
if (IS_ERR_OR_NULL(rb->profile_desc))
rb->profile_desc = kgsl_allocate_global(device, PAGE_SIZE,
KGSL_MEMFLAGS_GPUREADONLY, 0, "profile_desc");
if (ADRENO_FEATURE(adreno_dev, ADRENO_APRIV))
priv |= KGSL_MEMDESC_PRIVILEGED;
if (IS_ERR_OR_NULL(rb->buffer_desc)) {
rb->buffer_desc = kgsl_allocate_global(device, KGSL_RB_SIZE,
KGSL_MEMFLAGS_GPUREADONLY, priv, "ringbuffer");
if (IS_ERR(rb->buffer_desc))
return PTR_ERR(rb->buffer_desc);
}
if (!list_empty(&rb->events.group))
return 0;
rb->id = id;
kgsl_add_event_group(&rb->events, NULL, _rb_readtimestamp, rb,
"rb_events-%d", id);
@ -271,26 +300,7 @@ static int _adreno_ringbuffer_probe(struct adreno_device *adreno_dev,
spin_lock_init(&rb->preempt_lock);
/*
* Allocate mem for storing RB pagetables and commands to
* switch pagetable
*/
rb->pagetable_desc = kgsl_allocate_global(device, PAGE_SIZE,
0, KGSL_MEMDESC_PRIVILEGED, "pagetable_desc");
if (IS_ERR(rb->pagetable_desc))
return PTR_ERR(rb->pagetable_desc);
/* allocate a chunk of memory to create user profiling IB1s */
rb->profile_desc = kgsl_allocate_global(device, PAGE_SIZE,
KGSL_MEMFLAGS_GPUREADONLY, 0, "profile_desc");
if (ADRENO_FEATURE(adreno_dev, ADRENO_APRIV))
priv |= KGSL_MEMDESC_PRIVILEGED;
rb->buffer_desc = kgsl_allocate_global(device, KGSL_RB_SIZE,
KGSL_MEMFLAGS_GPUREADONLY, priv, "ringbuffer");
return PTR_ERR_OR_ZERO(rb->buffer_desc);
return 0;
}
static void adreno_preemption_timer(struct timer_list *t)
@ -334,7 +344,7 @@ static void adreno_preemption_close(struct adreno_device *adreno_dev)
del_timer(&preempt->timer);
}
int adreno_ringbuffer_probe(struct adreno_device *adreno_dev)
int adreno_ringbuffer_init(struct adreno_device *adreno_dev)
{
struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
int i;
@ -347,11 +357,13 @@ int adreno_ringbuffer_probe(struct adreno_device *adreno_dev)
if (ADRENO_FEATURE(adreno_dev, ADRENO_APRIV))
priv |= KGSL_MEMDESC_PRIVILEGED;
device->scratch = kgsl_allocate_global(device,
if (IS_ERR_OR_NULL(device->scratch)) {
device->scratch = kgsl_allocate_global(device,
PAGE_SIZE, 0, KGSL_MEMDESC_RANDOM, "scratch");
if (IS_ERR(device->scratch))
return PTR_ERR(device->scratch);
if (IS_ERR(device->scratch))
return PTR_ERR(device->scratch);
}
}
if (ADRENO_FEATURE(adreno_dev, ADRENO_PREEMPTION))
@ -361,7 +373,7 @@ int adreno_ringbuffer_probe(struct adreno_device *adreno_dev)
adreno_dev->num_ringbuffers = 1;
for (i = 0; i < adreno_dev->num_ringbuffers; i++) {
status = _adreno_ringbuffer_probe(adreno_dev, i);
status = _adreno_ringbuffer_init(adreno_dev, i);
if (status) {
adreno_ringbuffer_close(adreno_dev);
return status;
@ -379,10 +391,8 @@ void adreno_ringbuffer_close(struct adreno_device *adreno_dev)
struct adreno_ringbuffer *rb;
int i;
FOR_EACH_RINGBUFFER(adreno_dev, rb, i) {
FOR_EACH_RINGBUFFER(adreno_dev, rb, i)
kgsl_del_event_group(&rb->events);
memset(rb, 0, sizeof(*rb));
}
adreno_preemption_close(adreno_dev);
}

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

@ -149,7 +149,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev,
struct kgsl_drawobj_cmd *cmdobj,
struct adreno_submit_time *time);
int adreno_ringbuffer_probe(struct adreno_device *adreno_dev);
int adreno_ringbuffer_init(struct adreno_device *adreno_dev);
int adreno_ringbuffer_start(struct adreno_device *adreno_dev);