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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 F2280C433DF for ; Mon, 18 May 2020 13:34:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF1E820756 for ; Mon, 18 May 2020 13:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589808869; bh=NFpR5RYPTNJzg1qjqWzk/f84o9UF3ihuf6Jo7kkmFgY=; h=Subject:To:Cc:From:Date:List-ID:From; b=tBAuZEuF72CJ0C8GO7dpsnT82t7mNKfwHJSfeK2mrMlkvJWjmT5g+EO1QgTx9GKzw QjizxWrV5CBWxahikTO08n2321IFrcxgBt5trkWP788aKUZr2iOXKc4X2ze3GNKsLL QvmI47BOYO3XncM+llRkoMTECP83N3DxIlCIWzko= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726907AbgERNe3 (ORCPT ); Mon, 18 May 2020 09:34:29 -0400 Received: from forward1-smtp.messagingengine.com ([66.111.4.223]:33167 "EHLO forward1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726726AbgERNe3 (ORCPT ); Mon, 18 May 2020 09:34:29 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id 662D419407DA; Mon, 18 May 2020 09:34:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 18 May 2020 09:34:28 -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=fm2; bh=ZjfRzb r4vHh9Iqic2CmR/xaWlaHJ8cqPOhSrzE7yWz4=; b=IluW0w7sGIWOCCMCnNaso4 mxGZ/XGDUXhlfo73eZnMR9rG1BS3NVL8O5aNdeIhO8PKqg+wvyafY0NbAgUcVaFf /oBUVxkpD7lo4+hDi7cRqVkmCpnYh67URCvt+uaxaKcc2yAnFiHSWumRr1ItO4A+ 6blyzVBW3ofurmDwE5I1YLKN6X7SreC4fIk0+zut3iMMNXvpXOHZ4AHXnOjwA6vf 7jRIba9HLmKg9oCayQjAosyjdsoBAAQEelsZIobr7EYVamMbmlHPVjOIAAQ4o4dg RReIVi9q5slYjMcrCyaSmIQkRTAbyj+lVgmt1CGr6uL/lPBJET+OwNkPpH95RndA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedruddthedgieehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtjeenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepkeejgffftefgveeggeehudfgleehkedthedtiefhie elieetveejvdfgvdeljeelnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphep keefrdekiedrkeelrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm 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 D021730663F4; Mon, 18 May 2020 09:34:27 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/amdgpu: force fbdev into vram" failed to apply to 4.19-stable tree To: alexander.deucher@amd.com, christian.koenig@amd.com Cc: From: Date: Mon, 18 May 2020 15:34:25 +0200 Message-ID: <158980886524987@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 4.19-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 a6aacb2b26e85aa619cf0c6f98d0ca77314cd2a1 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 5 May 2020 09:42:26 -0400 Subject: [PATCH] drm/amdgpu: force fbdev into vram MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We set the fb smem pointer to the offset into the BAR, so keep the fbdev bo in vram. Bug: https://bugzilla.kernel.org/show_bug.cgi?id=207581 Fixes: 6c8d74caa2fa33 ("drm/amdgpu: Enable scatter gather display support") Reviewed-by: Christian König Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 9ae7b61f696a..25ddb482466a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -133,8 +133,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, u32 cpp; u64 flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS | - AMDGPU_GEM_CREATE_VRAM_CLEARED | - AMDGPU_GEM_CREATE_CPU_GTT_USWC; + AMDGPU_GEM_CREATE_VRAM_CLEARED; info = drm_get_format_info(adev->ddev, mode_cmd); cpp = info->cpp[0];