From patchwork Thu Mar 22 10:51:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10301225 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 3E511600F6 for ; Thu, 22 Mar 2018 10:51:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3260729B31 for ; Thu, 22 Mar 2018 10:51:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26D5F29B34; Thu, 22 Mar 2018 10:51:48 +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 74E0029B31 for ; Thu, 22 Mar 2018 10:51:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D43036EBC3; Thu, 22 Mar 2018 10:51:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 366C36EBAF for ; Thu, 22 Mar 2018 10:51:42 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id r82so15274916wme.0 for ; Thu, 22 Mar 2018 03:51:42 -0700 (PDT) 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=5jbpeb+8nizecxsS9cLGGifyfdo76rtZ+usFf8JQXO0=; b=QiGWudSuhHq4RTbLqiR9MYVFhpNAy2QOb/poZS9ZRgkvwghzmPvy4cNAJ4u0l+/g3f SXFZJQDiIbAlz3NpHQ2uHYRunbdmrollvc00nETZGnY2BKUef9JR6nGUmdHgxUlT5Hvb fSYTvwV7Vs6tUoVOV56NwJH0zi/uNmmhy21ZE= 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=5jbpeb+8nizecxsS9cLGGifyfdo76rtZ+usFf8JQXO0=; b=N9Z1PCojRQRdL7ndifCW/lqFshrvGvo2cQqOGDQjN9aoCrlrPBLO4C0h4Uee3+qv9L POEcHaB94gxmrG3Ut1oaXclntlQ6dngVH22bXaEgM34AJ0pL3cKzuAk9otpleOKx9tlh V9HAKdbBl5c8B0PqlJg0WjJ1A4IFtwigdcJA3OlngnJmYVan8GGmTJWc4kBFnR69VIG3 0tsf9sY32NdeAft/ZqZQgrMNteOH5Evx/7z1D5cdi0lQQTbvVgDhVKoEbInbCZahE7d1 bkLDwwHHzrFRwEofJCUC29TcgcjNl86xoDHh2mrjnsRCSfsicmLCBy+Uux68AhVR4UXc koNw== X-Gm-Message-State: AElRT7FKHpPtIQW1mie5aq91U2dHWzXCAmdCG2QTRQTsDGFv7Hi5dN4v ltjFIlxGhrlDYIGXm28ZyZQnWI1a X-Google-Smtp-Source: AG47ELviR762jT7aiiNx1PvweGtUNRmc0X9TT5b2UuADvU/S/Y8Wuc/uvGmuZOtUQ9nlU8kND5ulfw== X-Received: by 10.80.144.54 with SMTP id b51mr21783377eda.194.1521715900502; Thu, 22 Mar 2018 03:51:40 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id 93sm4597401edi.19.2018.03.22.03.51.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 03:51:39 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/6] drm/tinydrm: Use gem_free_object_unlocked Date: Thu, 22 Mar 2018 11:51:28 +0100 Message-Id: <20180322105133.11211-2-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180322105133.11211-1-daniel.vetter@ffwll.ch> References: <20180322105133.11211-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 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 , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP tinydrm doesn't use dev->struct_mutex and therefore has no need to use gem_free_object. Signed-off-by: Daniel Vetter Cc: "Noralf Trønnes" Acked-by: Noralf Trønnes --- drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- include/drm/tinydrm/tinydrm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c index 4c6616278c48..24a33bf862fa 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c @@ -91,7 +91,7 @@ EXPORT_SYMBOL(tinydrm_gem_cma_prime_import_sg_table); * GEM object state and frees the memory used to store the object itself using * drm_gem_cma_free_object(). It also handles PRIME buffers which has the kernel * virtual address set by tinydrm_gem_cma_prime_import_sg_table(). Drivers - * can use this as their &drm_driver->gem_free_object callback. + * can use this as their &drm_driver->gem_free_object_unlocked callback. */ void tinydrm_gem_cma_free_object(struct drm_gem_object *gem_obj) { diff --git a/include/drm/tinydrm/tinydrm.h b/include/drm/tinydrm/tinydrm.h index 07a9a11fe19d..77a93ec577fd 100644 --- a/include/drm/tinydrm/tinydrm.h +++ b/include/drm/tinydrm/tinydrm.h @@ -41,7 +41,7 @@ pipe_to_tinydrm(struct drm_simple_display_pipe *pipe) * the &drm_driver structure. */ #define TINYDRM_GEM_DRIVER_OPS \ - .gem_free_object = tinydrm_gem_cma_free_object, \ + .gem_free_object_unlocked = tinydrm_gem_cma_free_object, \ .gem_print_info = drm_gem_cma_print_info, \ .gem_vm_ops = &drm_gem_cma_vm_ops, \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \