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

Commit c1a59856 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: Disable GPU software clockgating on A540"

parents 90ef75e9 0eabd97c

Documentation/devicetree/bindings/gpu/adreno.txt

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ Optional Properties: 
- qcom,idle-timeout:	   This property represents the time in milliseconds for idle timeout.

- qcom,deep-nap-timeout:   This property represents the time in milliseconds for entering deeper

			   power state.

- qcom,no-nap:		   If it exists software clockgating will be disabled at boot time.

- qcom,chipid:		   If it exists this property is used to replace

			   the chip identification read from the GPU hardware.

			   This is used to override faulty hardware readings.

drivers/gpu/msm/kgsl_pwrctrl.c

+5 −1
Original line number Diff line number Diff line
@@ -1802,6 +1802,9 @@ int kgsl_pwrctrl_init(struct kgsl_device *device) 


	pwr->power_flags = BIT(KGSL_PWRFLAGS_RETENTION_ON);



	if (of_property_read_bool(pdev->dev.of_node, "qcom,no-nap"))

		device->pwrctrl.ctrl_flags |= BIT(KGSL_PWRFLAGS_NAP_OFF);



	if (pwr->num_pwrlevels == 0) {

		KGSL_PWR_ERR(device, "No power levels are defined\n");

		return -EINVAL;
@@ -2606,7 +2609,8 @@ void kgsl_active_count_put(struct kgsl_device *device) 
			device->requested_state == KGSL_STATE_NONE) {

			kgsl_pwrctrl_request_state(device, KGSL_STATE_NAP);

			kgsl_schedule_work(&device->idle_check_ws);

		}

		} else if (!nap_on)

			kgsl_pwrscale_update_stats(device);



		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);