From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: Re: [PATCH 2/4] drm: Add plane type property Date: Thu, 27 Feb 2014 17:39:00 -0500 Message-ID: References: <1393539283-5901-1-git-send-email-matthew.d.roper@intel.com> <1393539283-5901-3-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by gabe.freedesktop.org (Postfix) with ESMTP id C0D01FB98A for ; Thu, 27 Feb 2014 14:39:00 -0800 (PST) Received: by mail-vc0-f180.google.com with SMTP id ks9so3230892vcb.11 for ; Thu, 27 Feb 2014 14:39:00 -0800 (PST) In-Reply-To: <1393539283-5901-3-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: Matt Roper Cc: "dri-devel@lists.freedesktop.org" List-Id: dri-devel@lists.freedesktop.org On Thu, Feb 27, 2014 at 5:14 PM, Matt Roper wrote: > Add a plane type property to allow userspace to distinguish > sprite/overlay planes from primary planes. In the future we may extend > this to cover cursor planes as well. > > Signed-off-by: Matt Roper > --- > drivers/gpu/drm/drm_crtc.c | 32 ++++++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 1 + > include/uapi/drm/drm_mode.h | 3 +++ > 3 files changed, 36 insertions(+) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 21c6d4b..1032eaf 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -114,6 +114,14 @@ static const struct drm_prop_enum_list drm_dpms_enum_list[] = > > DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list) > > +static const struct drm_prop_enum_list drm_plane_type_enum_list[] = > +{ > + { DRM_MODE_PLANE_TYPE_SPRITE, "Sprite" }, I'm not the *hugest* fan of using the name "sprite".. at least that too me implies sort of a subset of possible functionality of a plane.. > + { DRM_MODE_PLANE_TYPE_PRIMARY, "Primary" }, > +}; > + > +DRM_ENUM_NAME_FN(drm_get_plane_type, drm_plane_type_enum_list) > + > /* > * Optional properties > */ > @@ -1046,6 +1054,10 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, > INIT_LIST_HEAD(&plane->head); > } > > + drm_object_attach_property(&plane->base, > + dev->mode_config.plane_type_property, > + DRM_MODE_PLANE_TYPE_SPRITE); > + > out: > drm_modeset_unlock_all(dev); > > @@ -1114,6 +1126,10 @@ int drm_plane_set_primary(struct drm_device *dev, struct drm_plane *plane, fwiw, this comment probably belongs in #1/4 but: you probably don't need to introduce drm_plane_set_primary().. instead you could just rename the 'bool priv' to 'bool prim'. I think there are just three drivers using primary planes.. I'm not 100% sure about exynos, but both omap and msm, the private plane == primary plane. At least it was the intention to morph that into primary planes. Anyways, other than that I like the patchset. Hopefully I should get to rebasing the atomic patches real soon now, so I'll try rebasing on top of this and see how it goes. BR, -R > dev->mode_config.num_primary_plane++; > INIT_LIST_HEAD(&plane->head); > > + drm_object_attach_property(&plane->base, > + dev->mode_config.plane_type_property, > + DRM_MODE_PLANE_TYPE_PRIMARY); > + > out: > drm_modeset_unlock_all(dev); > > @@ -1236,6 +1252,21 @@ static int drm_mode_create_standard_connector_properties(struct drm_device *dev) > return 0; > } > > +static int drm_mode_create_standard_plane_properties(struct drm_device *dev) > +{ > + struct drm_property *type; > + > + /* > + * Standard properties (apply to all planes) > + */ > + type = drm_property_create_enum(dev, 0, > + "TYPE", drm_plane_type_enum_list, > + ARRAY_SIZE(drm_plane_type_enum_list)); > + dev->mode_config.plane_type_property = type; > + > + return 0; > +} > + > /** > * drm_mode_create_dvi_i_properties - create DVI-I specific connector properties > * @dev: DRM device > @@ -4211,6 +4242,7 @@ void drm_mode_config_init(struct drm_device *dev) > > drm_modeset_lock_all(dev); > drm_mode_create_standard_connector_properties(dev); > + drm_mode_create_standard_plane_properties(dev); > drm_modeset_unlock_all(dev); > > /* Just to be sure */ > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 33a955b..d25cd9c 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -884,6 +884,7 @@ struct drm_mode_config { > struct list_head property_blob_list; > struct drm_property *edid_property; > struct drm_property *dpms_property; > + struct drm_property *plane_type_property; > > /* DVI-I properties */ > struct drm_property *dvi_i_subconnector_property; > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h > index f104c26..c19705b 100644 > --- a/include/uapi/drm/drm_mode.h > +++ b/include/uapi/drm/drm_mode.h > @@ -496,4 +496,7 @@ struct drm_mode_destroy_dumb { > uint32_t handle; > }; > > +#define DRM_MODE_PLANE_TYPE_SPRITE 0 > +#define DRM_MODE_PLANE_TYPE_PRIMARY 1 > + > #endif > -- > 1.8.5.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel