From patchwork Wed May 16 08:58:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 8671 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 BF24823E1B for ; Wed, 16 May 2012 08:59:18 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 71D09A18A69 for ; Wed, 16 May 2012 08:59:18 +0000 (UTC) Received: by yenq6 with SMTP id q6so519087yen.11 for ; Wed, 16 May 2012 01:59:18 -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=HMghyLF6mdkYCD0Ebt0hkUnybp6zO+W4ttzpYvz8NDU=; b=c1HJ0P4ZuqLcpuFZFVxU88xgjkn/cvH1VlS2o9y6jI5kv9EiRXNQShw+9UaWcxl+OH /+QOerRs/7Ym1KI6PCYYuQycEoW51BLJYrBkx0IJXRP3WSj0eY4SrW7wnpUkp2HEOgos eBg3C5ZM4/OP7kjBvB+nbe0uLeU5u4+1ZjJtT4IR3Acewe7p5GhQ5Mv8bdp6v5Qj5TYe 0a4VmS1gsxlDFPH+LthjOj/BxZUOunRvt7Hs1u44KwbJhe9H3pvJFetPJWfBZpOlglgj NgL3BIO8c1SjhqMCYdqxL6gSp1S4QaIMyUmPnucAGhP5wkKtD6H5Iiyl/TYBbjL/MoKN UOsQ== Received: by 10.50.185.233 with SMTP id ff9mr9231863igc.57.1337158757591; Wed, 16 May 2012 01:59:17 -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.231.35.72 with SMTP id o8csp478574ibd; Wed, 16 May 2012 01:59:17 -0700 (PDT) Received: by 10.182.197.65 with SMTP id is1mr2051248obc.27.1337158756685; Wed, 16 May 2012 01:59:16 -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 k10si704317oeb.57.2012.05.16.01.59.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 May 2012 01:59:16 -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 eq6so1104943obc.37 for ; Wed, 16 May 2012 01:59:16 -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=HMghyLF6mdkYCD0Ebt0hkUnybp6zO+W4ttzpYvz8NDU=; b=e/qXB5nU1sYxTnsQdcolNKUkhQuothbleushqhOMwjJ/NTvoQ9CbYuVHCTbGRYxPah 4JnuQqndpC2elFcpqaFEeYEDccDTMjtygBV8oiDJgVnjFy5S4wvQe2x+W9yGFITbsME5 n2Q+AYxzC6ltTHInr6xIZmoayHLFui+6oP+rtgaLyI9SRLpISn+wZ7j7Z5v/uzqvu/tJ 7TBmNie5tLo6t/8+Gxy8YsfTlF1YGTfw7/XrUzfBjtm9djI93TkqTzZtHEI6e0tHdQIB CbHPfuQGOJL9k+BRTTvsI1DAWk7qhVrdPgq3Cb399yq0VC5ewNCOJp/FiUq6/7YlG2cf VdXQ== Received: by 10.182.74.42 with SMTP id q10mr1976866obv.52.1337158756450; Wed, 16 May 2012 01:59:16 -0700 (PDT) Received: from localhost (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id g9sm1387773oeh.10.2012.05.16.01.59.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 May 2012 01:59:15 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, Paulo Zanoni , Rob Clark Subject: [PATCH 1/2] drm: add bitmask property type Date: Wed, 16 May 2012 02:58:57 -0600 Message-Id: <1337158738-31685-2-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1337158738-31685-1-git-send-email-rob.clark@linaro.org> References: <1337158738-31685-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQlxfF96BTqCiOFOhuDuXFgp6G0bHQtJonSJ69AnLFjZiAX76FgPuHholRXJFK5k92NHtXw3 From: Rob Clark A bitmask property is similar to an enum. The enum value is a bit position (0-63), and valid property values consist of a mask of zero or more of (1 << enum_val[n]). Signed-off-by: Rob Clark Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/drm_crtc.c | 46 +++++++++++++++++++++++++++++++++++++++++--- include/drm/drm_crtc.h | 3 +++ include/drm/drm_mode.h | 1 + 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 75661c8..022873e 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2707,6 +2707,33 @@ struct drm_property *drm_property_create_enum(struct drm_device *dev, int flags, } EXPORT_SYMBOL(drm_property_create_enum); +struct drm_property *drm_property_create_bitmask(struct drm_device *dev, + int flags, const char *name, + const struct drm_prop_enum_list *props, int num_values) +{ + struct drm_property *property; + int i, ret; + + flags |= DRM_MODE_PROP_BITMASK; + + property = drm_property_create(dev, flags, name, num_values); + if (!property) + return NULL; + + for (i = 0; i < num_values; i++) { + ret = drm_property_add_enum(property, i, + props[i].type, + props[i].name); + if (ret) { + drm_property_destroy(dev, property); + return NULL; + } + } + + return property; +} +EXPORT_SYMBOL(drm_property_create_bitmask); + struct drm_property *drm_property_create_range(struct drm_device *dev, int flags, const char *name, uint64_t min, uint64_t max) @@ -2731,7 +2758,14 @@ int drm_property_add_enum(struct drm_property *property, int index, { struct drm_property_enum *prop_enum; - if (!(property->flags & DRM_MODE_PROP_ENUM)) + if (!(property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK))) + return -EINVAL; + + /* + * Bitmask enum properties have the additional constraint of values + * from 0 to 63 + */ + if ((property->flags & DRM_MODE_PROP_BITMASK) && (value > 63)) return -EINVAL; if (!list_empty(&property->enum_blob_list)) { @@ -2875,7 +2909,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, } property = obj_to_property(obj); - if (property->flags & DRM_MODE_PROP_ENUM) { + if (property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) { list_for_each_entry(prop_enum, &property->enum_blob_list, head) enum_count++; } else if (property->flags & DRM_MODE_PROP_BLOB) { @@ -2900,7 +2934,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, } out_resp->count_values = value_count; - if (property->flags & DRM_MODE_PROP_ENUM) { + if (property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) { if ((out_resp->count_enum_blobs >= enum_count) && enum_count) { copied = 0; enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr; @@ -3055,6 +3089,12 @@ static bool drm_property_change_is_valid(struct drm_property *property, if (value < property->values[0] || value > property->values[1]) return false; return true; + } else if (property->flags & DRM_MODE_PROP_BITMASK) { + int i; + __u64 valid_mask = 0; + for (i = 0; i < property->num_values; i++) + valid_mask |= (1LL << property->values[i]); + return !(value & ~valid_mask); } else { int i; for (i = 0; i < property->num_values; i++) diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index e194c78..39e3e1c 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -940,6 +940,9 @@ extern struct drm_property *drm_property_create_enum(struct drm_device *dev, int const char *name, const struct drm_prop_enum_list *props, int num_values); +struct drm_property *drm_property_create_bitmask(struct drm_device *dev, + int flags, const char *name, + const struct drm_prop_enum_list *props, int num_values); struct drm_property *drm_property_create_range(struct drm_device *dev, int flags, const char *name, uint64_t min, uint64_t max); diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 326f2be..5581980 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -230,6 +230,7 @@ struct drm_mode_get_connector { #define DRM_MODE_PROP_IMMUTABLE (1<<2) #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 */ struct drm_mode_property_enum { __u64 value;