Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <9c8d928d-f322-e9aa-c811-28682ca70f04@amd.com>
Date:   Wed, 29 Mar 2023 08:08:40 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.13.1
Subject: Re: [PATCH 2/2] drm/amdgpu: Remove ASPM workaround on VI and NV
Content-Language: en-US
To:     Kai-Heng Feng <kai.heng.feng@canonical.com>,
        alexander.deucher@amd.com, christian.koenig@amd.com,
        Xinhui.Pan@amd.com
Cc:     David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
        Hawking Zhang <Hawking.Zhang@amd.com>,
        Likun Gao <Likun.Gao@amd.com>,
        Felix Kuehling <Felix.Kuehling@amd.com>,
        Victor Zhao <Victor.Zhao@amd.com>,
        Jack Xiao <Jack.Xiao@amd.com>,
        Somalapuram Amaranath <Amaranath.Somalapuram@amd.com>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Mario Limonciello <mario.limonciello@amd.com>,
        Lijo Lazar <lijo.lazar@amd.com>,
        YiPeng Chai <YiPeng.Chai@amd.com>,
        Andrey Grodzovsky <andrey.grodzovsky@amd.com>,
        Bokun Zhang <Bokun.Zhang@amd.com>,
        Guchun Chen <guchun.chen@amd.com>,
        Veerabadhran Gopalakrishnan <veerabadhran.gopalakrishnan@amd.com>,
        Evan Quan <evan.quan@amd.com>, amd-gfx@lists.freedesktop.org,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
References: <20230329095933.1203559-1-kai.heng.feng@canonical.com>
 <20230329095933.1203559-2-kai.heng.feng@canonical.com>
From:   "Gong, Richard" <richard.gong@amd.com>
In-Reply-To: <20230329095933.1203559-2-kai.heng.feng@canonical.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b1JKNVhWZWo5ZWJwKzR5MkpaNG5RTWdhaUtZcjBoU09iVjUzT1FXN0FIc1hW?=
 =?utf-8?B?Mnd3YnlkR3hrTml6VzFDU3pGVnNTOTBtVXBEbURSbkhKK2E1dFk4TGVrSHBQ?=
 =?utf-8?B?WEVtSWM0cmw3ZkJvU2tHOGJrZkdYTDBKU3V5TERmcGc2cCtFb2ZXeWREc3NV?=
 =?utf-8?B?dXYycE45eDl2MzlLUmRyS3hUZlZLcHBxRkNsa08xRUZUWFQvSE9GdDFsZGFY?=
 =?utf-8?B?OG5MeVhaL3h3Vy9HVGpML1BadEljYzdDRUpUTGhMc05oazdzdzVmOC9FUUtx?=
 =?utf-8?B?TkFFeGgzQjBtYVhsRTMyd1lQY2pCZ1JZc1VhWldHOGF3ZjVFZ1MvdDRQcGdi?=
 =?utf-8?B?WnFyTHRWSFAyRUFzam16ZVJqTERaVS9jdFR2VFFPTHdwcVR4aDRkRzJWNStY?=
 =?utf-8?B?RU5FZHlva3Jlb0RnVVpVZ0dmUzlqcFR2a2E1QW82VEMzRXBrNWt4Unl6RndH?=
 =?utf-8?B?WlFiQk9nNW1PVW5ZRG1RSVpZbzFqTG9ESjUxY3A3ZlEwVVlKMGlNTzgyRXM4?=
 =?utf-8?B?YUxrZktzZWdNWUc5QkY2ajNCMjZMOXRYVndmdzl5dmxCbmtUWUFuUSsrMHM0?=
 =?utf-8?B?M1IxV3p2UmxZVG94RUZDZEZ3MmU4VElYdC9BdU1FM2p0ajFaZUdtQ05URE56?=
 =?utf-8?B?VnhYQ3MvZTVLL2pUbHpUUkszcW8ycGRhdnFsd2JBVGxpUGlqUmc2dVBUZ0Yy?=
 =?utf-8?B?bzliYTQ5RXA0NzlYRWI2cEpoYTN1OTVxc29BcDlFZXJOZmZrMEpwY1o1TS83?=
 =?utf-8?B?ZDhmaURWcnVHNXdleUxpcUtjNkdJSEorNzNDOHpGQ2pMTjZaSDNPRGphZG5F?=
 =?utf-8?B?bjNzRXhRRDltQzgwNFpUNGhXNXExNmtjdkoySkdIdThFYkNHcWxQTHZVZ0Zq?=
 =?utf-8?B?KzdHdkd2M2JVdlNXd1NUS2hOQkFSTDFGQlZUZGxPbVhtNExSb0gwMGUvRDR4?=
 =?utf-8?B?YUhYdlF5bkdPZXhoeGVSaUxaV3YwQWpZTTBBejJ5RG1USWdMTDd2NDFXc0Zs?=
 =?utf-8?B?Rm1PNWFZRDNNMFByVHZJSTFuUDRodkRkTnQvV1FBV3RqVEZVVmZFUGhRcU9n?=
 =?utf-8?B?dFFQUGd3ODB6Qnd1UC92SU9LTm5GbXJtS0E5d2ttTU4rU3FuZVVnbHl6ak5h?=
 =?utf-8?B?MlpzNWZzNExaSjVwUW4xNjkvMkdJMUM4VnlEbWR2dU41alN3aGY1ZWxqdFkv?=
 =?utf-8?B?T250M2xxRUp4b3A4bW9TVjMvUk1waVc3WEN6TDRHR1k2UHRtN3MvWUdXazN6?=
 =?utf-8?B?dGs4YmEwOVJES0dRSzlLSnMya1hSc3FqdFJlRkg3RVFCdWhoVnZFR29odE1O?=
 =?utf-8?B?OXBDY0NnNXUzWGNzT0tzRzhiUkIweGZKUSsrUmJObUh3K1N4cDlIZ2tCVkhS?=
 =?utf-8?B?Q3YxUEJJRTBsV3JYSnRWT0VQaVA5bFpNb3pKT01TQ2JwZjdRY0hTaURIQzNy?=
 =?utf-8?B?TEcxUGZKK1I3T3BSNmJwc1U3T2dWZnBwR0krOXNFZ0FVSVk4SFpwVFBlV0FF?=
 =?utf-8?B?SS91eGlpWmxWUmY2czR3MHprSzZXcnJUNFJKQW44U1BjTkFmbXh3ZWtMMTJk?=
 =?utf-8?B?KzhlYjM1d0prVE52TDB5QjVpM3V2ZTNTWGRheEVlT0o5QVdIemVxNDdkL2JY?=
 =?utf-8?B?YllmaHFSQjNPRVloakNJUnRxRkRJd1VHWHM5Y1FVYUR4N2VyR1RwZFA0eHBo?=
 =?utf-8?B?eGJxdkVXeU9SbWxyU0dtNllGTW1yVkpraWhqSFpZekxGdVkvQk01OXZ5Rzg4?=
 =?utf-8?B?amJZb2d3aEg5UndyRXpvL3ZvMDJ1WUNKRkZDTnYwdW94Zzdjb0E5b1ZtNzRI?=
 =?utf-8?B?M21NK3ljc3FRczBuYjVDMlc5TndLNDZXdVdDZGd4N1VGZTdIYVFhU3JqQzRx?=
 =?utf-8?B?VXROeGtzMW05ZjJtNlEvQllydFhnZVRoUGVGbXRaa1VIb2w4ZmdJVUdOb1lK?=
 =?utf-8?B?akF0STVCd3hsNHN4R3g2MGxvVk5lMEVuaG5RbkpKNC9vWTlsWjd5Y2N2Wlhi?=
 =?utf-8?B?RFZUdm1UamhZKzJ2V2k2WEFXUDF3aEViSmFyQ3RhWXF5b094R2tSTHJDSmVJ?=
 =?utf-8?B?OVg4QjhVa0NJZWF2OWlDYmlNak5ndmVQRFZBTThKYy9FY0Z4cXBiN0k1aTFS?=
 =?utf-8?B?SCtOSHJVQU1jVzdDUDJnN2RHRllXU1NUaXJJaVJVWGN2Ulkrc1lHTThmM2VF?=
 =?utf-8?Q?BILT1T9cWo3ISf+yycVUqSS4a8kRjFcHo75BjFhTEqUD?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8c6e1013-ee34-44c7-23a2-08db3056b925
X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB6253.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2023 13:08:43.7315
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eTpXnIX89y1HUL4wJy5XHwmIueHqUmutkaJ08QkOH7txVz/epPJsvchb/W0xJ/OQzvP+qkqOW75QgJiv0owVKg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8328
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,SPF_HELO_PASS,
        SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 3/29/2023 4:59 AM, Kai-Heng Feng wrote:
> Since the original issue is resolved by a new fix, the ASPM workaround
> can be dropped.
What is the new fix? Can you elaborate more or add the new fix commit here?
>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu.h        |  1 -
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 ---------------
>   drivers/gpu/drm/amd/amdgpu/nv.c            |  2 +-
>   drivers/gpu/drm/amd/amdgpu/vi.c            |  2 +-
>   4 files changed, 2 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 8cf2cc50b3de..a19a6489b117 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1248,7 +1248,6 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);
>   int amdgpu_device_pci_reset(struct amdgpu_device *adev);
>   bool amdgpu_device_need_post(struct amdgpu_device *adev);
>   bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);
> -bool amdgpu_device_aspm_support_quirk(void);
>   
>   void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes,
>   				  u64 num_vis_bytes);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index d56b7a2bafa6..0cacace2d6c2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -81,10 +81,6 @@
>   
>   #include <drm/drm_drv.h>
>   
> -#if IS_ENABLED(CONFIG_X86)
> -#include <asm/intel-family.h>
> -#endif
> -
>   MODULE_FIRMWARE("amdgpu/vega10_gpu_info.bin");
>   MODULE_FIRMWARE("amdgpu/vega12_gpu_info.bin");
>   MODULE_FIRMWARE("amdgpu/raven_gpu_info.bin");
> @@ -1377,17 +1373,6 @@ bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev)
>   	return pcie_aspm_enabled(adev->pdev);
>   }
>   
> -bool amdgpu_device_aspm_support_quirk(void)
> -{
> -#if IS_ENABLED(CONFIG_X86)
> -	struct cpuinfo_x86 *c = &cpu_data(0);
> -
> -	return !(c->x86 == 6 && c->x86_model == INTEL_FAM6_ALDERLAKE);
> -#else
> -	return true;
> -#endif
> -}
> -
>   /* if we get transitioned to only one device, take VGA back */
>   /**
>    * amdgpu_device_vga_set_decode - enable/disable vga decode
> diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
> index 47420b403871..15f3c6745ea9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
> @@ -522,7 +522,7 @@ static int nv_set_vce_clocks(struct amdgpu_device *adev, u32 evclk, u32 ecclk)
>   
>   static void nv_program_aspm(struct amdgpu_device *adev)
>   {
> -	if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk())
> +	if (!amdgpu_device_should_use_aspm(adev))
>   		return;
>   
>   	if (!(adev->flags & AMD_IS_APU) &&
> diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
> index 531f173ade2d..81dcb1148a60 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vi.c
> @@ -1122,7 +1122,7 @@ static void vi_program_aspm(struct amdgpu_device *adev)
>   	bool bL1SS = false;
>   	bool bClkReqSupport = true;
>   
> -	if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk())
> +	if (!amdgpu_device_should_use_aspm(adev))
>   		return;
>   
>   	if (adev->flags & AMD_IS_APU ||