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

Commit 9fef3924 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: Do not take active count in snapshot"

parents 615e2c5c c5c17de2

drivers/gpu/msm/kgsl_snapshot.c

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

/* Copyright (c) 2012-2015, 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
@@ -661,13 +661,7 @@ int kgsl_device_snapshot(struct kgsl_device *device, 
		return -ENOMEM;

	}



	/* We need to have the GPU on for the entire snapshotting operation */



	if (kgsl_active_count_get(device)) {

		KGSL_DRV_ERR(device, "snapshot: unable to turn on the GPU\n");

		return -EINVAL;

	}



	BUG_ON(!kgsl_state_is_awake(device));

	/* increment the hang count for good book keeping */

	device->snapshot_faultcount++;
@@ -736,7 +730,6 @@ int kgsl_device_snapshot(struct kgsl_device *device, 
	 */

	queue_work(device->work_queue, &snapshot->work);

done:

	kgsl_active_count_put(device);

	return ret;

}

EXPORT_SYMBOL(kgsl_device_snapshot);