From patchwork Wed Aug 7 12:53:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Kumar K X-Patchwork-Id: 19595 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1V73Ea-0000SO-7r; Wed, 07 Aug 2013 14:53:00 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1V73EY-0005sZ-76; Wed, 07 Aug 2013 14:52:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932896Ab3HGMw4 (ORCPT + 1 other); Wed, 7 Aug 2013 08:52:56 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:46191 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932738Ab3HGMwz (ORCPT ); Wed, 7 Aug 2013 08:52:55 -0400 Received: by mail-pa0-f45.google.com with SMTP id bg4so2123247pad.4 for ; Wed, 07 Aug 2013 05:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=CjXni3wwqeM4qhUeS7oYqcbvlmvKVmgCjxuCBJvQ/4o=; b=baHY9/TmPGsQ1Ojty+kPY7/JYJ+bO6YhyGNZRq0C55Ti7v/q3KSFHlfuDSVy2QWaYz 83eaGIRDfvYOp0688pHU/v9eZ7RfCnUTiAPUb2hmZknVC0EpvnAnMjzRS5TqLUj9PMUS /eQr+9hqbDfe0r5yRdlHQiui1eWweVvqzZudM2NwBQD2CgLWbMxs4l7oZ+1FE4G9d43D tTtSgDpdJVq+UegzB1cJQFqrb8OR1IJm5gwx1juZiMkQFm3M0ol24siRQww9/QIDnoDB wZ8fejHjoTCscmgih1GaOgSMoyKmpZKREOkRtE3dt4uw45aYi4KOFL54V2cUdob46nqg c26Q== X-Received: by 10.68.111.34 with SMTP id if2mr482490pbb.83.1375879974607; Wed, 07 Aug 2013 05:52:54 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id r7sm10298914pao.18.2013.08.07.05.52.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 Aug 2013 05:52:53 -0700 (PDT) From: Arun Kumar K To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: s.nawrocki@samsung.com, prathyush.k@samsung.com, arun.m@samsung.com, arunkk.samsung@gmail.com Subject: [PATCH] [media] exynos-gsc: fix s2r functionality Date: Wed, 7 Aug 2013 18:23:04 +0530 Message-Id: <1375879984-19052-1-git-send-email-arun.kk@samsung.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.8.7.123317 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1700_1799 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, FROM_NAME_PHRASE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_NOT_1 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Prathyush K When gsc is in runtime suspended state, there is no need to call m2m_suspend during suspend and similarily, there is no need to call m2m_resume during resume if already in runtime suspended state. This patch adds the necessary conditions to achieve this. Signed-off-by: Prathyush K Signed-off-by: Arun Mankuzhi Signed-off-by: Arun Kumar K --- drivers/media/platform/exynos-gsc/gsc-core.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index 559fab2..fe69eae 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1210,12 +1210,12 @@ static int gsc_resume(struct device *dev) spin_unlock_irqrestore(&gsc->slock, flags); return 0; } - gsc_hw_set_sw_reset(gsc); - gsc_wait_reset(gsc); - spin_unlock_irqrestore(&gsc->slock, flags); - return gsc_m2m_resume(gsc); + if (!pm_runtime_suspended(dev)) + return gsc_runtime_resume(dev); + + return 0; } static int gsc_suspend(struct device *dev) @@ -1227,7 +1227,10 @@ static int gsc_suspend(struct device *dev) if (test_and_set_bit(ST_SUSPEND, &gsc->state)) return 0; - return gsc_m2m_suspend(gsc); + if (!pm_runtime_suspended(dev)) + return gsc_runtime_suspend(dev); + + return 0; } static const struct dev_pm_ops gsc_pm_ops = {