From patchwork Mon May 27 11:58:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 165207 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp7069401ili; Mon, 27 May 2019 04:58:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqzQKR6Xh5lBgVbkLtYRp63Jz7YsS+ZFCGI5z2ae1SzT+PfYwxPBvr19DZjKAYXmzYoyYeiz X-Received: by 2002:a17:902:3064:: with SMTP id u91mr19186459plb.244.1558958331752; Mon, 27 May 2019 04:58:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558958331; cv=none; d=google.com; s=arc-20160816; b=uEW6FQEgc6yPjQKgKdzykg/z7tF/rmN4B0cO5I6nKXMGidQJ5zfKB+KP7zIx4BjBYX 1b8g6alk+pYVtnO/U/OlloHsUHzzmWIXkxb6Klcq9NF3eQXIlIxNhffzx8HNliwIFXeI d2HQ3QgiVqekY+2qpAOxnjfcZDg1EMpRdwChxb42Hix55/TMe5oMBiQFILv66vHxfPOj WHoBE803R0LSl9JrnDX3DnSgbkmzVNWQ5K249zkhJ7I2+sHoc8M1sPW66mezebziXBIj yRXlHzR0T2Q309PoeoCuRTZ89nT7St9RJyOIbSIDgovMNfXTfA8Rerdt0rfvXRzzlJSf 3PKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=CHNiLECO7COJeJykJENYiJJ3vrh3cyTCAguGAsVnNK8=; b=C2FgHI3ZEWbGVPpPsqyoR6n7D39nX/7Vm03Emusy+AwYZILeMBVhT2sels0r6kUF+m 3YaNeJ6Zq55q2I2fBX4qLk7Doec/q49HD0P+fsG5HRkmm64yiZ82XboWhA/fYPl1YW7N IpqamOMWgqPwFXaudLO60wMk3ruDJxWZ26+hgLtXf35QmBM0IDRO2/k//V7kEFdYJrsu xZtY3YFGrAA2MJDr8Frs8QpCfTVOQ7YwDfCuxmOSP+US0m82A2rhd/W7Om05OprzvAQQ DI9Am+30cmOrt5vT3VaUaN4/cAgTJHLOcWRIxI0WOnJBVQPS+losAGdbVo9XKsn/4wKj pbPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=tg2zDJoO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z33si15499102pgk.516.2019.05.27.04.58.51; Mon, 27 May 2019 04:58:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@st.com header.s=STMicroelectronics header.b=tg2zDJoO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727038AbfE0L6u (ORCPT + 30 others); Mon, 27 May 2019 07:58:50 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:23442 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726063AbfE0L6u (ORCPT ); Mon, 27 May 2019 07:58:50 -0400 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4RBqHta004118; Mon, 27 May 2019 13:58:37 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=STMicroelectronics; bh=CHNiLECO7COJeJykJENYiJJ3vrh3cyTCAguGAsVnNK8=; b=tg2zDJoONVSJEtDceghChtbL1O2vw81Tyd4NdODekOXiJzVpk2S/HtQ51BLR+lPFK8W8 1yEOdH+MMu7kjaFpNVrBCOonUMEH6uS1ZeLgYr2keJZlGnKfR530U17kWDkTRAgkfw7t i0YsN4zStVhAbPiDFefzLknaw3G1DbBwxiS/OetzihCaIraCIpmMwlvrZ07HkrdhKn/N uU26gPuiccaXbcCRq/+xxq152uiZYl63BJtp7ShiUtErfPXC7SIQ2gtegYyxmUL4bg5R HmYYjXp06iCTa5NzTp0+1bnjZ9aJWEJLgkf+PodDjij2fyY0S5NnhR9Y8CVLmbsFaN+j 6A== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2sptu9k0sp-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 27 May 2019 13:58:37 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4E78138; Mon, 27 May 2019 11:58:35 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas21.st.com [10.75.90.44]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 2CF622A01; Mon, 27 May 2019 11:58:35 +0000 (GMT) Received: from SAFEX1HUBCAS22.st.com (10.75.90.93) by SAFEX1HUBCAS21.st.com (10.75.90.44) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 27 May 2019 13:58:34 +0200 Received: from localhost (10.201.20.122) by Webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 27 May 2019 13:58:34 +0200 From: Benjamin Gaignard To: , , , , CC: , , , , Benjamin Gaignard Subject: [PATCH] drm/stm: ltdc: restore calls to clk_{enable/disable} Date: Mon, 27 May 2019 13:58:30 +0200 Message-ID: <20190527115830.15836-1-benjamin.gaignard@st.com> X-Mailer: git-send-email 2.15.0 MIME-Version: 1.0 X-Originating-IP: [10.201.20.122] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-27_07:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benjamin Gaignard Restore calls to clk_{enable/disable} deleted after applying the wrong version of the patch Fixes: fd6905fca4f0 ("drm/stm: ltdc: remove clk_round_rate comment") Signed-off-by: Benjamin Gaignard --- drivers/gpu/drm/stm/ltdc.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.15.0 diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c index ae2aaf2a62ee..ac29890edeb6 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -507,10 +507,12 @@ static bool ltdc_crtc_mode_fixup(struct drm_crtc *crtc, struct ltdc_device *ldev = crtc_to_ltdc(crtc); int rate = mode->clock * 1000; + clk_disable(ldev->pixel_clk); if (clk_set_rate(ldev->pixel_clk, rate) < 0) { DRM_ERROR("Cannot set rate (%dHz) for pixel clk\n", rate); return false; } + clk_enable(ldev->pixel_clk); adjusted_mode->clock = clk_get_rate(ldev->pixel_clk) / 1000;