From patchwork Mon Feb 10 12:32:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 231981 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, 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 245E1C352A3 for ; Mon, 10 Feb 2020 12:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8B9724649 for ; Mon, 10 Feb 2020 12:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338462; bh=XPfElYvjqyDIFhV1HdPIJGkgIMrVb2nmpoZao//rNLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ElBe/8LjhTaxzJz6DUG+mq+1+pnwrlR898cS1rClR8ZwEjT3vwsIfRgD03ZkiPJZC CPPCzieibMNX76NXPrWBvw2QHXMTXfEiPj47RmV0OUUty5ER1T8RIdRmVM+oBpbHHK y52uUDlKzoYMGAlvFyaW+THX9wnjDGdP8yiA7Fu8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729859AbgBJMlA (ORCPT ); Mon, 10 Feb 2020 07:41:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:42010 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728360AbgBJMk7 (ORCPT ); Mon, 10 Feb 2020 07:40:59 -0500 Received: from localhost (unknown [209.37.97.194]) (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 0D1EC21569; Mon, 10 Feb 2020 12:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338459; bh=XPfElYvjqyDIFhV1HdPIJGkgIMrVb2nmpoZao//rNLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iBwTjdyEy8odI5rKuNFj4fHRpBNBd/cfw77T+u+pnX8Bkm/n9IVwcuqkS0J5CTua9 BOff7vQ7/K7y72SgNM1rKyA/zg2PnocBW5whROWeR6N4PHrNFmTGEUeLE1zH+8MLOi IhhM7rqq/2RWEBDx59ElKdhAmkDL1pq9hAUFTxrs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Rosin , Claudiu Beznea , Sam Ravnborg , Boris Brezillon Subject: [PATCH 5.5 214/367] drm: atmel-hlcdc: prefer a lower pixel-clock than requested Date: Mon, 10 Feb 2020 04:32:07 -0800 Message-Id: <20200210122444.015154257@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peter Rosin commit 51a19d150b520f6cb42143f3bdffacd3c33d7ac5 upstream. The intention was to only select a higher pixel-clock rate than the requested, if a slight overclocking would result in a rate significantly closer to the requested rate than if the conservative lower pixel-clock rate is selected. The fixed patch has the logic the other way around and actually prefers the higher frequency. Fix that. Signed-off-by: Peter Rosin Signed-off-by: Claudiu Beznea Signed-off-by: Sam Ravnborg Fixes: 9946a3a9dbed ("drm/atmel-hlcdc: allow selecting a higher pixel-clock than requested") Reported-by: Claudiu Beznea Tested-by: Claudiu Beznea Cc: Boris Brezillon Cc: # v4.20+ Link: https://patchwork.freedesktop.org/patch/msgid/1576672109-22707-6-git-send-email-claudiu.beznea@microchip.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -121,8 +121,8 @@ static void atmel_hlcdc_crtc_mode_set_no int div_low = prate / mode_rate; if (div_low >= 2 && - ((prate / div_low - mode_rate) < - 10 * (mode_rate - prate / div))) + (10 * (prate / div_low - mode_rate) < + (mode_rate - prate / div))) /* * At least 10 times better when using a higher * frequency than requested, instead of a lower.