Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98890f36 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: page_alloc stats are double subtracted"

parents 9167ee90 90ce2e36

drivers/gpu/msm/adreno.c

+6 −6
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static int adreno_soft_reset(struct kgsl_device *device); 
 * all the HW logic, restores GPU registers to default state and

 * flushes out pending VBIF transactions.

 */

void _soft_reset(struct adreno_device *adreno_dev)

static void _soft_reset(struct adreno_device *adreno_dev)

{

	struct adreno_gpudev *gpudev  = ADRENO_GPU_DEVICE(adreno_dev);

	unsigned int reg;
@@ -1064,7 +1064,7 @@ adreno_ocmem_free(struct adreno_device *adreno_dev) 
}

#endif



int adreno_probe(struct platform_device *pdev)

static int adreno_probe(struct platform_device *pdev)

{

	struct kgsl_device *device;

	struct adreno_device *adreno_dev;
@@ -2382,9 +2382,9 @@ static int adreno_waittimestamp(struct kgsl_device *device, 
		return -ENOTTY;

	}



	/* Return -EINVAL if the context has been detached */

	/* Return -ENOENT if the context has been detached */

	if (kgsl_context_detached(context))

		return -EINVAL;

		return -ENOENT;



	ret = adreno_drawctxt_wait(ADRENO_DEVICE(device), context,

		timestamp, msecs);
@@ -2412,8 +2412,8 @@ static int adreno_waittimestamp(struct kgsl_device *device, 
 * @type: Type of timestamp to read

 * @timestamp: The out parameter where the timestamp is read

 */

int __adreno_readtimestamp(struct kgsl_device *device, int index, int type,

		unsigned int *timestamp)

static int __adreno_readtimestamp(struct kgsl_device *device, int index,

				int type, unsigned int *timestamp)

{

	int status = 0;

drivers/gpu/msm/adreno_a3xx.c

+4 −4
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ int adreno_a3xx_pwron_fixup_init(struct adreno_device *adreno_dev) 
 * a3xx_gpudev_init() - Initialize gpudev specific fields

 * @adreno_dev: Pointer to adreno device

 */

void a3xx_gpudev_init(struct adreno_device *adreno_dev)

static void a3xx_gpudev_init(struct adreno_device *adreno_dev)

{

	struct adreno_gpudev *gpudev;

	const struct adreno_reg_offsets *reg_offsets;
@@ -678,7 +678,7 @@ static int a3xx_rb_init(struct adreno_device *adreno_dev, 
 * @adreno_dev: Pointer to device

 * @bit: Interrupt bit

 */

void a3xx_err_callback(struct adreno_device *adreno_dev, int bit)

static void a3xx_err_callback(struct adreno_device *adreno_dev, int bit)

{

	struct kgsl_device *device = &adreno_dev->dev;

	unsigned int reg;
@@ -1176,7 +1176,7 @@ static struct adreno_perfcounters a3xx_perfcounters = { 
	ARRAY_SIZE(a3xx_perfcounter_groups),

};



struct adreno_ft_perf_counters a3xx_ft_perf_counters[] = {

static struct adreno_ft_perf_counters a3xx_ft_perf_counters[] = {

	{KGSL_PERFCOUNTER_GROUP_SP, SP_ALU_ACTIVE_CYCLES},

	{KGSL_PERFCOUNTER_GROUP_SP, SP0_ICL1_MISSES},

	{KGSL_PERFCOUNTER_GROUP_SP, SP_FS_CFLOW_INSTRUCTIONS},
@@ -1449,7 +1449,7 @@ static unsigned int a3xx_register_offsets[ADRENO_REG_REGISTER_MAX] = { 
				A3XX_VBIF_XIN_HALT_CTRL1),

};



const struct adreno_reg_offsets a3xx_reg_offsets = {

static const struct adreno_reg_offsets a3xx_reg_offsets = {

	.offsets = a3xx_register_offsets,

	.offset_0 = ADRENO_REG_REGISTER_MAX,

};

drivers/gpu/msm/adreno_a3xx_snapshot.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "kgsl_snapshot.h"

#include "a3xx_reg.h"

#include "adreno_snapshot.h"

#include "adreno_a3xx.h"



/*

 * Set of registers to dump for A3XX on snapshot.

drivers/gpu/msm/adreno_a4xx.c

+3 −3
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static void a4xx_start(struct adreno_device *adreno_dev) 
 * @adreno_dev: Pointer to device

 * @bit: Interrupt bit

 */

void a4xx_err_callback(struct adreno_device *adreno_dev, int bit)

static void a4xx_err_callback(struct adreno_device *adreno_dev, int bit)

{

	struct kgsl_device *device = &adreno_dev->dev;

	unsigned int reg;
@@ -908,7 +908,7 @@ static unsigned int a4xx_register_offsets[ADRENO_REG_REGISTER_MAX] = { 
				A4XX_VBIF_XIN_HALT_CTRL1),

};



const struct adreno_reg_offsets a4xx_reg_offsets = {

static const struct adreno_reg_offsets a4xx_reg_offsets = {

	.offsets = a4xx_register_offsets,

	.offset_0 = ADRENO_REG_REGISTER_MAX,

};
@@ -1228,7 +1228,7 @@ static struct adreno_perfcounters a4xx_perfcounters = { 
	ARRAY_SIZE(a4xx_perfcounter_groups),

};



struct adreno_ft_perf_counters a4xx_ft_perf_counters[] = {

static struct adreno_ft_perf_counters a4xx_ft_perf_counters[] = {

	{KGSL_PERFCOUNTER_GROUP_SP, A4XX_SP_ALU_ACTIVE_CYCLES},

	{KGSL_PERFCOUNTER_GROUP_SP, A4XX_SP0_ICL1_MISSES},

	{KGSL_PERFCOUNTER_GROUP_SP, A4XX_SP_FS_CFLOW_INSTRUCTIONS},

drivers/gpu/msm/adreno_a4xx_snapshot.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "kgsl_snapshot.h"

#include "a4xx_reg.h"

#include "adreno_snapshot.h"

#include "adreno_a4xx.h"



/*

 * Set of registers to dump for A4XX on snapshot.