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

Commit 540e2e5c 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: Use correct offsets for VBIF counters on A4xx"

parents 9647b496 e3987f28

drivers/gpu/msm/adreno.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-2014, 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
@@ -187,6 +187,7 @@ struct adreno_device { 
	struct work_struct input_work;

	struct adreno_busy_data busy_data;

	unsigned int ram_cycles_lo;

	unsigned int starved_ram_lo;

};



/**

drivers/gpu/msm/adreno_a3xx.c

+3 −2
Original line number Diff line number Diff line
@@ -1507,7 +1507,7 @@ void a3xx_busy_cycles(struct adreno_device *adreno_dev, 
					adreno_dev->ram_cycles_lo,

					&busy->vbif_ram_cycles);

		data->vbif_starved_ram = counter_delta(adreno_dev,

					A3XX_VBIF_PERF_PWR_CNT0_LO,

					adreno_dev->starved_ram_lo,

					&busy->vbif_starved_ram);

	}

}
@@ -1964,7 +1964,8 @@ int a3xx_perfcounter_init(struct adreno_device *adreno_dev) 
		/* VBIF waiting for RAM */

		ret |= adreno_perfcounter_get(adreno_dev,

				KGSL_PERFCOUNTER_GROUP_VBIF_PWR, 0,

				NULL, NULL, PERFCOUNTER_FLAG_KERNEL);

				&adreno_dev->starved_ram_lo, NULL,

				PERFCOUNTER_FLAG_KERNEL);



		/* VBIF DDR cycles */

		ret |= adreno_perfcounter_get(adreno_dev,