From patchwork Wed May 27 03:20:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 6487071 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 76280C0020 for ; Wed, 27 May 2015 03:21:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 12A8320703 for ; Wed, 27 May 2015 03:21:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3408720707 for ; Wed, 27 May 2015 03:21:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 52B1272103; Tue, 26 May 2015 20:21:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f177.google.com (mail-qk0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id C23636E8E5 for ; Tue, 26 May 2015 20:21:07 -0700 (PDT) Received: by qkgx75 with SMTP id x75so105198709qkg.1 for ; Tue, 26 May 2015 20:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=fwVPniD5QhGfdjOsDIfBrd38DIzyVG8TyNHUeMHj9WM=; b=bNTG6FTFxnjkImjUIeBky5/q8Ttc9EIAjY0mefkM4RzIFasMlwzdU6kogrsrMU4Puf /i5E6YFcNBFNURtBeznU71bFykdVA4HB0hgjEjZWMj4eNXGEEGLnRTiPj7rqOb7Di+Mv J0cQGbFKWr1JvQd5r2XbsKZZfZ53/hMMzbsoFs9K/ED7RmsqnEywF+60YTldYtxQ7x9h WDqqfT6JkOS98B4QaUukpbzt70XNljH9+OmyL0sO03jEJ29E+xtZzziC5Cdl3Ewshf/S kAIIfNCNp9T7eUrGgEzGK2B7Kb5Vr+a21RK4o+xFpRpKlNl5FLx7cScO26ttO4ftCMY5 rKwg== X-Received: by 10.55.20.19 with SMTP id e19mr4254755qkh.37.1432696867502; Tue, 26 May 2015 20:21:07 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id 20sm9629127qhf.14.2015.05.26.20.21.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 20:21:07 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 85/88] drm/amdgpu: drop AMDGPU_FENCE_SIGNALED_SEQ Date: Tue, 26 May 2015 23:20:24 -0400 Message-Id: <1432696827-3752-55-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> References: <1432696827-3752-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: =?UTF-8?q?Christian=20K=C3=B6nig?= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Christian König It's causing issues with VMID handling and comparing the fence value two times actually doesn't make handling faster. Port of radeon commit "d6d5c5b8364bcc4d52cddc68bcb0a330d2af20f3". Signed-off-by: Christian König Reviewed-by: Alex Deucher Reviewed-by: Monk Liu --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 --- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 52d6845..411cfb9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -84,9 +84,6 @@ extern int amdgpu_vm_block_size; #define AMDGPUFB_CONN_LIMIT 4 #define AMDGPU_BIOS_NUM_SCRATCH 8 -/* fence seq are set to this number when signaled */ -#define AMDGPU_FENCE_SIGNALED_SEQ 0LL - /* max number of rings */ #define AMDGPU_MAX_RINGS 16 #define AMDGPU_MAX_GFX_RINGS 1 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c index be4d535..9ce6023 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c @@ -463,11 +463,7 @@ bool amdgpu_fence_signaled(struct amdgpu_fence *fence) if (!fence) return true; - if (fence->seq == AMDGPU_FENCE_SIGNALED_SEQ) - return true; - if (amdgpu_fence_seq_signaled(fence->ring, fence->seq)) { - fence->seq = AMDGPU_FENCE_SIGNALED_SEQ; if (!fence_signal(&fence->base)) FENCE_TRACE(&fence->base, "signaled from amdgpu_fence_signaled\n"); return true; @@ -637,15 +633,11 @@ int amdgpu_fence_wait(struct amdgpu_fence *fence, bool intr) long r; seq[fence->ring->idx] = fence->seq; - if (seq[fence->ring->idx] == AMDGPU_FENCE_SIGNALED_SEQ) - return 0; - r = amdgpu_fence_wait_seq_timeout(fence->ring->adev, seq, intr, MAX_SCHEDULE_TIMEOUT); if (r < 0) { return r; } - fence->seq = AMDGPU_FENCE_SIGNALED_SEQ; r = fence_signal(&fence->base); if (!r) FENCE_TRACE(&fence->base, "signaled from fence_wait\n"); @@ -682,10 +674,6 @@ int amdgpu_fence_wait_any(struct amdgpu_device *adev, seq[i] = fences[i]->seq; ++num_rings; - - /* test if something was allready signaled */ - if (seq[i] == AMDGPU_FENCE_SIGNALED_SEQ) - return 0; } /* nothing to wait for ? */