Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1815220pxb; Thu, 16 Sep 2021 16:43:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhRHhGtju6ic5x1XCxHfJYp+puK6qosatThcM/tOwjlqSNcFZcNmHeWCarqeWQ784aB6Y5 X-Received: by 2002:a02:908a:: with SMTP id x10mr6353023jaf.30.1631835808126; Thu, 16 Sep 2021 16:43:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631835808; cv=none; d=google.com; s=arc-20160816; b=dpXAhkbJJxaO7CE06LN1/IInuUuP69ps6QJ0e8AAbaekKSggXGoXks8whtheh5gGFO FvS5GK+HcLJmnW8k99zxrnsqzJibd+Kp46RLoalOp4sOWQBC8Ps5g8Miwey26B4Raa4m IXfLfq1OnOdF5a5gmJILKUOh6SXA9Oi4diM1tCONKrtrYWGV7uP76/2iTVT1pzU3j17U tj6idSxQmJV79a26Nd2RpwO33q10F9GyZ4T4NNCq2djXcZhoA3MqggCWNARogv1ttljT RziZ9tPgxMqqlbKgWTTBEKqnH4sVEL3mOF2CHICFPeffHRCrGDQwXfJGzNCji/VxI/92 uDdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ubthc/AHCYfKOOaFXSEV8tAE/Rm2xQ/Zsb68SxDj+R8=; b=Nt/tz4JpfoqpeWKKheiJDBvWATRPcVwCVhoOjGWy2sB++875/0kK7VhX9NWIHC8VOB L08y6rj3WWJ7AeqNGCkH8tx/J0rz3P0teH7B/qO4LlP3ZManEqeZ44oYerThfL6TxvFH IAOh1BbhZN+2SVGTPviOML8O1LTz+X5m2vMwjB1EhbwT+mHYIDsD7CudOWq8daDejMAg OFVbcUmLba6lxR8Aq0YITxExdgPe7bMBT0FILPMvExQKhYI0ZezhIxUXoWPINTx7BJMH JlR1+vfk3f8RGrb2OyTqlqPIpT91CyT7WbfDMVS4BC1C9oi8VKiWUEGVYzT0WpnYnpfp N2TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ai2KgHut; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k64si746430iof.8.2021.09.16.16.43.16; Thu, 16 Sep 2021 16:43:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ai2KgHut; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344795AbhIPRHW (ORCPT + 99 others); Thu, 16 Sep 2021 13:07:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:34050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348493AbhIPRC7 (ORCPT ); Thu, 16 Sep 2021 13:02:59 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 03E3561B25; Thu, 16 Sep 2021 16:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810041; bh=h8kVdUEkVzsjqaVb1iR/iLwVz0RLom4uufhPCsCk83Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ai2KgHutogFvjjsBMuMxRH2jsLcoZD9KLSljE0Q/8nBF+DoKJzbLXE/3NlyE8+PK4 R0ytOH7DHfFGtrOB7ho1+p822Z9f3Tgkv6OU2xPOaqn4Ji+1Dfi83NlxFxLQVmoN9/ 0GoUecQHGtb7RHgoePB9ZASODyvU6a6sPOJVow40= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aaron Liu , Huang Rui , Alex Deucher Subject: [PATCH 5.13 376/380] drm/amd/display: setup system context for APUs Date: Thu, 16 Sep 2021 18:02:13 +0200 Message-Id: <20210916155816.840875841@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aaron Liu commit 3ca001aff0878546494d7f403334c8d987924977 upstream. Scatter/gather is APU feature starting from carrizo. adev->apu_flags is not used for all APUs. adev->flags & AMD_IS_APU can be used for all APUs. Signed-off-by: Aaron Liu Reviewed-by: Huang Rui Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1176,7 +1176,7 @@ static int amdgpu_dm_init(struct amdgpu_ dc_hardware_init(adev->dm.dc); #if defined(CONFIG_DRM_AMD_DC_DCN) - if (adev->apu_flags) { + if ((adev->flags & AMD_IS_APU) && (adev->asic_type >= CHIP_CARRIZO)) { struct dc_phy_addr_space_config pa_config; mmhub_read_system_context(adev, &pa_config);