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=-8.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,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 01EF7C31E5B for ; Mon, 17 Jun 2019 21:21:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8AA7208CB for ; Mon, 17 Jun 2019 21:21:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806510; bh=velIhUKy6AIG4rUQNiehLtNEbg7Pq6v2sXH3kCwIP2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=d9Y0sKNRRZID9+LN5NEdteFes5XJXFGKmdBUC1zsqVg3NVIdQxkON7hjk3k1TZbPO Ffu6tA6uA9tXxsIqs+W9TfYySFLtuYWn0M+ruWOPJoTbxsl0wm8fvvo5GMJZgQ+4pf BIclb9Nfxf1Mk0vtbxwT4Q8k1MDPZPoHsA9sSEVw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729409AbfFQVVt (ORCPT ); Mon, 17 Jun 2019 17:21:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:46340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727479AbfFQVVs (ORCPT ); Mon, 17 Jun 2019 17:21:48 -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 7D8BF2089E; Mon, 17 Jun 2019 21:21:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806508; bh=velIhUKy6AIG4rUQNiehLtNEbg7Pq6v2sXH3kCwIP2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RoLN8f+akNIVARTOxQty84ZPd9E4mFPvN8o1iJkBQGXy5KHp4F9fYSHVf06TRkUZz J0roBvHqYwND19GbumKhP15KvkPb/4rQi5qrSRh2knttgZuBD4WcDEKEGEFT5zbIFQ Pj3vst+bCTrzZbzoav4uz4tOVAOgUXKmHqKlmDSo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Flora Cui , Feifei Xu , Alex Deucher , Sasha Levin Subject: [PATCH 5.1 075/115] drm/amdgpu: keep stolen memory on picasso Date: Mon, 17 Jun 2019 23:09:35 +0200 Message-Id: <20190617210803.859605462@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210759.929316339@linuxfoundation.org> References: <20190617210759.929316339@linuxfoundation.org> User-Agent: quilt/0.66 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 [ Upstream commit 379109351f4f6f2405cf54e7a296055f589c3ad1 ] otherwise screen corrupts during modprobe. Signed-off-by: Flora Cui Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 2fe8397241ea..1611bef19a2c 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -715,6 +715,7 @@ static bool gmc_v9_0_keep_stolen_memory(struct amdgpu_device *adev) case CHIP_VEGA10: return true; case CHIP_RAVEN: + return (adev->pdev->device == 0x15d8); case CHIP_VEGA12: case CHIP_VEGA20: default: -- 2.20.1