From patchwork Mon Jul 6 14:20:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 6724981 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 887969F319 for ; Mon, 6 Jul 2015 14:21:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C85F20726 for ; Mon, 6 Jul 2015 14:21:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C2C120584 for ; Mon, 6 Jul 2015 14:21:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753131AbbGFOV3 (ORCPT ); Mon, 6 Jul 2015 10:21:29 -0400 Received: from mail-qk0-f172.google.com ([209.85.220.172]:34610 "EHLO mail-qk0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753145AbbGFOV3 (ORCPT ); Mon, 6 Jul 2015 10:21:29 -0400 Received: by qkeo142 with SMTP id o142so117989902qke.1 for ; Mon, 06 Jul 2015 07:21:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DXKnU72djX69WvkWiaffkVC5Kdk6m9wFa9hLDLovKFo=; b=Er7tBZX1PQYBc59AVmOa02HU4Ep9bySwYaGG+HgmgPjDuT5/UmUKvw3SAFpmzCTnY2 2AeizNu/Dyi/HLiOPhR7CwmmlzJcwmC6yqprrqYj5Nnn3fUG2pPYTs4OyiwKYs81N5di KyURt0xGH3AwPfr8e9eLMW3a/GCUmvsTFCSTGAjvIWxhcZQC5rHXOjyML6xYEzalq/47 Ro5mk7I97oFboX2zY6WptTvCV3RguHnqmtoYRtkD7Dys5Pq0UXu/hyUBextHJ06gMRhb 5M7O3Rdkl90GtHgpec6e8CdxFlVOwHhbUiCoCSaZvIuakZtUdVmxBwQvH5Au1rciD6H6 tZNA== X-Received: by 10.140.51.106 with SMTP id t97mr72924959qga.44.1436192488579; Mon, 06 Jul 2015 07:21:28 -0700 (PDT) Received: from jade.localdomain ([191.255.48.48]) by mx.google.com with ESMTPSA id f207sm1707424qhc.41.2015.07.06.07.21.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 07:21:28 -0700 (PDT) From: Gustavo Padovan To: linux-samsung-soc@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, inki.dae@samsung.com, jy0922.shim@samsung.com, tjakobi@math.uni-bielefeld.de, Gustavo Padovan Subject: [PATCH v2 18/23] drm/exynos: remove extra call to hdmi_commit() Date: Mon, 6 Jul 2015 11:20:19 -0300 Message-Id: <1436192424-18194-19-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1436192424-18194-1-git-send-email-gustavo@padovan.org> References: <1436192424-18194-1-git-send-email-gustavo@padovan.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan hdmi_commit() was getting called twice by exynos encoder core, once inside the .enable() call and another time by .commit() itself. Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/exynos/exynos_hdmi.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index a0443dc..1fc01fe 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -2019,20 +2019,6 @@ static void hdmi_mode_set(struct exynos_drm_encoder *encoder, hdmi_v14_mode_set(hdata, mode); } -static void hdmi_commit(struct exynos_drm_encoder *encoder) -{ - struct hdmi_context *hdata = encoder_to_hdmi(encoder); - - mutex_lock(&hdata->hdmi_mutex); - if (!hdata->powered) { - mutex_unlock(&hdata->hdmi_mutex); - return; - } - mutex_unlock(&hdata->hdmi_mutex); - - hdmi_conf_apply(hdata); -} - static void hdmi_enable(struct exynos_drm_encoder *encoder) { struct hdmi_context *hdata = encoder_to_hdmi(encoder); @@ -2061,7 +2047,7 @@ static void hdmi_enable(struct exynos_drm_encoder *encoder) clk_prepare_enable(res->sclk_hdmi); hdmiphy_poweron(hdata); - hdmi_commit(encoder); + hdmi_conf_apply(hdata); } static void hdmi_disable(struct exynos_drm_encoder *encoder) @@ -2121,7 +2107,6 @@ static struct exynos_drm_encoder_ops hdmi_encoder_ops = { .mode_set = hdmi_mode_set, .enable = hdmi_enable, .disable = hdmi_disable, - .commit = hdmi_commit, }; static void hdmi_hotplug_work_func(struct work_struct *work)