Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp972682ybt; Wed, 17 Jun 2020 19:32:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXE6Gcf0aZZrBPu/U5PTJGqmL2peAdsdD0XOS/jzpGe0RHoTrXBGm0PVO6rEl6fz/Ki6Uy X-Received: by 2002:a17:906:9397:: with SMTP id l23mr2050531ejx.79.1592447548599; Wed, 17 Jun 2020 19:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592447548; cv=none; d=google.com; s=arc-20160816; b=A3SivXWzkUFR7EBPHEybzzIaNkGdRUHGr4PjBpglIR3DZGqG6+zLigCukNv/SAYW1O jeyIFwKcYqEmkVNAJsKsX2Y2tH4m7cvYnJcM74ls5lYFXX1+csmGAGzeC2vckoRNjJX0 C6OhGDPMS9IfrBv0vWDlduyN3RVO2n1SwD+lLWzInmDrHn83jM4ANECf2t/uoIKpOyL+ ef6E8n3hLim0PiObX4Tbg6c0X/oMcPMqP0SnD1WJORNvxvOq1InHVYoMWZncdYJjitDU xunZ/hj5HiPnR1Fy437hn6Spx4g4wAnQ6K1AcsxCCZROuD5ENTdO0wQALqLwNn/NcrS2 hZ1A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=stjWA9PjywBPefOHbRtCULhXH7/FosccgPtd/g6DFWk=; b=OJK1XfnwGnc4Jgy5mp5LDt6IqgEfWcMGktLnOnBlsqcMg4taQiiwTqioCXyejBA5Px pRHorjilqOGlvWT1DuO3eeb/AzpXVy3srRbyJUSF7bMqy228FI4I41t0PQ+VW6fJnwwO 1tG1Z6DRXbe7x+6hTI7vvrYLtq5VFOYZDXKXQx10TIkTksNH0bJ+jRumiARe4qb+y0oT ecIsMvR9mKnp/RMYtVyvqJ4AXjeynYLfE4HTwhhxFb6zz2hClZEqDj8QuQ03rCpHKtvq /SWEv9FkuS2bgAo4ZSuXsAril4/6X+KHwImrb/PL7cLbkQE2q0Wwkf1Jq3CMk3LgsbCO MmVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ajg9zMXo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cf29si1121314edb.419.2020.06.17.19.32.06; Wed, 17 Jun 2020 19:32:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ajg9zMXo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729548AbgFRC3v (ORCPT + 99 others); Wed, 17 Jun 2020 22:29:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:46498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729149AbgFRBQF (ORCPT ); Wed, 17 Jun 2020 21:16:05 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 594E821D7E; Thu, 18 Jun 2020 01:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442965; bh=LhWCgqMpOimMUIh/VYqwEEVS7oF4YKfUj2TxcSiqHWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ajg9zMXoZxqCDKv/BrESYzlXrE9U3txM37zo6XSP/sqXrYW6cLra/ZbVKk/DiQJyt LIgOUIqjiGplfg9Fn6mziK2/Z52+1skZFUtG+H5sE6kF0fakIJ1dHfkgctV8Dgg+lS vpnp8lvrPCgi3MAHRX71/8VTpyTXMQhp/+uGgG+w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jernej Skrabec , Chen-Yu Tsai , Maxime Ripard , Sasha Levin , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.7 370/388] drm/sun4i: hdmi ddc clk: Fix size of m divider Date: Wed, 17 Jun 2020 21:07:47 -0400 Message-Id: <20200618010805.600873-370-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jernej Skrabec [ Upstream commit 54e1e06bcf1cf6e7ac3f86daa5f7454add24b494 ] m divider in DDC clock register is 4 bits wide. Fix that. Fixes: 9c5681011a0c ("drm/sun4i: Add HDMI support") Signed-off-by: Jernej Skrabec Reviewed-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20200413095457.1176754-1-jernej.skrabec@siol.net Signed-off-by: Sasha Levin --- drivers/gpu/drm/sun4i/sun4i_hdmi.h | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi.h b/drivers/gpu/drm/sun4i/sun4i_hdmi.h index 7ad3f06c127e..00ca35f07ba5 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h @@ -148,7 +148,7 @@ #define SUN4I_HDMI_DDC_CMD_IMPLICIT_WRITE 3 #define SUN4I_HDMI_DDC_CLK_REG 0x528 -#define SUN4I_HDMI_DDC_CLK_M(m) (((m) & 0x7) << 3) +#define SUN4I_HDMI_DDC_CLK_M(m) (((m) & 0xf) << 3) #define SUN4I_HDMI_DDC_CLK_N(n) ((n) & 0x7) #define SUN4I_HDMI_DDC_LINE_CTRL_REG 0x540 diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c index 2ff780114106..12430b9d4e93 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c @@ -33,7 +33,7 @@ static unsigned long sun4i_ddc_calc_divider(unsigned long rate, unsigned long best_rate = 0; u8 best_m = 0, best_n = 0, _m, _n; - for (_m = 0; _m < 8; _m++) { + for (_m = 0; _m < 16; _m++) { for (_n = 0; _n < 8; _n++) { unsigned long tmp_rate; -- 2.25.1