lkml.org 
[lkml]   [2021]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 149/177] drm/amdgpu: dont override default ECO_BITs setting
    Date
    From: Hawking Zhang <Hawking.Zhang@amd.com>

    commit 841933d5b8aa853abe68e63827f68f50fab37226 upstream.

    Leave this bit as hardware default setting

    Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 1 -
    drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 1 -
    drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 1 -
    drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 -
    drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 1 -
    drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 1 -
    drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 1 -
    drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 --
    8 files changed, 9 deletions(-)

    --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
    @@ -162,7 +162,6 @@ static void gfxhub_v1_0_init_tlb_regs(st
    ENABLE_ADVANCED_DRIVER_MODEL, 1);
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    - tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ECO_BITS, 0);
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC);/* XXX for emulation. */
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ATC_EN, 1);
    --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c
    @@ -196,7 +196,6 @@ static void gfxhub_v2_0_init_tlb_regs(st
    ENABLE_ADVANCED_DRIVER_MODEL, 1);
    tmp = REG_SET_FIELD(tmp, GCMC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    - tmp = REG_SET_FIELD(tmp, GCMC_VM_MX_L1_TLB_CNTL, ECO_BITS, 0);
    tmp = REG_SET_FIELD(tmp, GCMC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC); /* UC, uncached */

    --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c
    +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c
    @@ -197,7 +197,6 @@ static void gfxhub_v2_1_init_tlb_regs(st
    ENABLE_ADVANCED_DRIVER_MODEL, 1);
    tmp = REG_SET_FIELD(tmp, GCMC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    - tmp = REG_SET_FIELD(tmp, GCMC_VM_MX_L1_TLB_CNTL, ECO_BITS, 0);
    tmp = REG_SET_FIELD(tmp, GCMC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC); /* UC, uncached */

    --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
    @@ -145,7 +145,6 @@ static void mmhub_v1_0_init_tlb_regs(str
    ENABLE_ADVANCED_DRIVER_MODEL, 1);
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    - tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ECO_BITS, 0);
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC);/* XXX for emulation. */
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ATC_EN, 1);
    --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
    +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
    @@ -165,7 +165,6 @@ static void mmhub_v1_7_init_tlb_regs(str
    ENABLE_ADVANCED_DRIVER_MODEL, 1);
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    - tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ECO_BITS, 0);
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC);/* XXX for emulation. */
    tmp = REG_SET_FIELD(tmp, MC_VM_MX_L1_TLB_CNTL, ATC_EN, 1);
    --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
    +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c
    @@ -269,7 +269,6 @@ static void mmhub_v2_0_init_tlb_regs(str
    ENABLE_ADVANCED_DRIVER_MODEL, 1);
    tmp = REG_SET_FIELD(tmp, MMMC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    - tmp = REG_SET_FIELD(tmp, MMMC_VM_MX_L1_TLB_CNTL, ECO_BITS, 0);
    tmp = REG_SET_FIELD(tmp, MMMC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC); /* UC, uncached */

    --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c
    +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c
    @@ -194,7 +194,6 @@ static void mmhub_v2_3_init_tlb_regs(str
    ENABLE_ADVANCED_DRIVER_MODEL, 1);
    tmp = REG_SET_FIELD(tmp, MMMC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    - tmp = REG_SET_FIELD(tmp, MMMC_VM_MX_L1_TLB_CNTL, ECO_BITS, 0);
    tmp = REG_SET_FIELD(tmp, MMMC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC); /* UC, uncached */

    --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
    +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c
    @@ -190,8 +190,6 @@ static void mmhub_v9_4_init_tlb_regs(str
    tmp = REG_SET_FIELD(tmp, VMSHAREDVC0_MC_VM_MX_L1_TLB_CNTL,
    SYSTEM_APERTURE_UNMAPPED_ACCESS, 0);
    tmp = REG_SET_FIELD(tmp, VMSHAREDVC0_MC_VM_MX_L1_TLB_CNTL,
    - ECO_BITS, 0);
    - tmp = REG_SET_FIELD(tmp, VMSHAREDVC0_MC_VM_MX_L1_TLB_CNTL,
    MTYPE, MTYPE_UC);/* XXX for emulation. */
    tmp = REG_SET_FIELD(tmp, VMSHAREDVC0_MC_VM_MX_L1_TLB_CNTL,
    ATC_EN, 1);

    \
     
     \ /
      Last update: 2021-12-20 16:18    [W:3.675 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site