From patchwork Sat Oct 13 00:49:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 12197 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 7AF2023EFB for ; Sat, 13 Oct 2012 00:49:25 +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 19E87A18888 for ; Sat, 13 Oct 2012 00:49:25 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so5509072iej.11 for ; Fri, 12 Oct 2012 17:49:24 -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=yzNc3dEH0m6U43PcniyeUPS9GvuP2dTb9IqqEJZIrXw=; b=T+FO9acGDpbe/QZyPAvDyKe5pfQ2tTSYqyWGayve7MK0Z3ZkGuaiWKVR1om+Tgq88h ywjWOaIeA4LtEK2hElwMdWYY80ZJs5DGTIFC+kYLV4M7MqA95f+NfQkra4r/plCgtjjf WaJacuJxcHGkYVNR3JRDu480la6QQn/I3BufDSNgtpFn0RSBA+/RjmxwQU2R/cwUobH9 a4EAzhPD6u+togBNpJ8WqJmeLLO2hV+if/eg78B3fKxEZGw8e/ZObkRymfCCTtTSYR85 TQ004/2l0Kl1EWAIJZb13kt7KKtlWeYDRJZXUYMCCIPKmFLvhA5zV2Tg33uMJVIq2hqU tPww== Received: by 10.50.100.137 with SMTP id ey9mr3648916igb.57.1350089364558; Fri, 12 Oct 2012 17:49:24 -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.67.148 with SMTP id n20csp274604igt; Fri, 12 Oct 2012 17:49:24 -0700 (PDT) Received: by 10.60.3.136 with SMTP id c8mr4737497oec.11.1350089364124; Fri, 12 Oct 2012 17:49:24 -0700 (PDT) Received: from mail-oa0-f50.google.com (mail-oa0-f50.google.com [209.85.219.50]) by mx.google.com with ESMTPS id d7si101453oea.52.2012.10.12.17.49.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Oct 2012 17:49:24 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.219.50 as permitted sender) client-ip=209.85.219.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.219.50 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-oa0-f50.google.com with SMTP id n16so4214146oag.37 for ; Fri, 12 Oct 2012 17:49:24 -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=yzNc3dEH0m6U43PcniyeUPS9GvuP2dTb9IqqEJZIrXw=; b=hBumDd0sbCsTNMx2zJUn+7e5yJbQVglH4kyJp8jH5aS5RBEtUK+kCmAWOmlYS/Udxw AfSQfFJ9w1cAzZmRGOQJOvW2ix2I5ilI0dCHqoq7I2WQPizxMnomJO75O2WM+LNCvvbY EFdaJsYIGSfKOZqABFTEiQjAw8peNJZ7YoDyLkcjPvtreW66E9h3vQN9BOrYAijk5QlX u9s1hXsvwQzw+dHVrbDjQXnvk2JCVlIl3XicqEJsxWqme0XafHNHoDPD0SgGuBYHwKii USZMHyLQyNafswbQIN/CDOU/k6/+XaLgVRwF4lC+7ene6yRJVRwEd0kQyf8ejT3DLq84 /i0w== Received: by 10.60.169.170 with SMTP id af10mr4852624oec.17.1350089363999; Fri, 12 Oct 2012 17:49:23 -0700 (PDT) Received: from localhost (ppp-70-129-143-201.dsl.rcsntx.swbell.net. [70.129.143.201]) by mx.google.com with ESMTPS id hz6sm8256578obb.1.2012.10.12.17.49.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Oct 2012 17:49:23 -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, krh@bitplanet.net, Rob Clark Subject: [RFC 02/11] drm: add object property type Date: Fri, 12 Oct 2012 19:49:03 -0500 Message-Id: <1350089352-18162-3-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350089352-18162-1-git-send-email-rob.clark@linaro.org> References: <1350089352-18162-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQljdoGoVJqycA/cmO0ntQvC4ay+xctFaznnuwn4PGLSZyO7G9TOt2GddSjwhFSx3KMPsI2s 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 | 33 +++++++++++++++++++++++++++++---- include/drm/drm_crtc.h | 10 ++++++++++ include/drm/drm_mode.h | 1 + 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index a236acf..e25903d 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2758,6 +2758,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) @@ -2861,6 +2863,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) { @@ -3184,6 +3203,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++) @@ -3256,9 +3280,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) { @@ -3272,6 +3295,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; @@ -3306,7 +3331,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 4ae5295..f319127 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -290,6 +290,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; }; @@ -947,6 +948,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); @@ -966,6 +969,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 3d6301b..dff792f 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;