From patchwork Wed Apr 17 06:27:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1086810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44kXNS6C1Wz9s7T; Wed, 17 Apr 2019 16:27:51 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hGe2s-0001uN-Bn; Wed, 17 Apr 2019 06:27:46 +0000 Received: from mail-pg1-f196.google.com ([209.85.215.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hGe2o-0001tp-RD for kernel-team@lists.ubuntu.com; Wed, 17 Apr 2019 06:27:42 +0000 Received: by mail-pg1-f196.google.com with SMTP id 85so11523621pgc.3 for ; Tue, 16 Apr 2019 23:27:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n2ogbskC2vE62YhNgL+SPvLm+igxajLDkSF9Kuwaom8=; b=io+uaoCl+fQPjORNQv9RXnneQjOIz0hRMtMtOdNL8zlvKiry+jTwvXnobqOvd7HIrO CoYeIypDDPwaoZbs1vsmkj2W4kLe7ti5jxdJRIgKsrjBCbjtVnwKitpK1i9FA3ERkM6s V/wj7JZ1oQbv/haAr+QIr4NLG+PqMOtmTa1LhOtKYFJ/VMOGr5w4YCQqkI8aKsM5/690 nOYzYpiXT61sjATYDX1oGn4dMMyX3nH5yKjwdgMcS2FRS2ySfinDlJEXUyVDAG6dQNXe 7QxoduxPFFuwziAWo+vDRQaB66bPER7tdLQbQrkYI8QUfoTuF2dR/U1ZBOE9d+abqdNv UvQA== X-Gm-Message-State: APjAAAUsaEYnou6sJbbC1rMV7qyV87ucv1mLQ5baykkGyMeENwikmyX9 tMlDufAF7dc3iNjowkbObeD0Qukz X-Google-Smtp-Source: APXvYqwUmHGIjZpudmpSsyItj8IOl3iGezv16mWMDEAbeLJqcSxxEkdd/BgkW4KUt2GUYCDrCotPHg== X-Received: by 2002:a62:1647:: with SMTP id 68mr25455317pfw.113.1555482461102; Tue, 16 Apr 2019 23:27:41 -0700 (PDT) Received: from momoga.taipei.internal (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id x24sm73487398pfn.128.2019.04.16.23.27.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 23:27:40 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][B] drm/amdgpu: fix&cleanups for wb_clear Date: Wed, 17 Apr 2019 14:27:34 +0800 Message-Id: <20190417062734.24021-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190417062734.24021-1-vicamo.yang@canonical.com> References: <20190417062734.24021-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Monk Liu BugLink: https://bugs.launchpad.net/bugs/1825074 fix: should do right shift on wb before clearing cleanups: 1,should memset all wb buffer 2,set max wb number to 128 (total 4KB) is big enough Signed-off-by: Monk Liu Acked-by: Alex Deucher Signed-off-by: Alex Deucher (cherry picked from commit 73469585510d5161368c899b7eacd58c824b2b24) Signed-off-by: You-Sheng Yang Acked-by: Stefan Bader Acked-By: AceLan Kao --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index c90346191e5ac..9d0891a146a17 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -1155,7 +1155,7 @@ static inline void amdgpu_set_ib_value(struct amdgpu_cs_parser *p, /* * Writeback */ -#define AMDGPU_MAX_WB 512 /* Reserve at most 512 WB slots for amdgpu-owned rings. */ +#define AMDGPU_MAX_WB 128 /* Reserve at most 128 WB slots for amdgpu-owned rings. */ struct amdgpu_wb { struct amdgpu_bo *wb_obj; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 1e3461ec43919..ade8d0eaccb04 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -526,7 +526,7 @@ static int amdgpu_wb_init(struct amdgpu_device *adev) memset(&adev->wb.used, 0, sizeof(adev->wb.used)); /* clear wb memory */ - memset((char *)adev->wb.wb, 0, AMDGPU_MAX_WB * sizeof(uint32_t)); + memset((char *)adev->wb.wb, 0, AMDGPU_MAX_WB * sizeof(uint32_t) * 8); } return 0; @@ -564,8 +564,9 @@ int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb) */ void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb) { + wb >>= 3; if (wb < adev->wb.num_wb) - __clear_bit(wb >> 3, adev->wb.used); + __clear_bit(wb, adev->wb.used); } /**