From patchwork Sat May 24 18:30:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 4237901 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 024619F32B for ; Sat, 24 May 2014 18:31:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2163320218 for ; Sat, 24 May 2014 18:31:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B432520211 for ; Sat, 24 May 2014 18:31:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EBD576E44A; Sat, 24 May 2014 11:31:05 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-f52.google.com (mail-qg0-f52.google.com [209.85.192.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A7386E43F for ; Sat, 24 May 2014 11:31:04 -0700 (PDT) Received: by mail-qg0-f52.google.com with SMTP id a108so9931364qge.39 for ; Sat, 24 May 2014 11:31:04 -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; bh=kR4JlRkuOTgWGUNfb3ESGep4QVicctSD0YxkFjEONrw=; b=E9Bxqxb6VJtR4QBjxWkZDOEkbuGs/RpdnWAf1fXHTPrFw8CXNWO7O3kIrwasN0p/p6 TmnjUjSrv9YkRwPxeH6GX9TEOUuXn0uuyjqmXTeK1aWkuiVD03z/X2P6aes93ypYOKLD +x6FatUddtRBr6kY11bOXa5L6+EZgvqbZ7STng1Phwd7/3EA1KtAw3zrEZnU9Syj8kEW OS/AS9GY9T9k8lOwOS8kCE36eduQg02KMxbNvufjxAIpiwD+atPIH4uShQUz8fEGa/tZ MYwi8tA4hFdnQwKWW1uo7GOBoDgrABrjrDw+k57yKMPf/oApuCI0kUM3kkfRcn9b4181 yFTA== X-Received: by 10.140.23.7 with SMTP id 7mr17919883qgo.0.1400956264212; Sat, 24 May 2014 11:31:04 -0700 (PDT) Received: from localhost (pool-108-20-252-175.bstnma.east.verizon.net. [108.20.252.175]) by mx.google.com with ESMTPSA id w8sm11129889qag.30.2014.05.24.11.31.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 May 2014 11:31:03 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [PATCH 10/17] drm: allow FB's in drm_mode_object_find Date: Sat, 24 May 2014 14:30:19 -0400 Message-Id: <1400956226-28053-11-git-send-email-robdclark@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400956226-28053-1-git-send-email-robdclark@gmail.com> References: <1400956226-28053-1-git-send-email-robdclark@gmail.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 We do actually want to permit FB's in atomic case, since FB will be looked up like any other object property value in a few code paths (like property value validation). So split out into an internal function without the WARN_ON() which we can use in those special cases. Signed-off-by: Rob Clark --- drivers/gpu/drm/drm_crtc.c | 33 ++++++++++++++++++++++----------- include/drm/drm_crtc.h | 6 ------ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 9b95601..48555724 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -443,6 +443,21 @@ void drm_mode_object_put(struct drm_device *dev, mutex_unlock(&dev->mode_config.idr_mutex); } +static struct drm_mode_object *_object_find(struct drm_device *dev, + uint32_t id, uint32_t type) +{ + struct drm_mode_object *obj = NULL; + + mutex_lock(&dev->mode_config.idr_mutex); + obj = idr_find(&dev->mode_config.crtc_idr, id); + if (!obj || (type != DRM_MODE_OBJECT_ANY && obj->type != type) || + (obj->id != id)) + obj = NULL; + mutex_unlock(&dev->mode_config.idr_mutex); + + return obj; +} + /** * drm_mode_object_find - look up a drm object with static lifetime * @dev: drm device @@ -455,23 +470,19 @@ void drm_mode_object_put(struct drm_device *dev, struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type) { - struct drm_mode_object *obj = NULL; - /* Framebuffers are reference counted and need their own lookup * function.*/ WARN_ON(type == DRM_MODE_OBJECT_FB); - - mutex_lock(&dev->mode_config.idr_mutex); - obj = idr_find(&dev->mode_config.crtc_idr, id); - if (!obj || (type != DRM_MODE_OBJECT_ANY && obj->type != type) || - (obj->id != id)) - obj = NULL; - mutex_unlock(&dev->mode_config.idr_mutex); - - return obj; + return _object_find(dev, id, type); } EXPORT_SYMBOL(drm_mode_object_find); +static struct drm_mode_object * +drm_property_get_obj(struct drm_property *property, uint64_t value) +{ + return _object_find(property->dev, value, property->values[0]); +} + /** * drm_framebuffer_init - initialize a framebuffer * @dev: DRM device diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 31ed7c6..547b75a 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1033,12 +1033,6 @@ extern int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, extern struct drm_mode_object *drm_mode_object_find(struct drm_device *dev, uint32_t id, uint32_t type); -static inline struct drm_mode_object * -drm_property_get_obj(struct drm_property *property, uint64_t value) -{ - return drm_mode_object_find(property->dev, value, property->values[0]); -} - /* IOCTLs */ extern int drm_mode_getresources(struct drm_device *dev, void *data, struct drm_file *file_priv);