lkml.org 
[lkml]   [2015]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 036/110] drm/radeon: fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling
    Date
    3.16.7-ckt13 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>

    commit 607d48063512707a414e346972e2210dc71ab491 upstream.

    The mapping range is inclusive between starting and ending addresses.

    Signed-off-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/radeon/cik.c | 4 ++--
    drivers/gpu/drm/radeon/evergreen.c | 2 +-
    drivers/gpu/drm/radeon/ni.c | 5 +++--
    drivers/gpu/drm/radeon/r600.c | 2 +-
    drivers/gpu/drm/radeon/rv770.c | 2 +-
    drivers/gpu/drm/radeon/si.c | 4 ++--
    6 files changed, 10 insertions(+), 9 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
    index 574d1f4ec7e5..0cd584934768 100644
    --- a/drivers/gpu/drm/radeon/cik.c
    +++ b/drivers/gpu/drm/radeon/cik.c
    @@ -5438,7 +5438,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
    L2_CACHE_BIGK_FRAGMENT_SIZE(4));
    /* setup context0 */
    WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
    - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
    + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
    WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
    (u32)(rdev->dummy_page.addr >> 12));
    @@ -5456,7 +5456,7 @@ static int cik_pcie_gart_enable(struct radeon_device *rdev)
    */
    /* set vm size, must be a multiple of 4 */
    WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
    - WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
    + WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn - 1);
    for (i = 1; i < 16; i++) {
    if (i < 8)
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
    diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
    index 5428b692f9a2..aaff62717f7b 100644
    --- a/drivers/gpu/drm/radeon/evergreen.c
    +++ b/drivers/gpu/drm/radeon/evergreen.c
    @@ -2458,7 +2458,7 @@ static int evergreen_pcie_gart_enable(struct radeon_device *rdev)
    WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
    WREG32(MC_VM_MB_L1_TLB3_CNTL, tmp);
    WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
    - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
    + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
    WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
    RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
    diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
    index 1d0c08de1731..587a45a3003b 100644
    --- a/drivers/gpu/drm/radeon/ni.c
    +++ b/drivers/gpu/drm/radeon/ni.c
    @@ -1251,7 +1251,7 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
    L2_CACHE_BIGK_FRAGMENT_SIZE(6));
    /* setup context0 */
    WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
    - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
    + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
    WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
    (u32)(rdev->dummy_page.addr >> 12));
    @@ -1270,7 +1270,8 @@ static int cayman_pcie_gart_enable(struct radeon_device *rdev)
    */
    for (i = 1; i < 8; i++) {
    WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR + (i << 2), 0);
    - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2), rdev->vm_manager.max_pfn);
    + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR + (i << 2),
    + rdev->vm_manager.max_pfn - 1);
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR + (i << 2),
    rdev->gart.table_addr >> 12);
    }
    diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
    index 5e31413fb454..4dae32b4cb6b 100644
    --- a/drivers/gpu/drm/radeon/r600.c
    +++ b/drivers/gpu/drm/radeon/r600.c
    @@ -996,7 +996,7 @@ static int r600_pcie_gart_enable(struct radeon_device *rdev)
    WREG32(MC_VM_L1_TLB_MCB_RD_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE);
    WREG32(MC_VM_L1_TLB_MCB_WR_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE);
    WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
    - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
    + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
    WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
    RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
    diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
    index 11cd3d887428..146168d85fbd 100644
    --- a/drivers/gpu/drm/radeon/rv770.c
    +++ b/drivers/gpu/drm/radeon/rv770.c
    @@ -922,7 +922,7 @@ static int rv770_pcie_gart_enable(struct radeon_device *rdev)
    WREG32(MC_VM_MB_L1_TLB2_CNTL, tmp);
    WREG32(MC_VM_MB_L1_TLB3_CNTL, tmp);
    WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
    - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
    + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
    WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) |
    RANGE_PROTECTION_FAULT_ENABLE_DEFAULT);
    diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
    index b9368bc50570..0555ce98986b 100644
    --- a/drivers/gpu/drm/radeon/si.c
    +++ b/drivers/gpu/drm/radeon/si.c
    @@ -4072,7 +4072,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
    L2_CACHE_BIGK_FRAGMENT_SIZE(4));
    /* setup context0 */
    WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12);
    - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12);
    + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1);
    WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12);
    WREG32(VM_CONTEXT0_PROTECTION_FAULT_DEFAULT_ADDR,
    (u32)(rdev->dummy_page.addr >> 12));
    @@ -4087,7 +4087,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
    /* empty context1-15 */
    /* set vm size, must be a multiple of 4 */
    WREG32(VM_CONTEXT1_PAGE_TABLE_START_ADDR, 0);
    - WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn);
    + WREG32(VM_CONTEXT1_PAGE_TABLE_END_ADDR, rdev->vm_manager.max_pfn - 1);
    /* Assign the pt base to something valid for now; the pts used for
    * the VMs are determined by the application and setup and assigned
    * on the fly in the vm part of radeon_gart.c

    \
     
     \ /
      Last update: 2015-06-05 16:41    [W:2.837 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site