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

Commit bc447332 authored by Harshdeep Dhatt's avatar Harshdeep Dhatt
Browse files

msm: kgsl: Remove icc path from gmu device 



Instead, use the pwr->icc_path as both are for gpu ddr
voting.

Change-Id: I0f2b1e49dde9433ee062bbf71d7197d8e2ea7a83
Signed-off-by: default avatarHarshdeep Dhatt <hdhatt@codeaurora.org>
parent e91214d3

drivers/gpu/msm/kgsl_gmu.c

+3 −6
Original line number Diff line number Diff line
@@ -1390,8 +1390,6 @@ static int gmu_probe(struct kgsl_device *device, struct device_node *node) 


	gmu->num_gpupwrlevels = pwr->num_pwrlevels + 1;



	gmu->icc_path = of_icc_get(&gmu->pdev->dev, NULL);



	/* Populates RPMh configurations */

	ret = gmu_rpmh_init(device, gmu);

	if (ret)
@@ -1572,7 +1570,7 @@ static int gmu_start(struct kgsl_device *device) 


		/* Vote for minimal DDR BW for GMU to init */

		level = pwr->pwrlevels[pwr->default_pwrlevel].bus_min;

		icc_set_bw(gmu->icc_path, 0,

		icc_set_bw(pwr->icc_path, 0,

			MBps_to_icc(pwr->ddr_table[level]));



		ret = gmu_dev_ops->rpmh_gpu_pwrctrl(device, GMU_FW_START,
@@ -1650,6 +1648,7 @@ static void gmu_stop(struct kgsl_device *device) 
{

	struct gmu_device *gmu = KGSL_GMU_DEVICE(device);

	struct gmu_dev_ops *gmu_dev_ops = GMU_DEVICE_OPS(device);

	struct kgsl_pwrctrl *pwr = &device->pwrctrl;

	int ret = 0;



	if (!test_bit(GMU_CLK_ON, &device->gmu_core.flags))
@@ -1676,7 +1675,7 @@ static void gmu_stop(struct kgsl_device *device) 
	gmu_disable_clks(device);

	gmu_disable_gdsc(gmu);



	icc_set_bw(gmu->icc_path, 0, 0);

	icc_set_bw(pwr->icc_path, 0, 0);

	return;



error:
@@ -1710,8 +1709,6 @@ static void gmu_remove(struct kgsl_device *device) 


	clear_bit(ADRENO_ACD_CTRL, &adreno_dev->pwrctrl_flag);



	icc_put(gmu->icc_path);



	if (gmu->fw_image) {

		release_firmware(gmu->fw_image);

		gmu->fw_image = NULL;

drivers/gpu/msm/kgsl_gmu.h

+1 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */

#ifndef __KGSL_GMU_H

#define __KGSL_GMU_H
@@ -210,8 +210,6 @@ struct gmu_device { 
	unsigned long kmem_bitmap;

	const struct gmu_vma_entry *vma;

	unsigned int log_wptr_retention;

	/** @icc_path: Interconnect path for the GMU */

	struct icc_path *icc_path;

};



struct gmu_memdesc *gmu_get_memdesc(struct gmu_device *gmu,