Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1069329ybl; Wed, 14 Aug 2019 10:12:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZWu45nk2N04BdVfrpWxwccfD24jBLWtD/kke/rjJa0GpjE2fXhGzhtKK8DhOzhHakdipl X-Received: by 2002:a17:90a:8c90:: with SMTP id b16mr696867pjo.133.1565802729866; Wed, 14 Aug 2019 10:12:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565802729; cv=none; d=google.com; s=arc-20160816; b=nZIhVgiUFznZ5DtkQ8qbrhfZaZbTHOO+ND7epbtzFyJaWwN3ugPgNyFKImtde4rD+R Hi3krv+INuCytkuqz794iKGE/bkm7ILJkIvIdVdWAqOtvClfvA199bWNbqGfNBr8N8w2 CuCYUXKqcn7SozKfwsh3eaN/KjGrL0Qx6dx9qmmMtuICa/q+mFqgRdErNARY6Z/bTJSp bO10I1C1Yqc3tvrgV2V7wcm4cJQBZRnUoFQLSqLEEvr42vKJg4y/BqTQajExy9PHzK+5 wm60xpX/HTplCdaYco3va1CuMG+iySvhBqXSVQqgapIRrbO1xfXpMk4zbSUIPEqljg7V d9JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ILxDTCrxkkfpUD3kiTnWkpyClL21u0sJWhdT8C7fhQ8=; b=yssmOPs0PbF/VwQEdZZBwq8/2EtL377DnQFkoxKDA5fJIpZqUsVeW3MPtP4gxSWZ5V HzwZ2NHJYOnIyPKxv9mI6nAbyQVS/EQPZvheRxKSvAMArd9y+J2RXJcp680CKSsyAGJ7 XNXctIr1dt/cmT2EsDhtstsztuG0G5CjdCmdnc5hIEX8+KKbGnkq3vM8iUegqnVRqZ2H DWQHOwWhjlH2RK7nqx5Ip/KCwLT33UCSuyF3EYw1KMhk7Phb8K9QnK7AKXSgl/VJNtji SqrL0rtCOH5hBzYSpNz3UyK6/dwqfqQaHvEMONnBj8fYNtvfED5tzdllb2t6BSmUwDpq mMLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2jGM1++9; 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 16si64986pfc.213.2019.08.14.10.11.54; Wed, 14 Aug 2019 10:12:09 -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=@kernel.org header.s=default header.b=2jGM1++9; 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 S1729579AbfHNRLX (ORCPT + 99 others); Wed, 14 Aug 2019 13:11:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:34582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730579AbfHNRLU (ORCPT ); Wed, 14 Aug 2019 13:11:20 -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 32CBF2084D; Wed, 14 Aug 2019 17:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565802679; bh=rjddxsjkbCSnuJKV0HAoHUNmScnWMLNIN/aIj+jKF10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2jGM1++9BeRhiZlqXi6tTd81y0CF8ruAqpgi+HlEnLyXFVpI4x0ocq4WAiXI2qZ3y sW1b8uZoBd+6u8DS7b2484ok8zyXenjZGGsgDHz56O+Yk3Wf0t8GZZhL5aV1np0oNV brhtjKdu5ua8pd42A5xoDQv5tj89Rm4PeWnD7BcE= 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.19 76/91] drm/i915: Fix wrong escape clock divisor init for GLK Date: Wed, 14 Aug 2019 19:01:39 +0200 Message-Id: <20190814165753.012400453@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814165748.991235624@linuxfoundation.org> References: <20190814165748.991235624@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/vlv_dsi_pll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/i915/vlv_dsi_pll.c +++ b/drivers/gpu/drm/i915/vlv_dsi_pll.c @@ -413,8 +413,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 */