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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 06973C433E3 for ; Wed, 19 Aug 2020 13:25:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D93E0205CB for ; Wed, 19 Aug 2020 13:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597843541; bh=zp9MF1H2QrZ84daL6ySpKWvt6cbluWhB3bWG64gfLHk=; h=Subject:To:Cc:From:Date:List-ID:From; b=bcYYXCarkrRmlpuHFMeWalRBCbPxFPH+7YRRAcig5z547F53Mrac4xUgSAedgB8PA rwBjbfz4Ss9pLtGWvaxFS/dm/FUACJpMsNt2ngxcft4NEccAMuPQYvUn00N2M8Cqdc aiCZETKtyFLMUTd5HLIziqtoWVBrZtI2lHR3iDws= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728366AbgHSNZj (ORCPT ); Wed, 19 Aug 2020 09:25:39 -0400 Received: from wforward3-smtp.messagingengine.com ([64.147.123.22]:37807 "EHLO wforward3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728516AbgHSNYT (ORCPT ); Wed, 19 Aug 2020 09:24:19 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.west.internal (Postfix) with ESMTP id B5CF5C36; Wed, 19 Aug 2020 09:24:17 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 19 Aug 2020 09:24:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=w0QqPd ekdxRMpKzYGE6tSy0HBtAosxQeGdGKr2Ou3Nw=; b=JpeCPbI2lydb0/KBRLfQP5 LEXLmDWt9NZJTMm4lcTL9ym8arqcAf/A/EPYI1P1wU/dc3dnYeURmdjr3hL9BmDf Ob2qKXHEoo/KEiuMUvHVlorkhYQ2lUdEuQ556+Es/sJp9/m4ZxIEgHVRPqCwuD0X in5ilwGaa3HhOoZHejM6NIOflwigpMrKaQT5kbB9+icG0rPEZmQGX4ugfkXkKF7O EYT8NvB2JXEvwnax2lp1a743VXZAWwllsb1YukRJSQXZoiw7DrliH6h+Bhi57YxS 580kFYkUJPTmepsA33I26Wcpl6hZqVIjLPleOK7bJt7i/LeK3oIpBB/AvSQDZEWQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedruddtkedggeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepkefhhfefgfefheeffedugeeuvddvvefggffftdduue ejhffhgfevuedtvddtjefgnecuffhomhgrihhnpehfrhgvvgguvghskhhtohhprdhorhhg necukfhppeekfedrkeeirdekledruddtjeenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 389393280064; Wed, 19 Aug 2020 09:24:14 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/ast: Initialize DRAM type before posting GPU" failed to apply to 5.8-stable tree To: tzimmermann@suse.de, airlied@redhat.com, benh@kernel.crashing.org, daniel.vetter@ffwll.ch, emil.l.velikov@gmail.com, joel@jms.id.au, kraxel@redhat.com, sam@ravnborg.org, stable@vger.kernel.org, yc_chen@aspeedtech.com Cc: From: Date: Wed, 19 Aug 2020 15:24:36 +0200 Message-ID: <159784347624436@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.8-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 244d012801dae30c91983b360457c78d481584b0 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Thu, 16 Jul 2020 14:53:52 +0200 Subject: [PATCH] drm/ast: Initialize DRAM type before posting GPU Posting the GPU requires the correct DRAM type to be stored in struct ast_private. Therefore first initialize the DRAM info and then post the GPU. This restores the original order of instructions in this function. Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg Acked-by: Benjamin Herrenschmidt Fixes: bad09da6deab ("drm/ast: Fixed vram size incorrect issue on POWER") Cc: Joel Stanley Cc: Y.C. Chen Cc: Benjamin Herrenschmidt Cc: Dave Airlie Cc: Thomas Zimmermann Cc: Gerd Hoffmann Cc: Daniel Vetter Cc: Sam Ravnborg Cc: Emil Velikov Cc: "Y.C. Chen" Cc: # v4.11+ Link: https://patchwork.freedesktop.org/patch/msgid/20200716125353.31512-6-tzimmermann@suse.de diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index b162cc82204d..87e5baded2a7 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -418,15 +418,15 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags) ast_detect_chip(dev, &need_post); - if (need_post) - ast_post_gpu(dev); - ret = ast_get_dram_info(dev); if (ret) goto out_free; drm_info(dev, "dram MCLK=%u Mhz type=%d bus_width=%d\n", ast->mclk, ast->dram_type, ast->dram_bus_width); + if (need_post) + ast_post_gpu(dev); + ret = ast_mm_init(ast); if (ret) goto out_free;