From patchwork Mon Nov 25 09:43:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11260071 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B80F6C1 for ; Mon, 25 Nov 2019 09:44:22 +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 813AA2082C for ; Mon, 25 Nov 2019 09:44:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 813AA2082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 65F0C6E0FC; Mon, 25 Nov 2019 09:44:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F77E6E106 for ; Mon, 25 Nov 2019 09:44:11 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id n1so17101538wra.10 for ; Mon, 25 Nov 2019 01:44:11 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=3xRA6yn7gt/VYl7ZhTsi+7hrTUH2goQVGJ/o+f++J+c=; b=CwcTQyvqkulO9v0X/Zx7Xgtq89FttKtWC3Iuq6MHns1tbvd43BeAKbB7aScdc4HR5Y 7U50RS1fPZIDar6lfUMDveEmE9ip9p7IVT332FYHNyFtxuAL4IPA/ncaxfUqpEIqmTij 2sweQdZKJFAa0rH1DinPRtMeB6jLx5/+5EC4jGkrPFpEPunXOaiaT7KyQSIFIGYqsVTq KyohWH064Fp7RA6J0wE586K289ts0DMn9wzZqMW9d3f+wniFWoS5tCKhBO9g1M6U7MVq T+eCKHhd0D+Kk8OU1cva2CC8kLIYkRF0PlXQNWYK/fb7N15DfqwciZakNWueCVY6oojK QuBQ== X-Gm-Message-State: APjAAAWBrjTxhakOswS+Zm8Oy7STXbn6yO2EyVCNOvACf+n6CLF4tKtd WvaXniVy41QpAZhORfsX9S2YPwDR1dE= X-Google-Smtp-Source: APXvYqy8QLtPWFynBIt9Dv/33rXwzDUcB1mhLW2tK2u1AyaMEVscyDEJVytddNO3FvZCKyYyVwSMBQ== X-Received: by 2002:a5d:4589:: with SMTP id p9mr14490188wrq.61.1574675049112; Mon, 25 Nov 2019 01:44:09 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id x2sm7598233wmc.3.2019.11.25.01.44.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 01:44:07 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 4/4] drm/vc4: Use dma_resv locking wrappers Date: Mon, 25 Nov 2019 10:43:56 +0100 Message-Id: <20191125094356.161941-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191125094356.161941-1-daniel.vetter@ffwll.ch> References: <20191125094356.161941-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3xRA6yn7gt/VYl7ZhTsi+7hrTUH2goQVGJ/o+f++J+c=; b=ALI53pD0wzBMeBdEvaXMM42GsWkyjncuqO7s1OkipUaTs0c/ilN5uPzefU7rEBnlsw jWHKsXClxaL3XKvLR1f6Pczb4UBg9hTNJJBFWX4lVfAwOtxqJ9kEXUuZq9DLolBHCJn2 IgqsWukgsONyxCBuIgWlrExkd4CGT+h2ySC60= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" I'll add more fancy logic to them soon, so everyone really has to use them. Plus they already provide some nice additional debug infrastructure on top of direct ww_mutex usage for the fences tracked by dma_resv. Signed-off-by: Daniel Vetter Acked-by: Eric Anholt --- drivers/gpu/drm/vc4/vc4_gem.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index 7a06cb6e31c5..e1cfc3ccd05a 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -568,7 +568,7 @@ vc4_unlock_bo_reservations(struct drm_device *dev, for (i = 0; i < exec->bo_count; i++) { struct drm_gem_object *bo = &exec->bo[i]->base; - ww_mutex_unlock(&bo->resv->lock); + dma_resv_unlock(bo->resv); } ww_acquire_fini(acquire_ctx); @@ -595,8 +595,7 @@ vc4_lock_bo_reservations(struct drm_device *dev, retry: if (contended_lock != -1) { bo = &exec->bo[contended_lock]->base; - ret = ww_mutex_lock_slow_interruptible(&bo->resv->lock, - acquire_ctx); + ret = dma_resv_lock_slow_interruptible(bo->resv, acquire_ctx); if (ret) { ww_acquire_done(acquire_ctx); return ret; @@ -609,19 +608,19 @@ vc4_lock_bo_reservations(struct drm_device *dev, bo = &exec->bo[i]->base; - ret = ww_mutex_lock_interruptible(&bo->resv->lock, acquire_ctx); + ret = dma_resv_lock_interruptible(bo->resv, acquire_ctx); if (ret) { int j; for (j = 0; j < i; j++) { bo = &exec->bo[j]->base; - ww_mutex_unlock(&bo->resv->lock); + dma_resv_unlock(bo->resv); } if (contended_lock != -1 && contended_lock >= i) { bo = &exec->bo[contended_lock]->base; - ww_mutex_unlock(&bo->resv->lock); + dma_resv_unlock(bo->resv); } if (ret == -EDEADLK) {