lkml.org 
[lkml]   [2010]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[011/289] drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

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

    From: Alex Deucher <alexdeucher@gmail.com>

    commit 354da653233898ed1e51f20cebac9705456bf9b1 upstream.

    macro tile heights are aligned to num channels, not num banks.

    Noticed by Dave Airlie.

    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/r600_cs.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/radeon/r600_cs.c
    +++ b/drivers/gpu/drm/radeon/r600_cs.c
    @@ -228,7 +228,7 @@ static inline int r600_cs_track_validate
    __func__, __LINE__, pitch);
    return -EINVAL;
    }
    - if (!IS_ALIGNED((height / 8), track->nbanks)) {
    + if (!IS_ALIGNED((height / 8), track->npipes)) {
    dev_warn(p->dev, "%s:%d cb height (%d) invalid\n",
    __func__, __LINE__, height);
    return -EINVAL;
    @@ -367,7 +367,7 @@ static int r600_cs_track_check(struct ra
    __func__, __LINE__, pitch);
    return -EINVAL;
    }
    - if ((height / 8) & (track->nbanks - 1)) {
    + if (!IS_ALIGNED((height / 8), track->npipes)) {
    dev_warn(p->dev, "%s:%d db height (%d) invalid\n",
    __func__, __LINE__, height);
    return -EINVAL;



    \
     
     \ /
      Last update: 2010-12-08 03:03    [W:0.020 / U:29.292 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site