From patchwork Wed Aug 17 20:56:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9286589 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 9049C60839 for ; Wed, 17 Aug 2016 20:56:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 813D9293D0 for ; Wed, 17 Aug 2016 20:56:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75015293DA; Wed, 17 Aug 2016 20:56:39 +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 87E38293D9 for ; Wed, 17 Aug 2016 20:56:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6D856E939; Wed, 17 Aug 2016 20:56:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@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 AFADB6E93A for ; Wed, 17 Aug 2016 20:56:24 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id q128so1005556wma.1 for ; Wed, 17 Aug 2016 13:56:24 -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=uPj9VpHzK4q+I34zALG6Zc5XHK6RfboF7C0AZQU+6bk=; b=eeAErPpC1OH0N51jpUgv5sHEXMHFmAJ7gUfl4WlYrCOYPIc1MzXDZDYE8Njf5LbCWL eYz3e0LbNWXBogXeTisaAz7Fkpf4Mv0FgQD0BrtIGaNjMJFhB9zK9N3/yvfSZS2qK3a0 iZn1+2i5Y4KXGHg32jutr0LB19FN42nzeYgRg= 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=uPj9VpHzK4q+I34zALG6Zc5XHK6RfboF7C0AZQU+6bk=; b=RUxPG+ZyJli3nX155FYbwTduAv4TFss4qz81Gt5R4ZzFdGErZdjtNuVDAkS/awVZL0 AnzWNvB9ZdayvMmp5To3BV5s28VEqb9Fgda2L/McjoKFg4db5xXVWpBrfZ9APSY1WOxn LHRa3GnL5PzskNmDX//K/WzcwgyFmUwVu+NgZR/NF+qqazAoTa8kwFMEQKXm1ruhaTi+ EGJvdUZjpRQrnElZLaJjLUybuq5OBaua/vfoPO378DfO0u0iBPct9kQ2zYL+Ru0Nc8+1 kh7IRaYJOpL7NRmZUhp9WWP5jTI/IsZ/mzuCos2TA+J+rYyWqDmf/SmmXv+hIXhO62Ue 8w1w== X-Gm-Message-State: AEkoousdSX0r/3stuUAiXD+f3TcRXCYuGcYSEvcxr3g6ewSsmDSeW9MAZIL0FMn+dvjAlw== X-Received: by 10.28.229.1 with SMTP id c1mr30471643wmh.0.1471467383115; Wed, 17 Aug 2016 13:56:23 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id a203sm239519wma.0.2016.08.17.13.56.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Aug 2016 13:56:22 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Wed, 17 Aug 2016 22:56:05 +0200 Message-Id: <1471467366-26444-8-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1471467366-26444-1-git-send-email-daniel.vetter@ffwll.ch> References: <1471467366-26444-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Stone Subject: [Intel-gfx] [PATCH 8/9] drm: Unify handling of blob and object properties X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 Signed-off-by: Daniel Vetter Reviewed-by: Archit Taneja --- 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)); }