Merge "msm: kgsl: Get active count in KGSL_PROP_PWRCTRL setproperty"

This commit is contained in:
Linux Build Service Account 2014-07-20 06:38:46 -07:00 committed by Gerrit - the friendly Code Review server
commit 5cb85cfd1f

View file

@ -2186,8 +2186,11 @@ static int adreno_setproperty(struct kgsl_device_private *dev_priv,
device->pwrctrl.ctrl_flags = 0;
adreno_dev->fast_hang_detect = 1;
if (gpudev->fault_detect_start)
if (gpudev->fault_detect_start &&
!kgsl_active_count_get(&adreno_dev->dev)) {
gpudev->fault_detect_start(adreno_dev);
kgsl_active_count_put(&adreno_dev->dev);
}
kgsl_pwrscale_enable(device);
} else {