lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 139/163] drm/radeon/cik: use a separate counter for CP init timeout
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Alex Deucher <alexander.deucher@amd.com>

    commit 370ce45b5986118fa496dddbcd7039e1aa1a418f upstream.

    Otherwise we may fail to init the second compute ring.

    Noticed-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/radeon/cik.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
    index 4c5828b..e54f8da 100644
    --- a/drivers/gpu/drm/radeon/cik.c
    +++ b/drivers/gpu/drm/radeon/cik.c
    @@ -4327,7 +4327,7 @@ struct bonaire_mqd
    */
    static int cik_cp_compute_resume(struct radeon_device *rdev)
    {
    - int r, i, idx;
    + int r, i, j, idx;
    u32 tmp;
    bool use_doorbell = true;
    u64 hqd_gpu_addr;
    @@ -4446,7 +4446,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev)
    mqd->queue_state.cp_hqd_pq_wptr= 0;
    if (RREG32(CP_HQD_ACTIVE) & 1) {
    WREG32(CP_HQD_DEQUEUE_REQUEST, 1);
    - for (i = 0; i < rdev->usec_timeout; i++) {
    + for (j = 0; j < rdev->usec_timeout; j++) {
    if (!(RREG32(CP_HQD_ACTIVE) & 1))
    break;
    udelay(1);
    --
    1.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-10-10 00:21    [W:4.063 / U:0.460 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site