Revert "drm/amdgpu: WARN once if amdgpu_bo_unpin is called for an unpinned BO"

Submitted by Deng, Emily on Dec. 25, 2018, 5:47 a.m.

Details

Message ID 1545716840-22778-1-git-send-email-Emily.Deng@amd.com
State New
Headers show
Series "Revert "drm/amdgpu: WARN once if amdgpu_bo_unpin is called for an unpinned BO"" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Deng, Emily Dec. 25, 2018, 5:47 a.m.
This reverts commit 8870ff7fe439aa9d7a542579c4508ea50c0f5b6e.

Signed-off-by: Emily Deng <Emily.Deng@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 52fc6ba..959e244 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -949,7 +949,7 @@  int amdgpu_bo_unpin(struct amdgpu_bo *bo)
 	struct ttm_operation_ctx ctx = { false, false };
 	int r, i;
 
-	if (WARN_ON_ONCE(!bo->pin_count)) {
+	if (!bo->pin_count) {
 		dev_warn(adev->dev, "%p unpin not necessary\n", bo);
 		return 0;
 	}

Comments

Hi,
    Please ignore this patch.

>-----Original Message-----

>From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Emily

>Deng

>Sent: Tuesday, December 25, 2018 1:47 PM

>To: amd-gfx@lists.freedesktop.org

>Cc: Deng, Emily <Emily.Deng@amd.com>

>Subject: [PATCH] Revert "drm/amdgpu: WARN once if amdgpu_bo_unpin is

>called for an unpinned BO"

>

>This reverts commit 8870ff7fe439aa9d7a542579c4508ea50c0f5b6e.

>

>Signed-off-by: Emily Deng <Emily.Deng@amd.com>

>---

> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-

> 1 file changed, 1 insertion(+), 1 deletion(-)

>

>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

>b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

>index 52fc6ba..959e244 100644

>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

>@@ -949,7 +949,7 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo)

> 	struct ttm_operation_ctx ctx = { false, false };

> 	int r, i;

>

>-	if (WARN_ON_ONCE(!bo->pin_count)) {

>+	if (!bo->pin_count) {

> 		dev_warn(adev->dev, "%p unpin not necessary\n", bo);

> 		return 0;

> 	}

>--

>2.7.4

>

>_______________________________________________

>amd-gfx mailing list

>amd-gfx@lists.freedesktop.org

>https://lists.freedesktop.org/mailman/listinfo/amd-gfx