Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp8474ybt; Tue, 23 Jun 2020 13:52:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0WWhEJCXiS5mxpInDzziBvL1BJk+jpec8RWY9sxn0rBkfM4IenD0iirewBLzwcBFaBEQw X-Received: by 2002:a17:906:4b16:: with SMTP id y22mr721743eju.4.1592945570109; Tue, 23 Jun 2020 13:52:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592945570; cv=none; d=google.com; s=arc-20160816; b=mCdkSRxQa4geAa3GOkdR3G1eyXbdj7AEE1on9swAIZvjQE+K6l9/ihUl63SafFqbzQ DFruTUiOibDK8bROkkZ+ynRC+bGOEOLjZlXaSB/UZifcCl10jFsOfAaZ9abUoDuAxGQV eR7RShAsAdDz9sfg03X6QLbYG3Qop3JNZz7YHJY1glaWnz9XRTNDZz0rhY+xY6rcgYL2 zbgl0YAeYYgEgjKAF97bRl94H0WwXNiQ2xOrg5s5+lvkgPk2q6tSBytD1Htox+go2evl fmMd4ESglfs9BMHu3BpwlytIFv7UD7cvk0iZkIxtrfUhXDhvVhU2khl5qrLI1gFUCbAY cDEw== 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=UplqU8UVVTsE7evjxz+l1Cazsa29GZUhXO0z8P8RjNY=; b=UTWTcBqn6zsUFlk7QbipSYK9Efp/a50/ljKhdV6qu6aaZd1FOUjYQAftq/kLW9F7rC QfLs2prLZHEb8TRuSdOdqNSX/1Gj7+VMGJaeWy9m5YCKd/uTVkLEKaINFXHpMiOqHN3n j5vuep8cRqowN4RESH4JxnX4ysMEZYFjhqK4jKgaira952AT75PxqRX4ROqWwt+uLR71 Z6PPxXj96nbHPxZqlSJ4+kS/vT3LKPCDlQFWKDg6XrxbqlVdT8lYxad1GUEWZBBsK7Qb y7K5afz4kikhzFbZYyVgfbtRd89cHSxYvT+QCECfBuSwZBspJD6xdkAN1PcxmilJli2S P79g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="Mz7Q9/jS"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mc22si11731329ejb.655.2020.06.23.13.52.26; Tue, 23 Jun 2020 13:52:50 -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="Mz7Q9/jS"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404144AbgFWUtH (ORCPT + 99 others); Tue, 23 Jun 2020 16:49:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:48178 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404132AbgFWUs4 (ORCPT ); Tue, 23 Jun 2020 16:48:56 -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 DBF972098B; Tue, 23 Jun 2020 20:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945336; bh=ldubIelhFi6phziJtpFYwyha/cUAIGDCBQl1UyKHo8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mz7Q9/jSKknWv1mITl7qx/qo3c8VQmA4WwJlNXmWY0+BbU5U7gxQqavMIFCg5k//Q o8AKQS0zffi6quaqN10PVmne+KaXvhAS5bU9HH3pwwkIDKy/1Ckjco7KAsw2lTDcg7 0Tu88x3HKfS29o0f7NEJYWJTf+Fc5ufdKnns/LlU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jernej Skrabec , Chen-Yu Tsai , Maxime Ripard , Sasha Levin Subject: [PATCH 4.14 102/136] drm/sun4i: hdmi ddc clk: Fix size of m divider Date: Tue, 23 Jun 2020 21:59:18 +0200 Message-Id: <20200623195308.807562433@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@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: 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 a1f8cba251a24..3d9148eb40a7e 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h @@ -143,7 +143,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 4692e8c345ed4..58d9557a774fe 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c @@ -32,7 +32,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