lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 002/148] drm/amdgpu: make sure to init common IP before gmc
    Date
    From: Alex Deucher <alexander.deucher@amd.com>

    [ Upstream commit a8671493d2074950553da3cf07d1be43185ef6c6 ]

    Move common IP init before GMC init so that HDP gets
    remapped before GMC init which uses it.

    This fixes the Unsupported Request error reported through
    AER during driver load. The error happens as a write happens
    to the remap offset before real remapping is done.

    Link: https://bugzilla.kernel.org/show_bug.cgi?id=216373

    The error was unnoticed before and got visible because of the commit
    referenced below. This doesn't fix anything in the commit below, rather
    fixes the issue in amdgpu exposed by the commit. The reference is only
    to associate this commit with below one so that both go together.

    Fixes: 8795e182b02d ("PCI/portdrv: Don't disable AER reporting in get_port_device_capability()")

    Acked-by: Christian König <christian.koenig@amd.com>
    Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 +++++++++++---
    1 file changed, 11 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    index f443b4630f9d..7450773821f4 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
    @@ -2388,8 +2388,16 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
    }
    adev->ip_blocks[i].status.sw = true;

    - /* need to do gmc hw init early so we can allocate gpu mem */
    - if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {
    + if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) {
    + /* need to do common hw init early so everything is set up for gmc */
    + r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev);
    + if (r) {
    + DRM_ERROR("hw_init %d failed %d\n", i, r);
    + goto init_failed;
    + }
    + adev->ip_blocks[i].status.hw = true;
    + } else if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC) {
    + /* need to do gmc hw init early so we can allocate gpu mem */
    /* Try to reserve bad pages early */
    if (amdgpu_sriov_vf(adev))
    amdgpu_virt_exchange_data(adev);
    @@ -3037,8 +3045,8 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev)
    int i, r;

    static enum amd_ip_block_type ip_order[] = {
    - AMD_IP_BLOCK_TYPE_GMC,
    AMD_IP_BLOCK_TYPE_COMMON,
    + AMD_IP_BLOCK_TYPE_GMC,
    AMD_IP_BLOCK_TYPE_PSP,
    AMD_IP_BLOCK_TYPE_IH,
    };
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 13:11    [W:4.233 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site