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

Commit c727f1ca 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: Use a pre-initialization device state"

parents 885170fb cd727c6e

drivers/gpu/msm/kgsl_device.h

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

/* Copyright (c) 2002,2007-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
@@ -399,7 +399,7 @@ struct kgsl_device { 
	.wait_queue = __WAIT_QUEUE_HEAD_INITIALIZER((_dev).wait_queue),\

	.active_cnt_wq = __WAIT_QUEUE_HEAD_INITIALIZER((_dev).active_cnt_wq),\

	.mutex = __MUTEX_INITIALIZER((_dev).mutex),\

	.state = KGSL_STATE_INIT,\

	.state = KGSL_STATE_NONE,\

	.ver_major = DRIVER_VERSION_MAJOR,\

	.ver_minor = DRIVER_VERSION_MINOR

drivers/gpu/msm/kgsl_pwrctrl.c

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

/* Copyright (c) 2010-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
@@ -1757,7 +1757,8 @@ int _suspend(struct kgsl_device *device) 
{

	int ret = 0;



	if (KGSL_STATE_SUSPEND == device->state)

	if ((KGSL_STATE_SUSPEND == device->state) ||

		(KGSL_STATE_NONE == device->state))

		return ret;



	/* drain to prevent from more commands being submitted */