From: Daniel Vetter <daniel@ffwll.ch>
To: Dave Airlie <airlied@gmail.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 5/6] drm/tile: expose the tile property to userspace
Date: Mon, 20 Oct 2014 17:31:51 +0200 [thread overview]
Message-ID: <20141020153151.GN26941@phenom.ffwll.local> (raw)
In-Reply-To: <1413787036-19114-6-git-send-email-airlied@gmail.com>
On Mon, Oct 20, 2014 at 04:37:15PM +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied@redhat.com>
>
> This takes the tiling info from the connector and
> exposes it to userspace, as a blob object in a
> connector property.
>
> The contents of the blob is ABI.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
> ---
> drivers/gpu/drm/drm_crtc.c | 36 ++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 ++
> include/drm/drm_crtc.h | 4 ++++
> 3 files changed, 42 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 93135d4..81e867a 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -1319,6 +1319,11 @@ static int drm_mode_create_standard_connector_properties(struct drm_device *dev)
> "PATH", 0);
> dev->mode_config.path_property = dev_path;
>
> + dev->mode_config.tile_property = drm_property_create(dev,
> + DRM_MODE_PROP_BLOB |
> + DRM_MODE_PROP_IMMUTABLE,
> + "TILE", 0);
> +
> return 0;
> }
>
> @@ -4004,6 +4009,37 @@ int drm_mode_connector_set_path_property(struct drm_connector *connector,
> }
> EXPORT_SYMBOL(drm_mode_connector_set_path_property);
>
> +int drm_mode_connector_set_tile_property(struct drm_connector *connector)
Same again, please add some kerneldoc for this function here.
-Daniel
> +{
> + struct drm_device *dev = connector->dev;
> + int ret, size;
> + char tile[256];
> +
> + if (connector->tile_blob_ptr)
> + drm_property_destroy_blob(dev, connector->tile_blob_ptr);
> +
> + if (!connector->has_tile) {
> + connector->tile_blob_ptr = NULL;
> + ret = drm_object_property_set_value(&connector->base,
> + dev->mode_config.tile_property, 0);
> + return ret;
> + }
> +
> + snprintf(tile, 256, "%d:%d:%d:%d:%d:%d:%d:%d", connector->tile_group->id, connector->tile_is_single_monitor, connector->num_h_tile, connector->num_v_tile, connector->tile_h_loc, connector->tile_v_loc, connector->tile_h_size, connector->tile_v_size);
> + size = strlen(tile) + 1;
> +
> + connector->tile_blob_ptr = drm_property_create_blob(connector->dev,
> + size, tile);
> + if (!connector->tile_blob_ptr)
> + return -EINVAL;
> +
> + ret = drm_object_property_set_value(&connector->base,
> + dev->mode_config.tile_property,
> + connector->tile_blob_ptr->base.id);
> + return ret;
> +}
> +EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> +
> /**
> * drm_mode_connector_update_edid_property - update the edid property of a connector
> * @connector: drm connector
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index c66e73a..c5529ff 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -422,6 +422,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> intel_dp_add_properties(intel_dp, connector);
>
> drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
> + drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
> +
> drm_mode_connector_set_path_property(connector, pathprop);
> drm_reinit_primary_mode_group(dev);
> mutex_lock(&dev->mode_config.mutex);
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index d71b6d7..39d744b 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -548,6 +548,8 @@ struct drm_connector {
>
> struct drm_property_blob *path_blob_ptr;
>
> + struct drm_property_blob *tile_blob_ptr;
> +
> uint8_t polled; /* DRM_CONNECTOR_POLL_* */
>
> /* requested DPMS state */
> @@ -838,6 +840,7 @@ struct drm_mode_config {
> struct drm_property *edid_property;
> struct drm_property *dpms_property;
> struct drm_property *path_property;
> + struct drm_property *tile_property;
> struct drm_property *plane_type_property;
>
> /* DVI-I properties */
> @@ -990,6 +993,7 @@ extern void drm_mode_config_cleanup(struct drm_device *dev);
>
> extern int drm_mode_connector_set_path_property(struct drm_connector *connector,
> char *path);
> +int drm_mode_connector_set_tile_property(struct drm_connector *connector);
> extern int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> struct edid *edid);
>
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2014-10-20 15:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 6:37 drm tiled monitor support (not hiding in kernel) Dave Airlie
2014-10-20 6:37 ` [PATCH 1/6] drm/displayid: add displayid defines and edid extension Dave Airlie
2014-10-20 16:16 ` Jani Nikula
2014-10-20 6:37 ` [PATCH 2/6] drm: add tile_group support Dave Airlie
2014-10-20 9:11 ` David Herrmann
2014-10-20 15:32 ` Daniel Vetter
2014-10-22 2:23 ` Dave Airlie
2014-10-22 8:42 ` Daniel Vetter
2014-10-20 6:37 ` [PATCH 3/6] drm/mst: cached EDID for logical ports Dave Airlie
2014-10-20 6:37 ` [PATCH 4/6] drm/connector: store tile information from displayid Dave Airlie
2014-10-20 6:37 ` [PATCH 5/6] drm/tile: expose the tile property to userspace Dave Airlie
2014-10-20 9:15 ` David Herrmann
2014-10-20 15:31 ` Daniel Vetter [this message]
2014-10-20 15:34 ` [Intel-gfx] " Daniel Vetter
2014-10-20 15:35 ` Daniel Vetter
2014-10-20 6:37 ` [PATCH 6/6] drm/fb: add support for tiled monitor configurations Dave Airlie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141020153151.GN26941@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.