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

Commit d2838fd0 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: Add apb_pclk to the clock list and increase max clock count"

parents 2c79fa65 77531780

drivers/gpu/msm/kgsl_gmu.h

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

/* Copyright (c) 2017-2018, 2020, 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
@@ -142,7 +142,7 @@ struct rpmh_votes_t { 
	struct gmu_bw_votes cnoc_votes;

};



#define MAX_GMU_CLKS 6

#define MAX_GMU_CLKS 7

#define DEFAULT_GMU_FREQ_IDX 1



/*

drivers/gpu/msm/kgsl_pwrctrl.c

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2020, 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
@@ -61,7 +61,8 @@ static const char * const clocks[] = { 
	"rbcpr_clk",

	"iref_clk",

	"gmu_clk",

	"ahb_clk"

	"ahb_clk",

	"apb_pclk",

};



static unsigned long ib_votes[KGSL_MAX_BUSLEVELS];

drivers/gpu/msm/kgsl_pwrctrl.h

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

/* Copyright (c) 2010-2020, 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
@@ -25,7 +25,7 @@ 


#define KGSL_PWR_ON	0xFFFF



#define KGSL_MAX_CLKS 16

#define KGSL_MAX_CLKS 17

#define KGSL_MAX_REGULATORS 2



#define KGSL_MAX_PWRLEVELS 10