mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 12:25:00 -04:00
Merge "msm: kgsl: Set busmon driver data"
This commit is contained in:
commit
ca2f6a0273
4 changed files with 19 additions and 22 deletions
|
|
@ -3817,6 +3817,20 @@ static bool adreno_is_hwcg_on(struct kgsl_device *device)
|
|||
return test_bit(ADRENO_HWCG_CTRL, &adreno_dev->pwrctrl_flag);
|
||||
}
|
||||
|
||||
static int adreno_queue_cmds(struct kgsl_device_private *dev_priv,
|
||||
struct kgsl_context *context, struct kgsl_drawobj *drawobj[],
|
||||
u32 count, u32 *timestamp)
|
||||
{
|
||||
return adreno_dispatcher_queue_cmds(dev_priv, context, drawobj, count,
|
||||
timestamp);
|
||||
}
|
||||
|
||||
static void adreno_drawctxt_sched(struct kgsl_device *device,
|
||||
struct kgsl_context *context)
|
||||
{
|
||||
adreno_dispatcher_queue_context(device, ADRENO_CONTEXT(context));
|
||||
}
|
||||
|
||||
static const struct kgsl_functable adreno_functable = {
|
||||
/* Mandatory functions */
|
||||
.regread = adreno_regread,
|
||||
|
|
@ -3832,7 +3846,7 @@ static const struct kgsl_functable adreno_functable = {
|
|||
.getproperty_compat = adreno_getproperty_compat,
|
||||
.waittimestamp = adreno_waittimestamp,
|
||||
.readtimestamp = adreno_readtimestamp,
|
||||
.queue_cmds = adreno_dispatcher_queue_cmds,
|
||||
.queue_cmds = adreno_queue_cmds,
|
||||
.ioctl = adreno_ioctl,
|
||||
.compat_ioctl = adreno_compat_ioctl,
|
||||
.power_stats = adreno_power_stats,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2002,2007-2020, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/debugfs.h>
|
||||
|
|
@ -420,21 +420,6 @@ adreno_drawctxt_create(struct kgsl_device_private *dev_priv,
|
|||
return &drawctxt->base;
|
||||
}
|
||||
|
||||
/**
|
||||
* adreno_drawctxt_sched() - Schedule a previously blocked context
|
||||
* @device: pointer to a KGSL device
|
||||
* @drawctxt: drawctxt to rechedule
|
||||
*
|
||||
* This function is called by the core when it knows that a previously blocked
|
||||
* context has been unblocked. The default adreno response is to reschedule the
|
||||
* context on the dispatcher
|
||||
*/
|
||||
void adreno_drawctxt_sched(struct kgsl_device *device,
|
||||
struct kgsl_context *context)
|
||||
{
|
||||
adreno_dispatcher_queue_context(device, ADRENO_CONTEXT(context));
|
||||
}
|
||||
|
||||
/**
|
||||
* adreno_drawctxt_detach(): detach a context from the GPU
|
||||
* @context: Generic KGSL context container for the context
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2002,2007-2020, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
#ifndef __ADRENO_DRAWCTXT_H
|
||||
#define __ADRENO_DRAWCTXT_H
|
||||
|
|
@ -110,9 +110,6 @@ void adreno_drawctxt_detach(struct kgsl_context *context);
|
|||
|
||||
void adreno_drawctxt_destroy(struct kgsl_context *context);
|
||||
|
||||
void adreno_drawctxt_sched(struct kgsl_device *device,
|
||||
struct kgsl_context *context);
|
||||
|
||||
struct adreno_ringbuffer;
|
||||
int adreno_drawctxt_switch(struct adreno_device *adreno_dev,
|
||||
struct adreno_ringbuffer *rb,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/devfreq_cooling.h>
|
||||
|
|
@ -685,6 +685,7 @@ static void pwrscale_busmon_create(struct kgsl_device *device,
|
|||
dev->parent = &pdev->dev;
|
||||
|
||||
dev_set_name(dev, "kgsl-busmon");
|
||||
dev_set_drvdata(dev, device);
|
||||
if (device_register(dev))
|
||||
return;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue