From patchwork Mon Sep 10 03:03:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 11259 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 31AAD23E41 for ; Mon, 10 Sep 2012 03:04:31 +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 ACC80A18030 for ; Mon, 10 Sep 2012 03:04:30 +0000 (UTC) Received: by ieak11 with SMTP id k11so2235201iea.11 for ; Sun, 09 Sep 2012 20:04:30 -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=U/wbIX4dWtgbDY0zkZgIkcnONGU0gaJkEntKHzy13n0=; b=ISLuH/5T5eOs4eT383OfyhOt6GyRjA8GeTHpfjeTcIgV0UdybNUQKfRE5U4AyC3aXZ 6EF+/84MyrTHuknerDd8PQdcQ7i6TKwRhElobln4DUhVRXPx6onBnjnv+4FNF0H3I7oQ PKeLk+yMiZCr8ZcAyTVfBPqoVqUMRYkYdgZxL3Zh/rHGorLq/SI4IUSduNkMb7DIPf24 oSGQvONc6CLKCoNtsDYOR2fFoEz4ltC5XXCl5buaQ+p2gpvb+RTGmqUrogBjs8CoCi0V vaDomhKfHJMY//jgithd/S+/GH16uuq4YOQLJIz4MYP87+fRTWNY5afEpdUhIZz1q71b nX1g== Received: by 10.50.191.227 with SMTP id hb3mr732040igc.43.1347246270132; Sun, 09 Sep 2012 20:04:30 -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 ex8csp70767igc; Sun, 9 Sep 2012 20:04:29 -0700 (PDT) Received: by 10.60.7.138 with SMTP id j10mr12441320oea.104.1347246269637; Sun, 09 Sep 2012 20:04:29 -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 is1si7284901obc.87.2012.09.09.20.04.29 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 20:04:29 -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 obbwd20 with SMTP id wd20so2865791obb.37 for ; Sun, 09 Sep 2012 20:04:29 -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=U/wbIX4dWtgbDY0zkZgIkcnONGU0gaJkEntKHzy13n0=; b=qDsBYAWiMh2+y86vPB3TCY2+lRQlD+rRxgxb9kXjqazmM6WjncK6Dle7R7P2OMSMfr i1ZV7fv9g53GPN7Vk9lWduSXC052/bXWLB5FhshGFhYJeRwP9oA3t5gxXt4wNDWRgN9C uWmxERYakt0Rkbd1wyFA6i3nrfUEmPQuEbJNOUywupl2V+AoRcnhjnyhgP5Xy3QdvA3q CPRasIG1dHsl7pBf747jHyoa5mfT+e4+yqr5RCb5kaXXG6+XCeYqCoDtJ1xI3DdQTD9z jD8rduecPC92Zo6h2PPGQQw/j53skGpe/qtYhhkURt+5hA7fUFpLMO6bt+vJlRdH5p70 dqQw== Received: by 10.182.110.67 with SMTP id hy3mr12759718obb.52.1347246269459; Sun, 09 Sep 2012 20:04:29 -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 ez16sm12216434obc.8.2012.09.09.20.04.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 20:04:28 -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 2/9] drm: add object property type Date: Sun, 9 Sep 2012 22:03:15 -0500 Message-Id: <1347246202-24249-3-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347246202-24249-1-git-send-email-rob.clark@linaro.org> References: <1347246202-24249-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQlZPBEh9Jg6sF6/41crPKo1S+qdZ6I+je1Ey5n4W8W1+tx4uRbz/i+FQ32arOdQmiEdP5Ju 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 | 28 ++++++++++++++++++++++++++++ include/drm/drm_crtc.h | 5 +++++ include/drm/drm_mode.h | 1 + 3 files changed, 34 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 40a3f21..12829de 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2859,6 +2859,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 +3220,9 @@ 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) { + /* check for valid object or zero happens elsewhere */ + return true; } else { int i; for (i = 0; i < property->num_values; i++) @@ -3280,6 +3300,14 @@ static int drm_mode_set_obj_prop(struct drm_device *dev, struct drm_property *property, uint64_t value) { if (drm_property_change_is_valid(property, value)) { + /* a zero value for an object property translates to null: */ + if ((property->flags & DRM_MODE_PROP_OBJECT) && value) { + struct drm_mode_object *obj = + drm_mode_object_find(dev, value, property->values[0]); + if (!obj) + return -EINVAL; + value = VOID2U64(obj); + } switch (obj->type) { case DRM_MODE_OBJECT_CONNECTOR: return drm_mode_connector_set_obj_prop(obj_to_connector(obj), diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index a609190..92df2f4 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -61,6 +61,9 @@ struct drm_object_properties { uint64_t values[DRM_OBJECT_MAX_PROPERTY]; }; +#define U642VOID(x) ((void *)(unsigned long)(x)) +#define VOID2U64(x) ((uint64_t)(unsigned long)(x)) + /* * Note on terminology: here, for brevity and convenience, we refer to connector * control chips as 'CRTCs'. They can control any type of connector, VGA, LVDS, @@ -955,6 +958,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); 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;