Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3000613ybi; Mon, 17 Jun 2019 14:24:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAchVnii+tYUS2xDOGkXgHarh1rsw9sR82kr+RHeop6JdyPAmu9i0K8d1PYM8ZXaA1Fk/7 X-Received: by 2002:a17:902:7083:: with SMTP id z3mr45481021plk.205.1560806644768; Mon, 17 Jun 2019 14:24:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560806644; cv=none; d=google.com; s=arc-20160816; b=ggRXqX2hjGssDz7ii1v8r10jM3h7kogezL7WexkJBqr+TbCgc4l1TFqkgbEOXBRrDh g1qW+B8+/eZ51tEoZlMffwODajA5wyWAPBTeZI7qHZQ550p6Lttb9JK7oFm5JlVqlBfO 7WbRGzOt7/Fu7q+j2ZT/BHQmAiF+CthXFf3q1po6J9kuvusH6ZApXgt2b6bvx8hVcJr2 xgZotbsv/ZsXpvyStq9KrvzjibdD2XlAi1eihqeIKhMDC8r/pg+lKpaNeu79URS9a2h8 A9HZMNNzfk8A2U3kXfONQESF8icCl5JKn1FDEX+DtIC9iklWRI4Yjy+dhd6qzsbumdKF MJ7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fZALpCIHIOt+4GuOTy4i1Uo6BGpPM0ObdSGxaYz60O8=; b=sOq/FApfDQQ3S9Bh/n63Y20UDAW21Ra6FEi7Q34rKALQVThRTFIATtXnhMqGRIgKXZ 6cp1hn0kciwTSJKGuMiwXBMSLtcicoBAY6rRTsMdyJB9DRdoiqBmJIAOz/PX5B9fnRB6 7S72zUeErzc5jdpaQUufTeFiSBJqtT3ge17I2ZAMDy+sBYkjgc71BVbmYCG7Emhv5HY9 tLfjd3xQa5c17ZnW8EXlxikWS20hyFgSsAqNZ3XhsVSz1F5UqsXcaTdjtK2gD2jd91+P VMl64JG7GKVEl4NEHXo0HsnTSwRc5UcAtrzoLkw3fHgHxC9kTMJp7tPEl71EJOChmALv pcUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RoLN8f+a; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w11si372343pjq.17.2019.06.17.14.23.49; Mon, 17 Jun 2019 14:24:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RoLN8f+a; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729436AbfFQVV5 (ORCPT + 99 others); Mon, 17 Jun 2019 17:21:57 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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