From patchwork Wed Aug 5 23:24:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 6954951 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5545CC05AE for ; Wed, 5 Aug 2015 23:24:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65C1F2066C for ; Wed, 5 Aug 2015 23:24:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D4CD020668 for ; Wed, 5 Aug 2015 23:24:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FCE06EA37; Wed, 5 Aug 2015 16:24:47 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f170.google.com (mail-yk0-f170.google.com [209.85.160.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 028946EA39 for ; Wed, 5 Aug 2015 16:24:45 -0700 (PDT) Received: by ykcq64 with SMTP id q64so44047459ykc.2 for ; Wed, 05 Aug 2015 16:24:44 -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=OE+Fjayaa5iIXJ9i4KVWJJDNdCvgoedNO99UinXdlx4=; b=mpcH61YisxFVUkNTo78iWR0p+beMnzVad6FqTzYhVUBK3cRv6coOgprVRs/oHRGgsH aCD6Z1gVWnGM+2e58b617CqXVzbRkmVQqdqo7hhc4ZMt2n/qX+eR+C4a1RdyNZLX2RuV f1nXd6o9RGe2Qdn/0Vgpgz+E42Ofp/HqnZJrk85Lh08URCYzpNb+vEegue5ewGXR5P2F aw7CgLRs8Xwjv5+IiGrOEx+4ZaCHqi+kd8BTvElorAB91xIQydmdVqzf8w1HJoEp2dZE hL+XassISO5KDxgIET/a1DT3xL2z4ufzD5DNoUE1z5yYcapIa5gxSspYmwpD13MH8xQ+ +Vug== X-Received: by 10.170.151.196 with SMTP id s187mr11832018ykc.107.1438817084322; Wed, 05 Aug 2015 16:24:44 -0700 (PDT) Received: from jade.localdomain ([187.64.235.140]) by smtp.gmail.com with ESMTPSA id u186sm4327588ywa.4.2015.08.05.16.24.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Aug 2015 16:24:43 -0700 (PDT) From: Gustavo Padovan To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 06/11] drm/exynos: remove extra call to hdmi_commit() Date: Wed, 5 Aug 2015 20:24:17 -0300 Message-Id: <1438817060-22164-7-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1438817060-22164-1-git-send-email-gustavo@padovan.org> References: <1438817060-22164-1-git-send-email-gustavo@padovan.org> Cc: tjakobi@math.uni-bielefeld.de, Gustavo Padovan , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 1aed7ea..11bac50 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -1711,16 +1711,6 @@ static void hdmi_mode_set(struct exynos_drm_encoder *encoder, hdata->cea_video_id = drm_match_cea_mode(mode); } -static void hdmi_commit(struct exynos_drm_encoder *encoder) -{ - struct hdmi_context *hdata = encoder_to_hdmi(encoder); - - if (!hdata->powered) - return; - - hdmi_conf_apply(hdata); -} - static void hdmi_enable(struct exynos_drm_encoder *encoder) { struct hdmi_context *hdata = encoder_to_hdmi(encoder); @@ -1744,7 +1734,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) @@ -1798,7 +1788,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)