From patchwork Mon Aug 29 08:27:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9303295 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 9B4F9601C0 for ; Mon, 29 Aug 2016 08:28:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E40C28766 for ; Mon, 29 Aug 2016 08:28:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 830E8287A0; Mon, 29 Aug 2016 08:28:23 +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 0D7EA28766 for ; Mon, 29 Aug 2016 08:28:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D5816E48C; Mon, 29 Aug 2016 08:28:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA66D6E49B for ; Mon, 29 Aug 2016 08:28:15 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id i5so8449216wmg.2 for ; Mon, 29 Aug 2016 01:28:15 -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; bh=eVutYOBwnVi/U83CiX9ZOhwd0D4t5llSMQmktBTQEY0=; b=FEtpGeFxQnB938ug5KsO9GVlNJF2E47cRDzl5xadIrkGjuxt0pA2QBOnAzgUpN9yVz +v5DN/5GfKe79NJkwTDFUWKOkHclDIxNqjjdBdzw9+PInQ8wXd9VeUKuQT2ywyZ7hKeP WGyfrp6cxhfZmdg463tIexwTuPgWh+AhJC7Uo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eVutYOBwnVi/U83CiX9ZOhwd0D4t5llSMQmktBTQEY0=; b=LVM0NyNnCt3LbNKRggRpcNNGedTRUWwVryawNvBHNVSS7s9b0Ta7qlQp++MxonBjNv RsDwedY7vAnoafUNjcIMgdIggN5cvJbYxCEFDlE9NChxzkhgxAIFpE3FP8AozYUvpv4y SQR+zBDl7lqreXtChoK6oNZkEITu468jbS9xkxjrjME18l5ZOLVkdNHzvYZMBzh470qY zsmK6q2gjnzrRginNKjwhcM1lQumWIV7jZ5jBQl0oXSyEfGNj1vuiF2pekY3Gw+acPIa ltpHsaxA2bWf0w2n9pkUlyaBvW8NbLcaMB0nGP0/McMhk7rLCLLXZihftnDg9ueBjaZA iI1w== X-Gm-Message-State: AE9vXwMqjKfGbrE5YMkXdR64c/I9vvYMv8/gVhCaVfJTM+EYS4Cl+cYKYdk7jQorz4M8gw== X-Received: by 10.28.187.67 with SMTP id l64mr9651206wmf.11.1472459294232; Mon, 29 Aug 2016 01:28:14 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56c9:0:decc:6e78:7e96:b452]) by smtp.gmail.com with ESMTPSA id b128sm12305797wmb.21.2016.08.29.01.28.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Aug 2016 01:28:13 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 8/9] drm: Unify handling of blob and object properties Date: Mon, 29 Aug 2016 10:27:56 +0200 Message-Id: <20160829082757.17913-8-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160829082757.17913-1-daniel.vetter@ffwll.ch> References: <20160829082757.17913-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Stone 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP They work exactly the same now, after the refcounting unification a bit ago. The only reason they're distinct is backwards compat with existing userspace. Cc: Daniel Stone Reviewed-by: Archit Taneja Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_property.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c index 162cc9032ae5..b5521f705b1c 100644 --- a/drivers/gpu/drm/drm_property.c +++ b/drivers/gpu/drm/drm_property.c @@ -911,20 +911,8 @@ bool drm_property_change_valid_get(struct drm_property *property, for (i = 0; i < property->num_values; i++) valid_mask |= (1ULL << property->values[i]); return !(value & ~valid_mask); - } else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB)) { - struct drm_property_blob *blob; - - if (value == 0) - return true; - - blob = drm_property_lookup_blob(property->dev, value); - if (blob) { - *ref = &blob->base; - return true; - } else { - return false; - } - } else if (drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) { + } else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB) || + drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) { /* a zero value for an object property translates to null: */ if (value == 0) return true; @@ -941,13 +929,12 @@ bool drm_property_change_valid_get(struct drm_property *property, } void drm_property_change_valid_put(struct drm_property *property, - struct drm_mode_object *ref) + struct drm_mode_object *ref) { if (!ref) return; - if (drm_property_type_is(property, DRM_MODE_PROP_OBJECT)) { + if (drm_property_type_is(property, DRM_MODE_PROP_OBJECT) || + drm_property_type_is(property, DRM_MODE_PROP_BLOB)) drm_mode_object_unreference(ref); - } else if (drm_property_type_is(property, DRM_MODE_PROP_BLOB)) - drm_property_unreference_blob(obj_to_blob(ref)); }