From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.14 55/69] drm/i915: Fix wrong escape clock divisor init for GLK Date: Wed, 14 Aug 2019 19:01:53 +0200 Message-ID: <20190814165749.231806301@linuxfoundation.org> References: <20190814165744.822314328@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C43E6E78A for ; Wed, 14 Aug 2019 17:14:21 +0000 (UTC) In-Reply-To: <20190814165744.822314328@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: linux-kernel@vger.kernel.org Cc: Jani Nikula , Deepak M , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogU3RhbmlzbGF2IExpc292c2tpeSA8c3RhbmlzbGF2Lmxpc292c2tpeUBpbnRlbC5jb20+ Cgpjb21taXQgNzNhMGZmMGIzMGFmNzliZjAzMDNkNTU3ZWI4MmYxZDE5NDViYjZlZSB1cHN0cmVh bS4KCkFjY29yZGluZyB0byBCc3BlYyBjbG9jayBkaXZpc29yIHJlZ2lzdGVycyBpbiBHZW1pbmlM YWtlCnNob3VsZCBiZSBpbml0aWFsaXplZCBieSBzaGlmdGluZyAxKDw8KSB0byBhbW91bnQgb2Yg Y29ycmVzcG9uZGVudApkaXZpc29yLiBXaGlsZSBpOTE1IHdhcyB3cml0aW5nIGFsbCB0aGlzIHRp bWUgdGhhdCB2YWx1ZSBhcyBpcy4KClN1cnByaXNpbmdseSB0aGF0IGl0IGJ5IGFjY2lkZW50IHdv cmtlZCwgdW50aWwgd2UgbWV0IHNvbWUgaXNzdWVzCndpdGggTWljcm90ZWNoIEV0YWIuCgp2Mjog QWRkZWQgRml4ZXMgdGFnIGFuZCBjYwp2MzogQWRkZWQgc3RhYmxlIHRvIGNjIGFzIHdlbGwuCgpT aWduZWQtb2ZmLWJ5OiBTdGFuaXNsYXYgTGlzb3Zza2l5IDxzdGFuaXNsYXYubGlzb3Zza2l5QGlu dGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZhbmRpdGEgS3Vsa2FybmkgPHZhbmRpdGEua3Vsa2FybmlA aW50ZWwuY29tPgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA4ODI2CkZpeGVzOiBiY2M2NTcwMDQ4NDEgKCJkcm0vaTkxNS9nbGs6IFByb2dy YW0gdHhlc2MgY2xvY2sgZGl2aWRlciBmb3IgR0xLIikKQ2M6IERlZXBhayBNIDxtLmRlZXBha0Bp bnRlbC5jb20+CkNjOiBNYWRoYXYgQ2hhdWhhbiA8bWFkaGF2LmNoYXVoYW5AaW50ZWwuY29tPgpD YzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxq YW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5s YWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBp bnRlbC5jb20+CkNjOiBpbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCkNjOiBzdGFibGVA dmdlci5rZXJuZWwub3JnClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBp bnRlbC5jb20+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9t c2dpZC8yMDE5MDcxMjA4MTkzOC4xNDE4NS0xLXN0YW5pc2xhdi5saXNvdnNraXlAaW50ZWwuY29t CihjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IGNlNTJhZDVkZDUyY2ZhZjMzOTgwNTgzODRlMGZm OTQxMzRiYmQ4OWMpClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91 bmRhdGlvbi5vcmc+CgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaV9wbGwuYyB8 ICAgIDQgKystLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMo LSkKCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaV9wbGwuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kc2lfcGxsLmMKQEAgLTQyMiw4ICs0MjIsOCBAQCBzdGF0 aWMgdm9pZCBnbGtfZHNpX3Byb2dyYW1fZXNjX2Nsb2NrKHN0CiAJZWxzZQogCQl0eGVzYzJfZGl2 ID0gMTA7CiAKLQlJOTE1X1dSSVRFKE1JUElPX1RYRVNDX0NMS19ESVYxLCB0eGVzYzFfZGl2ICYg R0xLX1RYX0VTQ19DTEtfRElWMV9NQVNLKTsKLQlJOTE1X1dSSVRFKE1JUElPX1RYRVNDX0NMS19E SVYyLCB0eGVzYzJfZGl2ICYgR0xLX1RYX0VTQ19DTEtfRElWMl9NQVNLKTsKKwlJOTE1X1dSSVRF KE1JUElPX1RYRVNDX0NMS19ESVYxLCAoMSA8PCAodHhlc2MxX2RpdiAtIDEpKSAmIEdMS19UWF9F U0NfQ0xLX0RJVjFfTUFTSyk7CisJSTkxNV9XUklURShNSVBJT19UWEVTQ19DTEtfRElWMiwgKDEg PDwgKHR4ZXNjMl9kaXYgLSAxKSkgJiBHTEtfVFhfRVNDX0NMS19ESVYyX01BU0spOwogfQogCiAv KiBQcm9ncmFtIEJYVCBNaXBpIGNsb2NrcyBhbmQgZGl2aWRlcnMgKi8KCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28FCEC433FF for ; Wed, 14 Aug 2019 17:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF6C820665 for ; Wed, 14 Aug 2019 17:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802865; bh=6x8AFhRj1EO0tbyspskxethUmHszG//jXzxC6/aIAZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VLG3Y7tRQF0QhWhFP+Xt/od1xRAwKqLGcp6VSP9/fAv99kK3ZChLumYFvfmwE1ML5 vC2aabnlGZc60cXRu2ejBKVDpWspCxYrzROZda0SePTjigNdGHVmAyXtpR1GK5mkK+ /OEWsyiAoJZ8pjGB2oXSleri4Ehf3LMFLsu8Z4bw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731074AbfHNROY (ORCPT ); Wed, 14 Aug 2019 13:14:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:38830 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731064AbfHNROW (ORCPT ); Wed, 14 Aug 2019 13:14:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A46B8208C2; Wed, 14 Aug 2019 17:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802861; bh=6x8AFhRj1EO0tbyspskxethUmHszG//jXzxC6/aIAZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MzidlgLApAojs+ubixfblFgL23Brmyr7xMf7thT3YW6aKrDVe5XhBd0SsyiA00Wlu Dx99wFOc/6xMvCKaUNSJyw4m/9WVeLrGfW5FkHNA0ZzVl8ze0wE+II3hoUCuf+n8QK t6209uqeKpdVVIWOh6CTSMNbT5EmufkmQyrx/ZhA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanislav Lisovskiy , Vandita Kulkarni , Deepak M , Madhav Chauhan , Jani Nikula , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , intel-gfx@lists.freedesktop.org Subject: [PATCH 4.14 55/69] drm/i915: Fix wrong escape clock divisor init for GLK Date: Wed, 14 Aug 2019 19:01:53 +0200 Message-Id: <20190814165749.231806301@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165744.822314328@linuxfoundation.org> References: <20190814165744.822314328@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stanislav Lisovskiy commit 73a0ff0b30af79bf0303d557eb82f1d1945bb6ee upstream. According to Bspec clock divisor registers in GeminiLake should be initialized by shifting 1(<<) to amount of correspondent divisor. While i915 was writing all this time that value as is. Surprisingly that it by accident worked, until we met some issues with Microtech Etab. v2: Added Fixes tag and cc v3: Added stable to cc as well. Signed-off-by: Stanislav Lisovskiy Reviewed-by: Vandita Kulkarni Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108826 Fixes: bcc657004841 ("drm/i915/glk: Program txesc clock divider for GLK") Cc: Deepak M Cc: Madhav Chauhan Cc: Jani Nikula Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20190712081938.14185-1-stanislav.lisovskiy@intel.com (cherry picked from commit ce52ad5dd52cfaf3398058384e0ff94134bbd89c) Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_dsi_pll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/i915/intel_dsi_pll.c +++ b/drivers/gpu/drm/i915/intel_dsi_pll.c @@ -422,8 +422,8 @@ static void glk_dsi_program_esc_clock(st else txesc2_div = 10; - I915_WRITE(MIPIO_TXESC_CLK_DIV1, txesc1_div & GLK_TX_ESC_CLK_DIV1_MASK); - I915_WRITE(MIPIO_TXESC_CLK_DIV2, txesc2_div & GLK_TX_ESC_CLK_DIV2_MASK); + I915_WRITE(MIPIO_TXESC_CLK_DIV1, (1 << (txesc1_div - 1)) & GLK_TX_ESC_CLK_DIV1_MASK); + I915_WRITE(MIPIO_TXESC_CLK_DIV2, (1 << (txesc2_div - 1)) & GLK_TX_ESC_CLK_DIV2_MASK); } /* Program BXT Mipi clocks and dividers */