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

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

Merge "ARM: dts: msm: Enable GPU NAP state on SDM660"

parents bdec82ff fa48f3ab

arch/arm/boot/dts/qcom/sdm660-gpu.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 


		/* <HZ/12> */

		qcom,idle-timeout = <80>;

		qcom,no-nap;



		qcom,highest-bank-bit = <14>;

drivers/gpu/msm/adreno_a5xx.c

+2 −1
Original line number Diff line number Diff line
@@ -1639,7 +1639,8 @@ static void a5xx_pwrlevel_change_settings(struct adreno_device *adreno_dev, 
static void a5xx_clk_set_options(struct adreno_device *adreno_dev,

	const char *name, struct clk *clk)

{

	if (adreno_is_a540(adreno_dev)) {

	/* Handle clock settings for GFX PSCBCs */

	if (adreno_is_a540(adreno_dev) || adreno_is_a512(adreno_dev)) {

		if (!strcmp(name, "mem_iface_clk")) {

			clk_set_flags(clk, CLKFLAG_NORETAIN_PERIPH);

			clk_set_flags(clk, CLKFLAG_NORETAIN_MEM);