From patchwork Wed Nov 25 14:34:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 11931375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AB7CC56202 for ; Wed, 25 Nov 2020 14:34:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC9B62076B for ; Wed, 25 Nov 2020 14:34:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q4VR513G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC9B62076B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D2696E9A6; Wed, 25 Nov 2020 14:34:28 +0000 (UTC) Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A12388249; Wed, 25 Nov 2020 14:34:27 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id t9so2749699edq.8; Wed, 25 Nov 2020 06:34:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=N71lY/MMcmHmBqgL9ul1o5klXUvwF6twDCi24qH1+8M=; b=Q4VR513GViCJw2LDYZeT+AMbv9h1iI1YaWgcTK5G7Ne/Hb5rDdok9BHBF2BpRKnS7m wtCq2JzbqA2vNpql3jAUk6pOH4BniCPNd/uGy4Hzk/5HIXZsUwKTbUBW2vDYKMgQHAUZ opodFIItV7kGw/bdwPoQtJATOcpAP7mhsgSUhu7Mw/CS8KKzq7vXtP2u7Rq1+gJMcpmQ cqvjV0z2wMC3dXFK7Qe+oP5kyzxMRd7wr3iaEGDxKTIldQl8NUNlkRnFq33aFJ+rfcEr nvfP1pm7YOi1PRiN9uq9ZEZQftgcGBSaQQc5FNba68bOZvDKzd8AWLr7lcLx9E5C7qkm AEMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=N71lY/MMcmHmBqgL9ul1o5klXUvwF6twDCi24qH1+8M=; b=rmQ0Trq4Aiq/fp2cQLFBAw4/DqQjBeQYfQpHNUdEmP2PK1ds84apWbTDkgw48624Yj VkwM3pR0CQphTojoD64bn4Ufjsw50MDMuhdyy343dUa6NGE7zU3P3jK0mTcE+KbphmAF 0DP/gbJ+8jddfFxqq0g16zanPeqTkD+GzNOt6yTjqRXRmX+rJt+JITwpJ8hN+xOltZLt +UT7Rqhsdg40KbK9z9EHuW+tfgtEx/pMafpeI1BT4ImnXTCBuowqR8FCN1oYxmuqCXxh UqCGHWUeT2Pg+xMMJM6LgztdKJ1/+ppsRhE10L5rKBlqnMrHtXslVrP9wCCwhwlfmSbf o3ig== X-Gm-Message-State: AOAM533F7tVjzjMzVi+2MttCSpMQ2Z3WRhRqLr98XUnaq96d46tpQvh0 euR3eCsaEcpFpGqkzPrTbqm3oNavJOY= X-Google-Smtp-Source: ABdhPJzWMm//FPAaE3D1uoEDY2IpEU0b9ChpM4ECKAbTtj8Oj1wdOZMUJbxfNNH39niqVMreGDLXdg== X-Received: by 2002:a50:cdc8:: with SMTP id h8mr3808395edj.37.1606314865618; Wed, 25 Nov 2020 06:34:25 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:d77:2725:3ce2:6cf0]) by smtp.gmail.com with ESMTPSA id q15sm1376039edt.95.2020.11.25.06.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 06:34:25 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH] drm/radeon: fix check order in radeon_bo_move Date: Wed, 25 Nov 2020 15:34:24 +0100 Message-Id: <20201125143424.1434-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Reorder the code to fix checking if blitting is available. Signed-off-by: Christian König Reviewed-by: Daniel Vetter Reviewed-by: Dave Airlie --- drivers/gpu/drm/radeon/radeon_ttm.c | 54 +++++++++++++---------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 0ca381b95d3d..2b598141225f 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -216,27 +216,15 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, struct ttm_resource *old_mem = &bo->mem; int r; - if ((old_mem->mem_type == TTM_PL_SYSTEM && - new_mem->mem_type == TTM_PL_VRAM) || - (old_mem->mem_type == TTM_PL_VRAM && - new_mem->mem_type == TTM_PL_SYSTEM)) { - hop->fpfn = 0; - hop->lpfn = 0; - hop->mem_type = TTM_PL_TT; - hop->flags = 0; - return -EMULTIHOP; - } - if (new_mem->mem_type == TTM_PL_TT) { r = radeon_ttm_tt_bind(bo->bdev, bo->ttm, new_mem); if (r) return r; } - radeon_bo_move_notify(bo, evict, new_mem); r = ttm_bo_wait_ctx(bo, ctx); if (r) - goto fail; + return r; /* Can't move a pinned BO */ rbo = container_of(bo, struct radeon_bo, tbo); @@ -246,12 +234,12 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, rdev = radeon_get_rdev(bo->bdev); if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) { ttm_bo_move_null(bo, new_mem); - return 0; + goto out; } if (old_mem->mem_type == TTM_PL_SYSTEM && new_mem->mem_type == TTM_PL_TT) { ttm_bo_move_null(bo, new_mem); - return 0; + goto out; } if (old_mem->mem_type == TTM_PL_TT && @@ -259,31 +247,37 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict, radeon_ttm_tt_unbind(bo->bdev, bo->ttm); ttm_resource_free(bo, &bo->mem); ttm_bo_assign_mem(bo, new_mem); - return 0; + goto out; } - if (!rdev->ring[radeon_copy_ring_index(rdev)].ready || - rdev->asic->copy.copy == NULL) { - /* use memcpy */ - goto memcpy; + if (rdev->ring[radeon_copy_ring_index(rdev)].ready && + rdev->asic->copy.copy != NULL) { + if ((old_mem->mem_type == TTM_PL_SYSTEM && + new_mem->mem_type == TTM_PL_VRAM) || + (old_mem->mem_type == TTM_PL_VRAM && + new_mem->mem_type == TTM_PL_SYSTEM)) { + hop->fpfn = 0; + hop->lpfn = 0; + hop->mem_type = TTM_PL_TT; + hop->flags = 0; + return -EMULTIHOP; + } + + r = radeon_move_blit(bo, evict, new_mem, old_mem); + } else { + r = -ENODEV; } - r = radeon_move_blit(bo, evict, new_mem, old_mem); if (r) { -memcpy: r = ttm_bo_move_memcpy(bo, ctx, new_mem); - if (r) { - goto fail; - } + if (r) + return r; } +out: /* update statistics */ atomic64_add((u64)bo->num_pages << PAGE_SHIFT, &rdev->num_bytes_moved); + radeon_bo_move_notify(bo, evict, new_mem); return 0; -fail: - swap(*new_mem, bo->mem); - radeon_bo_move_notify(bo, false, new_mem); - swap(*new_mem, bo->mem); - return r; } static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resource *mem)