lkml.org 
[lkml]   [2009]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[080/151] drm/radeon/kms: rs6xx/rs740: clamp vram to aperture size
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

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

    From: Alex Deucher <alexdeucher@gmail.com>

    commit 0088dbdb809e8799cb8f26da5ac64b15201fa99d upstream.

    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/radeon/rs600.c | 9 ++++++---
    drivers/gpu/drm/radeon/rs690.c | 9 ++++++++-
    2 files changed, 14 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/radeon/rs600.c
    +++ b/drivers/gpu/drm/radeon/rs600.c
    @@ -301,9 +301,7 @@ int rs600_mc_wait_for_idle(struct radeon

    void rs600_gpu_init(struct radeon_device *rdev)
    {
    - /* FIXME: HDP same place on rs600 ? */
    r100_hdp_reset(rdev);
    - /* FIXME: is this correct ? */
    r420_pipes_init(rdev);
    /* Wait for mc idle */
    if (rs600_mc_wait_for_idle(rdev))
    @@ -312,7 +310,6 @@ void rs600_gpu_init(struct radeon_device

    void rs600_vram_info(struct radeon_device *rdev)
    {
    - /* FIXME: to do or is these values sane ? */
    rdev->mc.vram_is_ddr = true;
    rdev->mc.vram_width = 128;

    @@ -321,6 +318,12 @@ void rs600_vram_info(struct radeon_devic

    rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
    rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
    +
    + if (rdev->mc.mc_vram_size > rdev->mc.aper_size)
    + rdev->mc.mc_vram_size = rdev->mc.aper_size;
    +
    + if (rdev->mc.real_vram_size > rdev->mc.aper_size)
    + rdev->mc.real_vram_size = rdev->mc.aper_size;
    }

    void rs600_bandwidth_update(struct radeon_device *rdev)
    --- a/drivers/gpu/drm/radeon/rs690.c
    +++ b/drivers/gpu/drm/radeon/rs690.c
    @@ -134,7 +134,7 @@ void rs690_vram_info(struct radeon_devic
    fixed20_12 a;

    rs400_gart_adjust_size(rdev);
    - /* DDR for all card after R300 & IGP */
    +
    rdev->mc.vram_is_ddr = true;
    rdev->mc.vram_width = 128;

    @@ -143,6 +143,13 @@ void rs690_vram_info(struct radeon_devic

    rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
    rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
    +
    + if (rdev->mc.mc_vram_size > rdev->mc.aper_size)
    + rdev->mc.mc_vram_size = rdev->mc.aper_size;
    +
    + if (rdev->mc.real_vram_size > rdev->mc.aper_size)
    + rdev->mc.real_vram_size = rdev->mc.aper_size;
    +
    rs690_pm_info(rdev);
    /* FIXME: we should enforce default clock in case GPU is not in
    * default setup



    \
     
     \ /
      Last update: 2009-12-17 05:33    [W:0.024 / U:61.524 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site