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

This project is archived. Its data is read-only.

Commit 401f8950 authored Jun 29, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jun 29, 2018

Merge "drm/msm: Register GPU devfreq to allow thermal mitigation"

parents 94aa6577 f5a70edb

drivers/gpu/drm/msm/adreno/a3xx_gpu.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		* Copyright (C) 2013 Red Hat
		* Author: Rob Clark <robdclark@gmail.com>
		*
		* Copyright (c) 2014 The Linux Foundation. All rights reserved.
		* Copyright (c) 2014,2018 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 as published by
		@@ -483,8 +483,6 @@ struct msm_gpu a3xx_gpu_init(struct drm_device dev)
		adreno_gpu = &a3xx_gpu->base;
		gpu = &adreno_gpu->base;

		a3xx_gpu->pdev = pdev;

		gpu->perfcntrs = perfcntrs;
		gpu->num_perfcntrs = ARRAY_SIZE(perfcntrs);

drivers/gpu/drm/msm/adreno/a3xx_gpu.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		* Copyright (C) 2013 Red Hat
		* Author: Rob Clark <robdclark@gmail.com>
		*
		* Copyright (c) 2018 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 as published by
		* the Free Software Foundation.
		@@ -28,7 +30,6 @@

		struct a3xx_gpu {
		struct adreno_gpu base;
		struct platform_device *pdev;

		/* if OCMEM is used for GMEM: */
		uint32_t ocmem_base;

drivers/gpu/drm/msm/adreno/a4xx_gpu.c

+1 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014 The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014,2018 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
		@@ -560,8 +560,6 @@ struct msm_gpu a4xx_gpu_init(struct drm_device dev)
		adreno_gpu = &a4xx_gpu->base;
		gpu = &adreno_gpu->base;

		a4xx_gpu->pdev = pdev;

		gpu->perfcntrs = NULL;
		gpu->num_perfcntrs = 0;

drivers/gpu/drm/msm/adreno/a4xx_gpu.h

+1 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014 The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014,2018 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
		@@ -23,7 +23,6 @@

		struct a4xx_gpu {
		struct adreno_gpu base;
		struct platform_device *pdev;

		/* if OCMEM is used for GMEM: */
		uint32_t ocmem_base;

drivers/gpu/drm/msm/adreno/a5xx_counters.c

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017 The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018 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
		@@ -225,7 +225,7 @@ static void a5xx_counter_enable_alwayson_power(struct msm_gpu *gpu,
		static u64 a5xx_counter_read(struct msm_gpu *gpu,
		struct adreno_counter_group *group, int counterid)
		{
		if (counterid >= group->nr_counters)
		if (counterid < 0 \|\| counterid >= group->nr_counters)
		return 0;

		return gpu_read64(gpu, group->counters[counterid].lo,