From patchwork Thu Sep 13 03:49:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 11373 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 61B2523E29 for ; Thu, 13 Sep 2012 03:50:39 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id EBB7434B8D35 for ; Thu, 13 Sep 2012 03:50:35 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so4067700iea.11 for ; Wed, 12 Sep 2012 20:50:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=JVa9Wscdapa6+jImIqNeXQvR3svRvepveCllyB/btX8=; b=AfgX2adwk7kO0JjNfIZMPc+r8bStg5nMnTDW0f6IcUZABT8XJKWaemAIhQE2N5JFrL Y4nRrA2U8DKALcsLks/VvuwaNREJpSscMzw57c8N1131NRYDTXuo9DkPCxLM4SgoritZ kJ+cMNOiV7ZL/YQz3PuwzanDwEH9MBmZpMCp9conGFfV+ZmRqFi86jvHIBmkDBb2IH6c UXFGVzqd5CfqUUOUFjVgovcWx+YTfNIWVBqdi8JdLr7MkMdcqoLm0SyXhO8tj7s3/eeK eU8krih9kzzMxhgtVpgZhaIMGTQAAdkDFv41erN9WXEZzdcax0Bv7v1pnpEgfpGpMqa2 GraQ== Received: by 10.50.237.41 with SMTP id uz9mr580423igc.43.1347508235749; Wed, 12 Sep 2012 20:50:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp111053igc; Wed, 12 Sep 2012 20:50:35 -0700 (PDT) Received: by 10.60.0.169 with SMTP id 9mr485552oef.94.1347508234819; Wed, 12 Sep 2012 20:50:34 -0700 (PDT) Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id rp7si28188597obc.5.2012.09.12.20.50.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 20:50:34 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-ob0-f178.google.com with SMTP id wd20so4595268obb.37 for ; Wed, 12 Sep 2012 20:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=JVa9Wscdapa6+jImIqNeXQvR3svRvepveCllyB/btX8=; b=Dt0+DqYLyqXaJ2Kgb94XK/X/SnulxZsl9D+dNJyeLbT6RWYFnfjaqc3FPeXiq9Vmas 6eGxREMiIQmgN64YHCE0pBWAVHMr/zPMt/dbQz6BPI4kvNs4EfXfC4DkHDcsJqn6Lzfs VDZDu64xQSRE10jhhIvo1Ma/4ajFI6tMdcAJxkoL+ZhK1jLn2nHa4/nlm29ceeeKt9lz cu/xDVn0RJIR4CGz+DnxgKKvMD4oShVPtxrZKMAfs+DqRFTYmOvm9fH071KfTlGIh/3B KtUaMiMIo1+UKSTrTKz7ZiYiUXW/C8UMgYGekn0kmJMH71Xy1cLs9uExqKJsG6DR38qh 0L4g== Received: by 10.60.6.167 with SMTP id c7mr473372oea.88.1347508234627; Wed, 12 Sep 2012 20:50:34 -0700 (PDT) Received: from localhost (ppp-70-129-131-42.dsl.rcsntx.swbell.net. [70.129.131.42]) by mx.google.com with ESMTPS id zn9sm22526070obb.23.2012.09.12.20.50.33 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 20:50:34 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, ville.syrjala@linux.intel.com, jbarnes@virtuousgeek.org, daniel.vetter@ffwll.ch, Rob Clark Subject: [RFC 02/11] drm: add object property type Date: Wed, 12 Sep 2012 22:49:48 -0500 Message-Id: <1347508195-14939-3-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347508195-14939-1-git-send-email-rob.clark@linaro.org> References: <1347508195-14939-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQl7rtVkfZDUM4q5b3w72ySI45z50LRE2xliqnGIoH2rs+EqB22kYtYqDugBw9xCmmV6eOAs From: Rob Clark An object property is an id (idr) for a drm mode object. This will allow a property to be used set/get a framebuffer, CRTC, etc. --- drivers/gpu/drm/drm_crtc.c | 35 ++++++++++++++++++++++++++++++----- include/drm/drm_crtc.h | 10 ++++++++++ include/drm/drm_mode.h | 1 + 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 3a087cf..2b4526e 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2756,6 +2756,8 @@ struct drm_property *drm_property_create(struct drm_device *dev, int flags, if (!property) return NULL; + property->dev = dev; + if (num_values) { property->values = kzalloc(sizeof(uint64_t)*num_values, GFP_KERNEL); if (!property->values) @@ -2859,6 +2861,23 @@ struct drm_property *drm_property_create_range(struct drm_device *dev, int flags } EXPORT_SYMBOL(drm_property_create_range); +struct drm_property *drm_property_create_object(struct drm_device *dev, + int flags, const char *name, uint32_t type) +{ + struct drm_property *property; + + flags |= DRM_MODE_PROP_OBJECT; + + property = drm_property_create(dev, flags, name, 1); + if (!property) + return NULL; + + property->values[0] = type; + + return property; +} +EXPORT_SYMBOL(drm_property_create_object); + int drm_property_add_enum(struct drm_property *property, int index, uint64_t value, const char *name) { @@ -3203,6 +3222,11 @@ static bool drm_property_change_is_valid(struct drm_property *property, for (i = 0; i < property->num_values; i++) valid_mask |= (1ULL << property->values[i]); return !(value & ~valid_mask); + } else if (property->flags & DRM_MODE_PROP_OBJECT) { + /* a zero value for an object property translates to null: */ + if (value) + return true; + return drm_property_get_obj(property, value) != NULL; } else { int i; for (i = 0; i < property->num_values; i++) @@ -3243,7 +3267,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_connector *connector, /* store the property value if successful */ if (!ret) - drm_connector_property_set_value(connector, property, value); + drm_object_property_set_value(&connector->base, property, value); return ret; } @@ -3275,9 +3299,8 @@ static int drm_mode_plane_set_obj_prop(struct drm_plane *plane, return ret; } -static int drm_mode_set_obj_prop(struct drm_device *dev, - struct drm_mode_object *obj, void *state, - struct drm_property *property, uint64_t value) +static int drm_mode_set_obj_prop(struct drm_mode_object *obj, + void *state, struct drm_property *property, uint64_t value) { if (drm_property_change_is_valid(property, value)) { switch (obj->type) { @@ -3291,6 +3314,8 @@ static int drm_mode_set_obj_prop(struct drm_device *dev, return drm_mode_plane_set_obj_prop(obj_to_plane(obj), state, property, value); } + } else { + DRM_DEBUG("invalid value: %s = %llx\n", property->name, value); } return -EINVAL; @@ -3325,7 +3350,7 @@ static int drm_mode_set_obj_prop_id(struct drm_device *dev, void *state, return -EINVAL; property = obj_to_property(prop_obj); - return drm_mode_set_obj_prop(dev, arg_obj, state, property, value); + return drm_mode_set_obj_prop(arg_obj, state, property, value); } int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data, diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index a609190..0dbf2be 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -291,6 +291,7 @@ struct drm_property { char name[DRM_PROP_NAME_LEN]; uint32_t num_values; uint64_t *values; + struct drm_device *dev; struct list_head enum_blob_list; }; @@ -955,6 +956,8 @@ struct drm_property *drm_property_create_bitmask(struct drm_device *dev, struct drm_property *drm_property_create_range(struct drm_device *dev, int flags, const char *name, uint64_t min, uint64_t max); +struct drm_property *drm_property_create_object(struct drm_device *dev, + int flags, const char *name, uint32_t type); extern void drm_property_destroy(struct drm_device *dev, struct drm_property *property); extern int drm_property_add_enum(struct drm_property *property, int index, uint64_t value, const char *name); @@ -974,6 +977,13 @@ extern int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc, int gamma_size); 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); diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 5581980..cee4c53 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -231,6 +231,7 @@ struct drm_mode_get_connector { #define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */ #define DRM_MODE_PROP_BLOB (1<<4) #define DRM_MODE_PROP_BITMASK (1<<5) /* bitmask of enumerated types */ +#define DRM_MODE_PROP_OBJECT (1<<6) /* drm mode object */ struct drm_mode_property_enum { __u64 value;