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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 CF809C433FE for ; Mon, 7 Dec 2020 15:59:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 18D9A23731 for ; Mon, 7 Dec 2020 15:59:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 18D9A23731 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0S7lkOxjJf/o+UkeZFFPAvligUj3dcxTBfdCIbW+PDg=; b=eVfv8T8qGRl2mfFdi2/Hj3nf2 0snY1vDLBfbmWXU7ZbD8O7NEC7kTLuFdhY81I04OzyxiWhdA9c7qGiVP833nsX8pZTg35316tJgiD AUq/NAae94GmM+TgNYTNhTJ84mIqgQY35FoUvtsgSJZ0mV3pxmKqsi/v6mn8AndeI2Ayql83k/K19 LdwP7tvSGhcrn58gfjh44Dw+JZlYVzww2ZRwMM2x/89S4ab20BZpuWW653ZpqPgVFlJHWLPtUkhU3 umugDl6DWIiMMPiMWqHo7rsTes/9ez9tlNfb7U8VSbVFNiSDggCb+hliDyzZfwhfDpctySZ02HhtP +M1WXcuXA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmItY-0004zt-Vv; Mon, 07 Dec 2020 15:57:49 +0000 Received: from new3-smtp.messagingengine.com ([66.111.4.229]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmItB-0004rF-DT; Mon, 07 Dec 2020 15:57:28 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 40CE158032D; Mon, 7 Dec 2020 10:57:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 07 Dec 2020 10:57:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=OdBDmnWruLtXn 5QoiUIiA+CX0Vd/A2CPhgP7L/v2rBo=; b=pLmc2s0j0xklXbfrgHX2/opQnGysy tFqQLPtp8nCZQgEuH9KR+7Coa7JezYaq4JE2KrZsS7sBEnqp5+/ywcehYB8/11Cv Cz25Rx40DTCIt/T95qQA8FVJbssSaRKunz4X5xDjMQrn6S3tzv5otWwsorKXO0lE bJXe/APf3GhH/+RbXTbTok2d4zUyZvReNPbXHACy74rvmUvzrmex/rtOtrBbIV4Y q+x2Ye/pwI0stVKG8DRk05EqnF8NAPuLcMxXSofvTOdao9JTEJp9SrgKIW6lVdJA GKQN/t4dYsQBdpINChIdjKAXhcCut7CQ+V23FDgyXicxKV3s+0eEkv8FA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=OdBDmnWruLtXn5QoiUIiA+CX0Vd/A2CPhgP7L/v2rBo=; b=cSDiQOgu 162kduMdfMOQzLt+UlEKS5+iCJ3tcT9NAsFBRnEkOCnDUEQM6pxQGM/hbZ4aBN0A g4NzcM+zNmsTzXdC63oTJerWbI6ut3K2CY5AlhHOvqQI7J7m0OhRGG/FHwpouC+9 tX9J+dUHxa04TKVCH3IHHwLhg/QBWzvo5yeBIRsXmXQfHlXg7IntGsWDxZ69Psnr Dwih5du36BTOW9oA83lY/e9PgWX9qv4oWnPmW1/JPuWg9f4GsSiSphq0flG6BLSn ehevxf1ccHZDPHkGLzHD2QS/NQJY/OQKhGGSXxtgKYMXCQgJu9c+c319qfmIRPkw lXsgYQrrCAQWCQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejgedgkedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecukfhppeeltddrkeelrdeikedrjeeinecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: from localhost (lfbn-tou-1-1502-76.w90-89.abo.wanadoo.fr [90.89.68.76]) by mail.messagingengine.com (Postfix) with ESMTPA id DB91C1080063; Mon, 7 Dec 2020 10:57:24 -0500 (EST) From: Maxime Ripard To: Daniel Vetter , David Airlie , Eric Anholt , Maarten Lankhorst , Thomas Zimmermann , Maxime Ripard Subject: [PATCH v5 3/9] drm/vc4: hdmi: Take into account the clock doubling flag in atomic_check Date: Mon, 7 Dec 2020 16:57:13 +0100 Message-Id: <20201207155719.17149-4-maxime@cerno.tech> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201207155719.17149-1-maxime@cerno.tech> References: <20201207155719.17149-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201207_105725_578521_68304D05 X-CRM114-Status: GOOD ( 11.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rpi-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Dave Stevenson Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Reported-by: Thomas Zimmermann Fixes: 63495f6b4aed ("drm/vc4: hdmi: Make sure our clock rate is within limits") Signed-off-by: Maxime Ripard --- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 5a608ed1d75e..a88aa20beeb6 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -796,6 +796,9 @@ static int vc4_hdmi_encoder_atomic_check(struct drm_encoder *encoder, pixel_rate = mode->clock * 1000; } + if (mode->flags & DRM_MODE_FLAG_DBLCLK) + pixel_rate = pixel_rate * 2; + if (pixel_rate > vc4_hdmi->variant->max_pixel_clock) return -EINVAL; -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel