From patchwork Mon May 8 08:51:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 9715903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2727E602A0 for ; Mon, 8 May 2017 08:51:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A17024151 for ; Mon, 8 May 2017 08:51:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D48A27D4D; Mon, 8 May 2017 08:51:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0FDF224151 for ; Mon, 8 May 2017 08:51:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88BA76E1A4; Mon, 8 May 2017 08:51:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllnx209.ext.ti.com (fllnx209.ext.ti.com [198.47.19.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5EDA6E1A4 for ; Mon, 8 May 2017 08:51:55 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v488pWVl022474; Mon, 8 May 2017 03:51:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1494233492; bh=vrv993cQStMf1fat0UhITh5m5B/kJUMbz6VQbrPhV9M=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ZQZdGnvRouOWwDlYd63OKG2l5OyBcorcQuh+awM47jTBgC66h3+ivnUYEMJZQpXEZ 0LvxBLEgJ/3mpA7jDItt4vAaukSp1LRwYfcj93ArCcyHR21I27iG3lbwtTe0lUPRrM xaZAJcleqU4Nw3hx1bB7jzOCw3YCNHjNHqW4gGZ4= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v488pRKI008762; Mon, 8 May 2017 03:51:27 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Mon, 8 May 2017 03:51:26 -0500 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v488pOm5004402; Mon, 8 May 2017 03:51:26 -0500 From: Tomi Valkeinen To: , Laurent Pinchart Subject: [PATCH 1/2] drm/omap: add omap_gem_put_paddr_locked() Date: Mon, 8 May 2017 11:51:21 +0300 Message-ID: <1494233482-23403-2-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494233482-23403-1-git-send-email-tomi.valkeinen@ti.com> References: <1494233482-23403-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 Cc: Tomi Valkeinen , Jyri Sarha 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-Virus-Scanned: ClamAV using ClamSMTP Add omap_gem_put_paddr_locked() which is a version of omap_gem_put_paddr() that expects the caller to hold the struct_mutex. Signed-off-by: Tomi Valkeinen Reviewed-by: Jyri Sarha Reviewed-by: Laurent Pinchart --- drivers/gpu/drm/omapdrm/omap_gem.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 68a75b829b71..5d73dccc1383 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -873,12 +873,12 @@ int omap_gem_get_paddr(struct drm_gem_object *obj, /* Release physical address, when DMA is no longer being performed.. this * could potentially unpin and unmap buffers from TILER */ -void omap_gem_put_paddr(struct drm_gem_object *obj) + +static void omap_gem_put_paddr_locked(struct drm_gem_object *obj) { struct omap_gem_object *omap_obj = to_omap_bo(obj); int ret; - mutex_lock(&obj->dev->struct_mutex); if (omap_obj->paddr_cnt > 0) { omap_obj->paddr_cnt--; if (omap_obj->paddr_cnt == 0) { @@ -896,7 +896,12 @@ void omap_gem_put_paddr(struct drm_gem_object *obj) omap_obj->block = NULL; } } +} +void omap_gem_put_paddr(struct drm_gem_object *obj) +{ + mutex_lock(&obj->dev->struct_mutex); + omap_gem_put_paddr_locked(obj); mutex_unlock(&obj->dev->struct_mutex); }