* [PATCH v5 1/5] drm: add generic zpos property
2016-01-27 14:44 [PATCH v5 0/5] drm/exynos: introduce generic zpos and blending properties Marek Szyprowski
@ 2016-01-27 14:44 ` Marek Szyprowski
2016-02-29 15:12 ` Ville Syrjälä
2016-01-27 14:44 ` [PATCH v5 2/5] drm/exynos: use generic code for managing zpos plane property Marek Szyprowski
` (4 subsequent siblings)
5 siblings, 1 reply; 20+ messages in thread
From: Marek Szyprowski @ 2016-01-27 14:44 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: Marek Szyprowski, Inki Dae, Daniel Vetter,
Ville Syrjälä,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
This patch adds support for generic plane's zpos property property with
well-defined semantics:
- added zpos properties to drm core and plane state structures
- added helpers for normalizing zpos properties of given set of planes
- well defined semantics: planes are sorted by zpos values and then plane
id value if zpos equals
Normalized zpos values are calculated automatically when generic
muttable zpos property has been initialized. Drivers can simply use
plane_state->normalized_zpos in their atomic_check and/or plane_update
callbacks without any additional calls to DRM core.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
Documentation/DocBook/gpu.tmpl | 14 ++-
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/drm_atomic.c | 4 +
drivers/gpu/drm/drm_atomic_helper.c | 6 +
drivers/gpu/drm/drm_blend.c | 227 ++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/drm_crtc_internal.h | 3 +
include/drm/drm_crtc.h | 17 +++
7 files changed, 270 insertions(+), 3 deletions(-)
create mode 100644 drivers/gpu/drm/drm_blend.c
diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
index a8669330b456..ae7d913adf60 100644
--- a/Documentation/DocBook/gpu.tmpl
+++ b/Documentation/DocBook/gpu.tmpl
@@ -1816,7 +1816,7 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >Description/Restrictions</td>
</tr>
<tr>
- <td rowspan="37" valign="top" >DRM</td>
+ <td rowspan="38" valign="top" >DRM</td>
<td valign="top" >Generic</td>
<td valign="top" >“rotation”</td>
<td valign="top" >BITMASK</td>
@@ -2068,7 +2068,7 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >property to suggest an Y offset for a connector</td>
</tr>
<tr>
- <td rowspan="3" valign="top" >Optional</td>
+ <td rowspan="4" valign="top" >Optional</td>
<td valign="top" >“scaling mode”</td>
<td valign="top" >ENUM</td>
<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
@@ -2092,6 +2092,16 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >TBD</td>
</tr>
<tr>
+ <td valign="top" > "zpos" </td>
+ <td valign="top" >RANGE</td>
+ <td valign="top" >Min=0, Max= driver dependent</td>
+ <td valign="top" >Plane</td>
+ <td valign="top" >Plane's 'z' position during blending operation (0 for background, highest for frontmost).
+ If two planes assigned to same CRTC have equal zpos values, the plane with higher plane
+ id is treated as closer to front. Can be IMMUTABLE if driver doesn't support changing
+ planes' order. Exact value range is driver dependent.</td>
+ </tr>
+ <tr>
<td rowspan="20" valign="top" >i915</td>
<td rowspan="2" valign="top" >Generic</td>
<td valign="top" >"Broadcast RGB"</td>
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 61766dec6a8d..eeefaba1c092 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -2,7 +2,7 @@
# Makefile for the drm device driver. This driver provides support for the
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
-drm-y := drm_auth.o drm_bufs.o drm_cache.o \
+drm-y := drm_auth.o drm_bufs.o drm_blend.o drm_cache.o \
drm_context.o drm_dma.o \
drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 3f74193885f1..a19201efb7d1 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -630,6 +630,8 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
state->src_h = val;
} else if (property == config->rotation_property) {
state->rotation = val;
+ } else if (property == config->zpos_property) {
+ state->zpos = val;
} else if (plane->funcs->atomic_set_property) {
return plane->funcs->atomic_set_property(plane, state,
property, val);
@@ -686,6 +688,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
*val = state->src_h;
} else if (property == config->rotation_property) {
*val = state->rotation;
+ } else if (property == config->zpos_property) {
+ *val = state->zpos;
} else if (plane->funcs->atomic_get_property) {
return plane->funcs->atomic_get_property(plane, state, property, val);
} else {
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 53db2d9120be..9fbfb672b317 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -32,6 +32,8 @@
#include <drm/drm_atomic_helper.h>
#include <linux/fence.h>
+#include "drm_crtc_internal.h"
+
/**
* DOC: overview
*
@@ -530,6 +532,10 @@ drm_atomic_helper_check_planes(struct drm_device *dev,
struct drm_plane_state *plane_state;
int i, ret = 0;
+ ret = drm_atomic_helper_normalize_zpos(dev, state);
+ if (ret)
+ return ret;
+
for_each_plane_in_state(state, plane, plane_state, i) {
const struct drm_plane_helper_funcs *funcs;
diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
new file mode 100644
index 000000000000..cdcb647c8ed9
--- /dev/null
+++ b/drivers/gpu/drm/drm_blend.c
@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2016 Samsung Electronics Co.Ltd
+ * Authors:
+ * Marek Szyprowski <m.szyprowski@samsung.com>
+ *
+ * DRM core plane blending related functions
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+#include <linux/slab.h>
+#include <linux/sort.h>
+#include <linux/export.h>
+#include <drm/drmP.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_atomic.h>
+
+#include "drm_internal.h"
+
+/**
+ * drm_mode_create_zpos_property - create muttable zpos property
+ * @dev: DRM device
+ * @min: minimal possible value of zpos property
+ * @max: maximal possible value of zpos property
+ *
+ * This function initializes generic muttable zpos property and enables support
+ * for it in drm core. Drivers can then attach this property to planes to enable
+ * support for configurable planes arrangement during blending operation.
+ * Once muttable zpos property has been enabled, the DRM core will automatically
+ * calculate drm_plane_state->normalized_zpos values. Usually min should be set
+ * to 0 and max to maximal number of planes for given crtc - 1.
+ *
+ * If zpos of some planes cannot be changed (like fixed backgroud or
+ * cursor/topmost planes), driver should adjust min/max values and assign those
+ * planes immutable zpos property with lower or higher values (for more
+ * information, see drm_mode_create_zpos_immutable_property() function). In such
+ * case driver should also assign proper initial zpos values for all planes in
+ * its plane_reset() callback, so the planes will be always sorted properly.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_mode_create_zpos_property(struct drm_device *dev, unsigned int min,
+ unsigned int max)
+{
+ struct drm_property *prop;
+
+ prop = drm_property_create_range(dev, 0, "zpos", min, max);
+ if (!prop)
+ return -ENOMEM;
+
+ dev->mode_config.zpos_property = prop;
+ return 0;
+}
+EXPORT_SYMBOL(drm_mode_create_zpos_property);
+
+/**
+ * drm_mode_create_zpos_immutable_property - create immuttable zpos property
+ * @dev: DRM device
+ * @min: minimal possible value of zpos property
+ * @max: maximal possible value of zpos property
+ *
+ * This function initializes generic immuttable zpos property and enables
+ * support for it in drm core. Using this property driver lets userspace
+ * to get the arrangement of the planes for blending operation and notifies
+ * it that the hardware (or driver) doesn't support changing of the planes'
+ * order.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
+ unsigned int min, unsigned int max)
+{
+ struct drm_property *prop;
+
+ prop = drm_property_create_range(dev, DRM_MODE_PROP_IMMUTABLE, "zpos",
+ min, max);
+ if (!prop)
+ return -ENOMEM;
+
+ dev->mode_config.zpos_immutable_property = prop;
+ return 0;
+}
+EXPORT_SYMBOL(drm_mode_create_zpos_immutable_property);
+
+static int drm_atomic_state_zpos_cmp(const void *a, const void *b)
+{
+ const struct drm_plane_state *sa = *(struct drm_plane_state **)a;
+ const struct drm_plane_state *sb = *(struct drm_plane_state **)b;
+ int zpos_a = (sa->zpos << 16) + sa->plane->base.id;
+ int zpos_b = (sb->zpos << 16) + sb->plane->base.id;
+
+ return zpos_a - zpos_b;
+}
+
+/**
+ * drm_atomic_helper_crtc_normalize_zpos - calculate normalized zpos values
+ * @crtc: crtc with planes, which have to be considered for normalization
+ * @crtc_state: new atomic state to apply
+ *
+ * This function checks new states of all planes assigned to given crtc and
+ * calculates normalized zpos value for them. Planes are compared first by their
+ * zpos values, then by plane id (if zpos equals). Plane with lowest zpos value
+ * is at the bottom. The plane_state->normalized_zpos is then filled with uniqe
+ * values from 0 to number of active planes in crtc minus one.
+ *
+ * RETURNS
+ * Zero for success or -errno
+ */
+int drm_atomic_helper_crtc_normalize_zpos(struct drm_crtc *crtc,
+ struct drm_crtc_state *crtc_state)
+{
+ struct drm_atomic_state *state = crtc_state->state;
+ struct drm_device *dev = crtc->dev;
+ int total_planes = dev->mode_config.num_total_plane;
+ struct drm_plane_state **states;
+ struct drm_plane *plane;
+ int i, n = 0;
+ int ret = 0;
+
+ DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n",
+ crtc->base.id, crtc->name);
+
+ states = kmalloc(total_planes * sizeof(*states), GFP_KERNEL);
+ if (!states)
+ return -ENOMEM;
+
+ /*
+ * Normalization process might create new states for planes which
+ * normalized_zpos has to be recalculated.
+ */
+ drm_for_each_plane_mask(plane, dev, crtc_state->plane_mask) {
+ struct drm_plane_state *plane_state =
+ drm_atomic_get_plane_state(state, plane);
+ if (IS_ERR(plane_state)) {
+ ret = PTR_ERR(plane_state);
+ goto fail;
+ }
+ states[n++] = plane_state;
+ DRM_DEBUG_ATOMIC("[PLANE:%d:%s] processing zpos value %d\n",
+ plane->base.id, plane->name, plane_state->zpos);
+ }
+
+ sort(states, n, sizeof(*states), drm_atomic_state_zpos_cmp, NULL);
+
+ for (i = 0; i < n; i++) {
+ plane = states[i]->plane;
+ states[i]->normalized_zpos = i;
+ DRM_DEBUG_ATOMIC("[PLANE:%d:%s] normalized zpos value %d\n",
+ plane->base.id, plane->name, i);
+ }
+ crtc_state->zpos_changed = true;
+
+fail:
+ kfree(states);
+ return ret;
+}
+EXPORT_SYMBOL(drm_atomic_helper_crtc_normalize_zpos);
+
+/**
+ * drm_atomic_helper_normalize_zpos - calculate normalized zpos values for all
+ * crtcs
+ * @dev: DRM device
+ * @state: atomic state of DRM device
+ *
+ * This function calculates normalized zpos value for all modified planes in
+ * the provided atomic state of DRM device. For more information, see
+ * drm_atomic_helper_crtc_normalize_zpos() function.
+ *
+ * RETURNS
+ * Zero for success or -errno
+ */
+int drm_atomic_helper_normalize_zpos(struct drm_device *dev,
+ struct drm_atomic_state *state)
+{
+ struct drm_crtc *crtc;
+ struct drm_crtc_state *crtc_state;
+ struct drm_plane *plane;
+ struct drm_plane_state *plane_state;
+ int i, ret = 0;
+
+ /*
+ * If zpos_property is not initialized, then it makes no sense
+ * to calculate normalized zpos values.
+ */
+ if (!dev->mode_config.zpos_property)
+ return 0;
+
+ for_each_plane_in_state(state, plane, plane_state, i) {
+ crtc = plane_state->crtc;
+ if (!crtc)
+ continue;
+ if (plane->state->zpos != plane_state->zpos) {
+ crtc_state =
+ drm_atomic_get_existing_crtc_state(state, crtc);
+ crtc_state->zpos_changed = true;
+ }
+ }
+
+ for_each_crtc_in_state(state, crtc, crtc_state, i) {
+ if (crtc_state->plane_mask != crtc->state->plane_mask ||
+ crtc_state->zpos_changed) {
+ ret = drm_atomic_helper_crtc_normalize_zpos(crtc,
+ crtc_state);
+ if (ret)
+ return ret;
+ }
+ }
+ return 0;
+}
+EXPORT_SYMBOL(drm_atomic_helper_normalize_zpos);
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 247dc8b62564..c87cd956b74b 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -42,3 +42,6 @@ int drm_atomic_get_property(struct drm_mode_object *obj,
int drm_mode_atomic_ioctl(struct drm_device *dev,
void *data, struct drm_file *file_priv);
+/* drm_blend.c */
+int drm_atomic_helper_normalize_zpos(struct drm_device *dev,
+ struct drm_atomic_state *state);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index c65a212db77e..4f32a358d631 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -305,6 +305,7 @@ struct drm_plane_helper_funcs;
* @mode_changed: crtc_state->mode or crtc_state->enable has been changed
* @active_changed: crtc_state->active has been toggled.
* @connectors_changed: connectors to this crtc have been updated
+ * @zpos_changed: zpos values of planes on this crtc have been updated
* @plane_mask: bitmask of (1 << drm_plane_index(plane)) of attached planes
* @connector_mask: bitmask of (1 << drm_connector_index(connector)) of attached connectors
* @last_vblank_count: for helpers and drivers to capture the vblank of the
@@ -332,6 +333,7 @@ struct drm_crtc_state {
bool mode_changed : 1;
bool active_changed : 1;
bool connectors_changed : 1;
+ bool zpos_changed : 1;
/* attached planes bitmask:
* WARNING: transitional helpers do not maintain plane_mask so
@@ -1247,6 +1249,9 @@ struct drm_connector {
* plane (in 16.16)
* @src_w: width of visible portion of plane (in 16.16)
* @src_h: height of visible portion of plane (in 16.16)
+ * @zpos: priority of the given plane on crtc (optional)
+ * @normalized_zpos: normalized value of zpos: uniqe, range from 0 to
+ * (number of planes - 1) for given crtc
* @state: backpointer to global drm_atomic_state
*/
struct drm_plane_state {
@@ -1267,6 +1272,10 @@ struct drm_plane_state {
/* Plane rotation */
unsigned int rotation;
+ /* Plane zpos */
+ unsigned int zpos;
+ unsigned int normalized_zpos;
+
struct drm_atomic_state *state;
};
@@ -2087,6 +2096,8 @@ struct drm_mode_config {
struct drm_property *tile_property;
struct drm_property *plane_type_property;
struct drm_property *rotation_property;
+ struct drm_property *zpos_property;
+ struct drm_property *zpos_immutable_property;
struct drm_property *prop_src_x;
struct drm_property *prop_src_y;
struct drm_property *prop_src_w;
@@ -2488,6 +2499,12 @@ extern struct drm_property *drm_mode_create_rotation_property(struct drm_device
extern unsigned int drm_rotation_simplify(unsigned int rotation,
unsigned int supported_rotations);
+extern int drm_mode_create_zpos_property(struct drm_device *dev,
+ unsigned int min, unsigned int max);
+extern int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
+ unsigned int min,
+ unsigned int max);
+
/* Helpers */
static inline struct drm_plane *drm_plane_find(struct drm_device *dev,
--
1.9.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v5 1/5] drm: add generic zpos property
2016-01-27 14:44 ` [PATCH v5 1/5] drm: add generic zpos property Marek Szyprowski
@ 2016-02-29 15:12 ` Ville Syrjälä
2016-03-23 8:46 ` Benjamin Gaignard
2016-04-01 12:48 ` Benjamin Gaignard
0 siblings, 2 replies; 20+ messages in thread
From: Ville Syrjälä @ 2016-02-29 15:12 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Krzysztof Kozlowski, linux-samsung-soc, Benjamin Gaignard,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, dri-devel,
Andrzej Hajda, Tobias Jakobi, fabien.dessenne, vincent.abriou
On Wed, Jan 27, 2016 at 03:44:39PM +0100, Marek Szyprowski wrote:
> This patch adds support for generic plane's zpos property property with
> well-defined semantics:
> - added zpos properties to drm core and plane state structures
> - added helpers for normalizing zpos properties of given set of planes
> - well defined semantics: planes are sorted by zpos values and then plane
> id value if zpos equals
>
> Normalized zpos values are calculated automatically when generic
> muttable zpos property has been initialized. Drivers can simply use
> plane_state->normalized_zpos in their atomic_check and/or plane_update
> callbacks without any additional calls to DRM core.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> ---
> Documentation/DocBook/gpu.tmpl | 14 ++-
> drivers/gpu/drm/Makefile | 2 +-
> drivers/gpu/drm/drm_atomic.c | 4 +
> drivers/gpu/drm/drm_atomic_helper.c | 6 +
> drivers/gpu/drm/drm_blend.c | 227 ++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/drm_crtc_internal.h | 3 +
> include/drm/drm_crtc.h | 17 +++
> 7 files changed, 270 insertions(+), 3 deletions(-)
> create mode 100644 drivers/gpu/drm/drm_blend.c
>
> diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
> index a8669330b456..ae7d913adf60 100644
> --- a/Documentation/DocBook/gpu.tmpl
> +++ b/Documentation/DocBook/gpu.tmpl
> @@ -1816,7 +1816,7 @@ void intel_crt_init(struct drm_device *dev)
> <td valign="top" >Description/Restrictions</td>
> </tr>
> <tr>
> - <td rowspan="37" valign="top" >DRM</td>
> + <td rowspan="38" valign="top" >DRM</td>
> <td valign="top" >Generic</td>
> <td valign="top" >“rotation”</td>
> <td valign="top" >BITMASK</td>
> @@ -2068,7 +2068,7 @@ void intel_crt_init(struct drm_device *dev)
> <td valign="top" >property to suggest an Y offset for a connector</td>
> </tr>
> <tr>
> - <td rowspan="3" valign="top" >Optional</td>
> + <td rowspan="4" valign="top" >Optional</td>
> <td valign="top" >“scaling mode”</td>
> <td valign="top" >ENUM</td>
> <td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
> @@ -2092,6 +2092,16 @@ void intel_crt_init(struct drm_device *dev)
> <td valign="top" >TBD</td>
> </tr>
> <tr>
> + <td valign="top" > "zpos" </td>
> + <td valign="top" >RANGE</td>
> + <td valign="top" >Min=0, Max= driver dependent</td>
> + <td valign="top" >Plane</td>
> + <td valign="top" >Plane's 'z' position during blending operation (0 for background, highest for frontmost).
> + If two planes assigned to same CRTC have equal zpos values, the plane with higher plane
> + id is treated as closer to front. Can be IMMUTABLE if driver doesn't support changing
> + planes' order. Exact value range is driver dependent.</td>
> + </tr>
> + <tr>
> <td rowspan="20" valign="top" >i915</td>
> <td rowspan="2" valign="top" >Generic</td>
> <td valign="top" >"Broadcast RGB"</td>
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index 61766dec6a8d..eeefaba1c092 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -2,7 +2,7 @@
> # Makefile for the drm device driver. This driver provides support for the
> # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>
> -drm-y := drm_auth.o drm_bufs.o drm_cache.o \
> +drm-y := drm_auth.o drm_bufs.o drm_blend.o drm_cache.o \
> drm_context.o drm_dma.o \
> drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
> drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 3f74193885f1..a19201efb7d1 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -630,6 +630,8 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
> state->src_h = val;
> } else if (property == config->rotation_property) {
> state->rotation = val;
> + } else if (property == config->zpos_property) {
> + state->zpos = val;
> } else if (plane->funcs->atomic_set_property) {
> return plane->funcs->atomic_set_property(plane, state,
> property, val);
> @@ -686,6 +688,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
> *val = state->src_h;
> } else if (property == config->rotation_property) {
> *val = state->rotation;
> + } else if (property == config->zpos_property) {
> + *val = state->zpos;
> } else if (plane->funcs->atomic_get_property) {
> return plane->funcs->atomic_get_property(plane, state, property, val);
> } else {
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 53db2d9120be..9fbfb672b317 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -32,6 +32,8 @@
> #include <drm/drm_atomic_helper.h>
> #include <linux/fence.h>
>
> +#include "drm_crtc_internal.h"
> +
> /**
> * DOC: overview
> *
> @@ -530,6 +532,10 @@ drm_atomic_helper_check_planes(struct drm_device *dev,
> struct drm_plane_state *plane_state;
> int i, ret = 0;
>
> + ret = drm_atomic_helper_normalize_zpos(dev, state);
> + if (ret)
> + return ret;
> +
> for_each_plane_in_state(state, plane, plane_state, i) {
> const struct drm_plane_helper_funcs *funcs;
>
> diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
> new file mode 100644
> index 000000000000..cdcb647c8ed9
> --- /dev/null
> +++ b/drivers/gpu/drm/drm_blend.c
> @@ -0,0 +1,227 @@
> +/*
> + * Copyright (C) 2016 Samsung Electronics Co.Ltd
> + * Authors:
> + * Marek Szyprowski <m.szyprowski@samsung.com>
> + *
> + * DRM core plane blending related functions
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and its
> + * documentation for any purpose is hereby granted without fee, provided that
> + * the above copyright notice appear in all copies and that both that copyright
> + * notice and this permission notice appear in supporting documentation, and
> + * that the name of the copyright holders not be used in advertising or
> + * publicity pertaining to distribution of the software without specific,
> + * written prior permission. The copyright holders make no representations
> + * about the suitability of this software for any purpose. It is provided "as
> + * is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
> + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
> + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
> + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
> + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
> + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
> + * OF THIS SOFTWARE.
> + */
> +#include <linux/slab.h>
> +#include <linux/sort.h>
> +#include <linux/export.h>
> +#include <drm/drmP.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_atomic.h>
> +
> +#include "drm_internal.h"
> +
> +/**
> + * drm_mode_create_zpos_property - create muttable zpos property
> + * @dev: DRM device
> + * @min: minimal possible value of zpos property
> + * @max: maximal possible value of zpos property
> + *
> + * This function initializes generic muttable zpos property and enables support
> + * for it in drm core. Drivers can then attach this property to planes to enable
> + * support for configurable planes arrangement during blending operation.
> + * Once muttable zpos property has been enabled, the DRM core will automatically
> + * calculate drm_plane_state->normalized_zpos values. Usually min should be set
> + * to 0 and max to maximal number of planes for given crtc - 1.
> + *
> + * If zpos of some planes cannot be changed (like fixed backgroud or
> + * cursor/topmost planes), driver should adjust min/max values and assign those
> + * planes immutable zpos property with lower or higher values (for more
> + * information, see drm_mode_create_zpos_immutable_property() function). In such
> + * case driver should also assign proper initial zpos values for all planes in
> + * its plane_reset() callback, so the planes will be always sorted properly.
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_mode_create_zpos_property(struct drm_device *dev, unsigned int min,
> + unsigned int max)
> +{
> + struct drm_property *prop;
> +
> + prop = drm_property_create_range(dev, 0, "zpos", min, max);
> + if (!prop)
> + return -ENOMEM;
> +
> + dev->mode_config.zpos_property = prop;
> + return 0;
> +}
> +EXPORT_SYMBOL(drm_mode_create_zpos_property);
> +
> +/**
> + * drm_mode_create_zpos_immutable_property - create immuttable zpos property
> + * @dev: DRM device
> + * @min: minimal possible value of zpos property
> + * @max: maximal possible value of zpos property
> + *
> + * This function initializes generic immuttable zpos property and enables
> + * support for it in drm core. Using this property driver lets userspace
> + * to get the arrangement of the planes for blending operation and notifies
> + * it that the hardware (or driver) doesn't support changing of the planes'
> + * order.
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
> + unsigned int min, unsigned int max)
> +{
> + struct drm_property *prop;
> +
> + prop = drm_property_create_range(dev, DRM_MODE_PROP_IMMUTABLE, "zpos",
> + min, max);
> + if (!prop)
> + return -ENOMEM;
> +
> + dev->mode_config.zpos_immutable_property = prop;
I want per-plane min/max ranges, so putting this here is no good.
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v5 1/5] drm: add generic zpos property
2016-02-29 15:12 ` Ville Syrjälä
@ 2016-03-23 8:46 ` Benjamin Gaignard
2016-04-01 12:48 ` Benjamin Gaignard
1 sibling, 0 replies; 20+ messages in thread
From: Benjamin Gaignard @ 2016-03-23 8:46 UTC (permalink / raw)
To: Ville Syrjälä
Cc: Marek Szyprowski, dri-devel, linux-samsung-soc, Inki Dae,
Daniel Vetter, Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Vincent Abriou, Fabien Dessenne
Hello Marek, Ville,
How can we progress in this ? and how can I help you to get this
generic zpos property merge into drm ?
Regards,
Benjamin
2016-02-29 16:12 GMT+01:00 Ville Syrjälä <ville.syrjala@linux.intel.com>:
> On Wed, Jan 27, 2016 at 03:44:39PM +0100, Marek Szyprowski wrote:
>> This patch adds support for generic plane's zpos property property with
>> well-defined semantics:
>> - added zpos properties to drm core and plane state structures
>> - added helpers for normalizing zpos properties of given set of planes
>> - well defined semantics: planes are sorted by zpos values and then plane
>> id value if zpos equals
>>
>> Normalized zpos values are calculated automatically when generic
>> muttable zpos property has been initialized. Drivers can simply use
>> plane_state->normalized_zpos in their atomic_check and/or plane_update
>> callbacks without any additional calls to DRM core.
>>
>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>> Tested-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
>> ---
>> Documentation/DocBook/gpu.tmpl | 14 ++-
>> drivers/gpu/drm/Makefile | 2 +-
>> drivers/gpu/drm/drm_atomic.c | 4 +
>> drivers/gpu/drm/drm_atomic_helper.c | 6 +
>> drivers/gpu/drm/drm_blend.c | 227 ++++++++++++++++++++++++++++++++++++
>> drivers/gpu/drm/drm_crtc_internal.h | 3 +
>> include/drm/drm_crtc.h | 17 +++
>> 7 files changed, 270 insertions(+), 3 deletions(-)
>> create mode 100644 drivers/gpu/drm/drm_blend.c
>>
>> diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
>> index a8669330b456..ae7d913adf60 100644
>> --- a/Documentation/DocBook/gpu.tmpl
>> +++ b/Documentation/DocBook/gpu.tmpl
>> @@ -1816,7 +1816,7 @@ void intel_crt_init(struct drm_device *dev)
>> <td valign="top" >Description/Restrictions</td>
>> </tr>
>> <tr>
>> - <td rowspan="37" valign="top" >DRM</td>
>> + <td rowspan="38" valign="top" >DRM</td>
>> <td valign="top" >Generic</td>
>> <td valign="top" >“rotation”</td>
>> <td valign="top" >BITMASK</td>
>> @@ -2068,7 +2068,7 @@ void intel_crt_init(struct drm_device *dev)
>> <td valign="top" >property to suggest an Y offset for a connector</td>
>> </tr>
>> <tr>
>> - <td rowspan="3" valign="top" >Optional</td>
>> + <td rowspan="4" valign="top" >Optional</td>
>> <td valign="top" >“scaling mode”</td>
>> <td valign="top" >ENUM</td>
>> <td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
>> @@ -2092,6 +2092,16 @@ void intel_crt_init(struct drm_device *dev)
>> <td valign="top" >TBD</td>
>> </tr>
>> <tr>
>> + <td valign="top" > "zpos" </td>
>> + <td valign="top" >RANGE</td>
>> + <td valign="top" >Min=0, Max= driver dependent</td>
>> + <td valign="top" >Plane</td>
>> + <td valign="top" >Plane's 'z' position during blending operation (0 for background, highest for frontmost).
>> + If two planes assigned to same CRTC have equal zpos values, the plane with higher plane
>> + id is treated as closer to front. Can be IMMUTABLE if driver doesn't support changing
>> + planes' order. Exact value range is driver dependent.</td>
>> + </tr>
>> + <tr>
>> <td rowspan="20" valign="top" >i915</td>
>> <td rowspan="2" valign="top" >Generic</td>
>> <td valign="top" >"Broadcast RGB"</td>
>> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
>> index 61766dec6a8d..eeefaba1c092 100644
>> --- a/drivers/gpu/drm/Makefile
>> +++ b/drivers/gpu/drm/Makefile
>> @@ -2,7 +2,7 @@
>> # Makefile for the drm device driver. This driver provides support for the
>> # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>>
>> -drm-y := drm_auth.o drm_bufs.o drm_cache.o \
>> +drm-y := drm_auth.o drm_bufs.o drm_blend.o drm_cache.o \
>> drm_context.o drm_dma.o \
>> drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \
>> drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
>> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
>> index 3f74193885f1..a19201efb7d1 100644
>> --- a/drivers/gpu/drm/drm_atomic.c
>> +++ b/drivers/gpu/drm/drm_atomic.c
>> @@ -630,6 +630,8 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
>> state->src_h = val;
>> } else if (property == config->rotation_property) {
>> state->rotation = val;
>> + } else if (property == config->zpos_property) {
>> + state->zpos = val;
>> } else if (plane->funcs->atomic_set_property) {
>> return plane->funcs->atomic_set_property(plane, state,
>> property, val);
>> @@ -686,6 +688,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
>> *val = state->src_h;
>> } else if (property == config->rotation_property) {
>> *val = state->rotation;
>> + } else if (property == config->zpos_property) {
>> + *val = state->zpos;
>> } else if (plane->funcs->atomic_get_property) {
>> return plane->funcs->atomic_get_property(plane, state, property, val);
>> } else {
>> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
>> index 53db2d9120be..9fbfb672b317 100644
>> --- a/drivers/gpu/drm/drm_atomic_helper.c
>> +++ b/drivers/gpu/drm/drm_atomic_helper.c
>> @@ -32,6 +32,8 @@
>> #include <drm/drm_atomic_helper.h>
>> #include <linux/fence.h>
>>
>> +#include "drm_crtc_internal.h"
>> +
>> /**
>> * DOC: overview
>> *
>> @@ -530,6 +532,10 @@ drm_atomic_helper_check_planes(struct drm_device *dev,
>> struct drm_plane_state *plane_state;
>> int i, ret = 0;
>>
>> + ret = drm_atomic_helper_normalize_zpos(dev, state);
>> + if (ret)
>> + return ret;
>> +
>> for_each_plane_in_state(state, plane, plane_state, i) {
>> const struct drm_plane_helper_funcs *funcs;
>>
>> diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
>> new file mode 100644
>> index 000000000000..cdcb647c8ed9
>> --- /dev/null
>> +++ b/drivers/gpu/drm/drm_blend.c
>> @@ -0,0 +1,227 @@
>> +/*
>> + * Copyright (C) 2016 Samsung Electronics Co.Ltd
>> + * Authors:
>> + * Marek Szyprowski <m.szyprowski@samsung.com>
>> + *
>> + * DRM core plane blending related functions
>> + *
>> + * Permission to use, copy, modify, distribute, and sell this software and its
>> + * documentation for any purpose is hereby granted without fee, provided that
>> + * the above copyright notice appear in all copies and that both that copyright
>> + * notice and this permission notice appear in supporting documentation, and
>> + * that the name of the copyright holders not be used in advertising or
>> + * publicity pertaining to distribution of the software without specific,
>> + * written prior permission. The copyright holders make no representations
>> + * about the suitability of this software for any purpose. It is provided "as
>> + * is" without express or implied warranty.
>> + *
>> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
>> + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
>> + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
>> + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
>> + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
>> + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
>> + * OF THIS SOFTWARE.
>> + */
>> +#include <linux/slab.h>
>> +#include <linux/sort.h>
>> +#include <linux/export.h>
>> +#include <drm/drmP.h>
>> +#include <drm/drm_crtc.h>
>> +#include <drm/drm_atomic.h>
>> +
>> +#include "drm_internal.h"
>> +
>> +/**
>> + * drm_mode_create_zpos_property - create muttable zpos property
>> + * @dev: DRM device
>> + * @min: minimal possible value of zpos property
>> + * @max: maximal possible value of zpos property
>> + *
>> + * This function initializes generic muttable zpos property and enables support
>> + * for it in drm core. Drivers can then attach this property to planes to enable
>> + * support for configurable planes arrangement during blending operation.
>> + * Once muttable zpos property has been enabled, the DRM core will automatically
>> + * calculate drm_plane_state->normalized_zpos values. Usually min should be set
>> + * to 0 and max to maximal number of planes for given crtc - 1.
>> + *
>> + * If zpos of some planes cannot be changed (like fixed backgroud or
>> + * cursor/topmost planes), driver should adjust min/max values and assign those
>> + * planes immutable zpos property with lower or higher values (for more
>> + * information, see drm_mode_create_zpos_immutable_property() function). In such
>> + * case driver should also assign proper initial zpos values for all planes in
>> + * its plane_reset() callback, so the planes will be always sorted properly.
>> + *
>> + * Returns:
>> + * Zero on success, negative errno on failure.
>> + */
>> +int drm_mode_create_zpos_property(struct drm_device *dev, unsigned int min,
>> + unsigned int max)
>> +{
>> + struct drm_property *prop;
>> +
>> + prop = drm_property_create_range(dev, 0, "zpos", min, max);
>> + if (!prop)
>> + return -ENOMEM;
>> +
>> + dev->mode_config.zpos_property = prop;
>> + return 0;
>> +}
>> +EXPORT_SYMBOL(drm_mode_create_zpos_property);
>> +
>> +/**
>> + * drm_mode_create_zpos_immutable_property - create immuttable zpos property
>> + * @dev: DRM device
>> + * @min: minimal possible value of zpos property
>> + * @max: maximal possible value of zpos property
>> + *
>> + * This function initializes generic immuttable zpos property and enables
>> + * support for it in drm core. Using this property driver lets userspace
>> + * to get the arrangement of the planes for blending operation and notifies
>> + * it that the hardware (or driver) doesn't support changing of the planes'
>> + * order.
>> + *
>> + * Returns:
>> + * Zero on success, negative errno on failure.
>> + */
>> +int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
>> + unsigned int min, unsigned int max)
>> +{
>> + struct drm_property *prop;
>> +
>> + prop = drm_property_create_range(dev, DRM_MODE_PROP_IMMUTABLE, "zpos",
>> + min, max);
>> + if (!prop)
>> + return -ENOMEM;
>> +
>> + dev->mode_config.zpos_immutable_property = prop;
>
> I want per-plane min/max ranges, so putting this here is no good.
>
>
> --
> Ville Syrjälä
> Intel OTC
--
Benjamin Gaignard
Graphic Working Group
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v5 1/5] drm: add generic zpos property
2016-02-29 15:12 ` Ville Syrjälä
2016-03-23 8:46 ` Benjamin Gaignard
@ 2016-04-01 12:48 ` Benjamin Gaignard
2016-05-09 8:42 ` Benjamin Gaignard
1 sibling, 1 reply; 20+ messages in thread
From: Benjamin Gaignard @ 2016-04-01 12:48 UTC (permalink / raw)
To: Ville Syrjälä
Cc: Marek Szyprowski, dri-devel, linux-samsung-soc, Inki Dae,
Daniel Vetter, Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Vincent Abriou, Fabien Dessenne
This patch adds support for generic plane's zpos property property with
well-defined semantics:
- added zpos properties to plane and plane state structures
- added helpers for normalizing zpos properties of given set of planes
- well defined semantics: planes are sorted by zpos values and then plane
id value if zpos equals
Normalized zpos values are calculated automatically when generic
muttable zpos property has been initialized. Drivers can simply use
plane_state->normalized_zpos in their atomic_check and/or plane_update
callbacks without any additional calls to DRM core.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Compare to Marek's original patch zpos property is now specific to each
plane and no more to the core.
Normalize function take care of the range of per plane defined range
before set normalized_zpos.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
---
Documentation/DocBook/gpu.tmpl | 10 ++
drivers/gpu/drm/Makefile | 2 +-
drivers/gpu/drm/drm_atomic_helper.c | 6 +
drivers/gpu/drm/drm_blend.c | 283 ++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/drm_crtc_internal.h | 3 +
include/drm/drm_crtc.h | 25 ++++
6 files changed, 328 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/drm_blend.c
diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
index 1692c4d..b7a5161 100644
--- a/Documentation/DocBook/gpu.tmpl
+++ b/Documentation/DocBook/gpu.tmpl
@@ -2147,6 +2147,16 @@ void intel_crt_init(struct drm_device *dev)
the underlying hardware).</td>
</tr>
<tr>
+ <td valign="top" > "zpos" </td>
+ <td valign="top" >RANGE</td>
+ <td valign="top" >Min= driver dependent, Max= driver dependent</td>
+ <td valign="top" >Plane</td>
+ <td valign="top" >Plane's 'z' position during blending operation (0
for background, highest for frontmost).
+ If two planes assigned to same CRTC have equal zpos values, the
plane with higher plane
+ id is treated as closer to front. Can be IMMUTABLE if driver doesn't
support changing
+ planes' order. Exact value range is driver dependent.</td>
+ </tr>
+ <tr>
<td rowspan="20" valign="top" >i915</td>
<td rowspan="2" valign="top" >Generic</td>
<td valign="top" >"Broadcast RGB"</td>
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 6eb94fc..18dc563 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -2,7 +2,7 @@
# Makefile for the drm device driver. This driver provides support for the
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v5 1/5] drm: add generic zpos property
2016-04-01 12:48 ` Benjamin Gaignard
@ 2016-05-09 8:42 ` Benjamin Gaignard
2016-05-09 9:05 ` Daniel Vetter
0 siblings, 1 reply; 20+ messages in thread
From: Benjamin Gaignard @ 2016-05-09 8:42 UTC (permalink / raw)
To: Ville Syrjälä
Cc: Krzysztof Kozlowski, linux-samsung-soc,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, dri-devel,
Andrzej Hajda, Tobias Jakobi, Fabien Dessenne, Vincent Abriou,
Marek Szyprowski
Hello,
I little up in this topic.
If generic z-order patches can't land into drm core,
I wille have to resend the patch to enable it within STI driver:
https://lists.freedesktop.org/archives/dri-devel/2016-January/098140.html
Regards,
Benjamin
2016-04-01 14:48 GMT+02:00 Benjamin Gaignard <benjamin.gaignard@linaro.org>:
> This patch adds support for generic plane's zpos property property with
> well-defined semantics:
> - added zpos properties to plane and plane state structures
> - added helpers for normalizing zpos properties of given set of planes
> - well defined semantics: planes are sorted by zpos values and then plane
> id value if zpos equals
>
> Normalized zpos values are calculated automatically when generic
> muttable zpos property has been initialized. Drivers can simply use
> plane_state->normalized_zpos in their atomic_check and/or plane_update
> callbacks without any additional calls to DRM core.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>
> Compare to Marek's original patch zpos property is now specific to each
> plane and no more to the core.
> Normalize function take care of the range of per plane defined range
> before set normalized_zpos.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> ---
> Documentation/DocBook/gpu.tmpl | 10 ++
> drivers/gpu/drm/Makefile | 2 +-
> drivers/gpu/drm/drm_atomic_helper.c | 6 +
> drivers/gpu/drm/drm_blend.c | 283 ++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/drm_crtc_internal.h | 3 +
> include/drm/drm_crtc.h | 25 ++++
> 6 files changed, 328 insertions(+), 1 deletion(-)
> create mode 100644 drivers/gpu/drm/drm_blend.c
>
> diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
> index 1692c4d..b7a5161 100644
> --- a/Documentation/DocBook/gpu.tmpl
> +++ b/Documentation/DocBook/gpu.tmpl
> @@ -2147,6 +2147,16 @@ void intel_crt_init(struct drm_device *dev)
> the underlying hardware).</td>
> </tr>
> <tr>
> + <td valign="top" > "zpos" </td>
> + <td valign="top" >RANGE</td>
> + <td valign="top" >Min= driver dependent, Max= driver dependent</td>
> + <td valign="top" >Plane</td>
> + <td valign="top" >Plane's 'z' position during blending operation (0
> for background, highest for frontmost).
> + If two planes assigned to same CRTC have equal zpos values, the
> plane with higher plane
> + id is treated as closer to front. Can be IMMUTABLE if driver doesn't
> support changing
> + planes' order. Exact value range is driver dependent.</td>
> + </tr>
> + <tr>
> <td rowspan="20" valign="top" >i915</td>
> <td rowspan="2" valign="top" >Generic</td>
> <td valign="top" >"Broadcast RGB"</td>
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index 6eb94fc..18dc563 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -2,7 +2,7 @@
> # Makefile for the drm device driver. This driver provides support for the
--
Benjamin Gaignard
Graphic Working Group
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v5 1/5] drm: add generic zpos property
2016-05-09 8:42 ` Benjamin Gaignard
@ 2016-05-09 9:05 ` Daniel Vetter
2016-05-09 10:21 ` Tobias Jakobi
0 siblings, 1 reply; 20+ messages in thread
From: Daniel Vetter @ 2016-05-09 9:05 UTC (permalink / raw)
To: Benjamin Gaignard
Cc: Krzysztof Kozlowski, linux-samsung-soc,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, dri-devel,
Andrzej Hajda, Tobias Jakobi, Fabien Dessenne, Vincent Abriou,
Marek Szyprowski
On Mon, May 09, 2016 at 10:42:45AM +0200, Benjamin Gaignard wrote:
> Hello,
>
> I little up in this topic.
> If generic z-order patches can't land into drm core,
> I wille have to resend the patch to enable it within STI driver:
> https://lists.freedesktop.org/archives/dri-devel/2016-January/098140.html
It's the patch author's duty to ping folks for reviews to move a patch
forward. That doesn't happen automatically.
It helps though if you cc everyone who commented on earlier iterations (I
prefer Cc: lines in the commit message). Ville seems to have not been
added for this one here.
Also there's a metric pile of driver patches that floated around to
convert them over to core zpos. Can you pls pick those up too?
I definitely want to land this in drm core, so not going to take a
ragequite-I'll-do-it-in-my-driver for an answer ;-)
Thanks, Daniel
>
> Regards,
> Benjamin
>
> 2016-04-01 14:48 GMT+02:00 Benjamin Gaignard <benjamin.gaignard@linaro.org>:
> > This patch adds support for generic plane's zpos property property with
> > well-defined semantics:
> > - added zpos properties to plane and plane state structures
> > - added helpers for normalizing zpos properties of given set of planes
> > - well defined semantics: planes are sorted by zpos values and then plane
> > id value if zpos equals
> >
> > Normalized zpos values are calculated automatically when generic
> > muttable zpos property has been initialized. Drivers can simply use
> > plane_state->normalized_zpos in their atomic_check and/or plane_update
> > callbacks without any additional calls to DRM core.
> >
> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> >
> > Compare to Marek's original patch zpos property is now specific to each
> > plane and no more to the core.
> > Normalize function take care of the range of per plane defined range
> > before set normalized_zpos.
> >
> > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> > ---
> > Documentation/DocBook/gpu.tmpl | 10 ++
> > drivers/gpu/drm/Makefile | 2 +-
> > drivers/gpu/drm/drm_atomic_helper.c | 6 +
> > drivers/gpu/drm/drm_blend.c | 283 ++++++++++++++++++++++++++++++++++++
> > drivers/gpu/drm/drm_crtc_internal.h | 3 +
> > include/drm/drm_crtc.h | 25 ++++
> > 6 files changed, 328 insertions(+), 1 deletion(-)
> > create mode 100644 drivers/gpu/drm/drm_blend.c
> >
> > diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
> > index 1692c4d..b7a5161 100644
> > --- a/Documentation/DocBook/gpu.tmpl
> > +++ b/Documentation/DocBook/gpu.tmpl
> > @@ -2147,6 +2147,16 @@ void intel_crt_init(struct drm_device *dev)
> > the underlying hardware).</td>
> > </tr>
> > <tr>
> > + <td valign="top" > "zpos" </td>
> > + <td valign="top" >RANGE</td>
> > + <td valign="top" >Min= driver dependent, Max= driver dependent</td>
> > + <td valign="top" >Plane</td>
> > + <td valign="top" >Plane's 'z' position during blending operation (0
> > for background, highest for frontmost).
> > + If two planes assigned to same CRTC have equal zpos values, the
> > plane with higher plane
> > + id is treated as closer to front. Can be IMMUTABLE if driver doesn't
> > support changing
> > + planes' order. Exact value range is driver dependent.</td>
> > + </tr>
> > + <tr>
> > <td rowspan="20" valign="top" >i915</td>
> > <td rowspan="2" valign="top" >Generic</td>
> > <td valign="top" >"Broadcast RGB"</td>
> > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> > index 6eb94fc..18dc563 100644
> > --- a/drivers/gpu/drm/Makefile
> > +++ b/drivers/gpu/drm/Makefile
> > @@ -2,7 +2,7 @@
> > # Makefile for the drm device driver. This driver provides support for the
>
>
>
> --
> Benjamin Gaignard
>
> Graphic Working Group
>
> Linaro.org │ Open source software for ARM SoCs
>
> Follow Linaro: Facebook | Twitter | Blog
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v5 1/5] drm: add generic zpos property
2016-05-09 9:05 ` Daniel Vetter
@ 2016-05-09 10:21 ` Tobias Jakobi
0 siblings, 0 replies; 20+ messages in thread
From: Tobias Jakobi @ 2016-05-09 10:21 UTC (permalink / raw)
To: Daniel Vetter, Benjamin Gaignard
Cc: Krzysztof Kozlowski, linux-samsung-soc,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, dri-devel,
Andrzej Hajda, Fabien Dessenne, Vincent Abriou, Marek Szyprowski
Hello,
just voicing my interest in having this feature in DRM core.
- Tobias
Daniel Vetter wrote:
> On Mon, May 09, 2016 at 10:42:45AM +0200, Benjamin Gaignard wrote:
>> Hello,
>>
>> I little up in this topic.
>> If generic z-order patches can't land into drm core,
>> I wille have to resend the patch to enable it within STI driver:
>> https://lists.freedesktop.org/archives/dri-devel/2016-January/098140.html
>
> It's the patch author's duty to ping folks for reviews to move a patch
> forward. That doesn't happen automatically.
>
> It helps though if you cc everyone who commented on earlier iterations (I
> prefer Cc: lines in the commit message). Ville seems to have not been
> added for this one here.
>
> Also there's a metric pile of driver patches that floated around to
> convert them over to core zpos. Can you pls pick those up too?
>
> I definitely want to land this in drm core, so not going to take a
> ragequite-I'll-do-it-in-my-driver for an answer ;-)
>
> Thanks, Daniel
>
>>
>> Regards,
>> Benjamin
>>
>> 2016-04-01 14:48 GMT+02:00 Benjamin Gaignard <benjamin.gaignard@linaro.org>:
>>> This patch adds support for generic plane's zpos property property with
>>> well-defined semantics:
>>> - added zpos properties to plane and plane state structures
>>> - added helpers for normalizing zpos properties of given set of planes
>>> - well defined semantics: planes are sorted by zpos values and then plane
>>> id value if zpos equals
>>>
>>> Normalized zpos values are calculated automatically when generic
>>> muttable zpos property has been initialized. Drivers can simply use
>>> plane_state->normalized_zpos in their atomic_check and/or plane_update
>>> callbacks without any additional calls to DRM core.
>>>
>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>>>
>>> Compare to Marek's original patch zpos property is now specific to each
>>> plane and no more to the core.
>>> Normalize function take care of the range of per plane defined range
>>> before set normalized_zpos.
>>>
>>> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
>>> ---
>>> Documentation/DocBook/gpu.tmpl | 10 ++
>>> drivers/gpu/drm/Makefile | 2 +-
>>> drivers/gpu/drm/drm_atomic_helper.c | 6 +
>>> drivers/gpu/drm/drm_blend.c | 283 ++++++++++++++++++++++++++++++++++++
>>> drivers/gpu/drm/drm_crtc_internal.h | 3 +
>>> include/drm/drm_crtc.h | 25 ++++
>>> 6 files changed, 328 insertions(+), 1 deletion(-)
>>> create mode 100644 drivers/gpu/drm/drm_blend.c
>>>
>>> diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
>>> index 1692c4d..b7a5161 100644
>>> --- a/Documentation/DocBook/gpu.tmpl
>>> +++ b/Documentation/DocBook/gpu.tmpl
>>> @@ -2147,6 +2147,16 @@ void intel_crt_init(struct drm_device *dev)
>>> the underlying hardware).</td>
>>> </tr>
>>> <tr>
>>> + <td valign="top" > "zpos" </td>
>>> + <td valign="top" >RANGE</td>
>>> + <td valign="top" >Min= driver dependent, Max= driver dependent</td>
>>> + <td valign="top" >Plane</td>
>>> + <td valign="top" >Plane's 'z' position during blending operation (0
>>> for background, highest for frontmost).
>>> + If two planes assigned to same CRTC have equal zpos values, the
>>> plane with higher plane
>>> + id is treated as closer to front. Can be IMMUTABLE if driver doesn't
>>> support changing
>>> + planes' order. Exact value range is driver dependent.</td>
>>> + </tr>
>>> + <tr>
>>> <td rowspan="20" valign="top" >i915</td>
>>> <td rowspan="2" valign="top" >Generic</td>
>>> <td valign="top" >"Broadcast RGB"</td>
>>> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
>>> index 6eb94fc..18dc563 100644
>>> --- a/drivers/gpu/drm/Makefile
>>> +++ b/drivers/gpu/drm/Makefile
>>> @@ -2,7 +2,7 @@
>>> # Makefile for the drm device driver. This driver provides support for the
>>
>>
>>
>> --
>> Benjamin Gaignard
>>
>> Graphic Working Group
>>
>> Linaro.org │ Open source software for ARM SoCs
>>
>> Follow Linaro: Facebook | Twitter | Blog
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v5 2/5] drm/exynos: use generic code for managing zpos plane property
2016-01-27 14:44 [PATCH v5 0/5] drm/exynos: introduce generic zpos and blending properties Marek Szyprowski
2016-01-27 14:44 ` [PATCH v5 1/5] drm: add generic zpos property Marek Szyprowski
@ 2016-01-27 14:44 ` Marek Szyprowski
2016-02-28 23:27 ` Inki Dae
2016-01-27 14:44 ` [PATCH v5 3/5] drm: simplify initialization of rotation property Marek Szyprowski
` (3 subsequent siblings)
5 siblings, 1 reply; 20+ messages in thread
From: Marek Szyprowski @ 2016-01-27 14:44 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: Marek Szyprowski, Inki Dae, Daniel Vetter,
Ville Syrjälä,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
This patch replaces zpos property handling custom code in Exynos DRM
driver with calls to generic DRM code.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 -
drivers/gpu/drm/exynos/exynos_drm_plane.c | 68 ++++++++-----------------------
drivers/gpu/drm/exynos/exynos_mixer.c | 6 ++-
3 files changed, 20 insertions(+), 56 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 17b5ded72ff1..816537886e4e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -64,7 +64,6 @@ struct exynos_drm_plane_state {
struct exynos_drm_rect src;
unsigned int h_ratio;
unsigned int v_ratio;
- unsigned int zpos;
};
static inline struct exynos_drm_plane_state *
@@ -217,7 +216,6 @@ struct exynos_drm_private {
* this array is used to be aware of which crtc did it request vblank.
*/
struct drm_crtc *crtc[MAX_CRTC];
- struct drm_property *plane_zpos_property;
unsigned long da_start;
unsigned long da_space_size;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index d86227236f55..3a486939168e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -137,9 +137,9 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
exynos_state = kzalloc(sizeof(*exynos_state), GFP_KERNEL);
if (exynos_state) {
- exynos_state->zpos = exynos_plane->config->zpos;
plane->state = &exynos_state->base;
plane->state->plane = plane;
+ plane->state->zpos = exynos_plane->config->zpos;
}
}
@@ -155,7 +155,6 @@ exynos_drm_plane_duplicate_state(struct drm_plane *plane)
return NULL;
__drm_atomic_helper_plane_duplicate_state(plane, ©->base);
- copy->zpos = exynos_state->zpos;
return ©->base;
}
@@ -168,43 +167,6 @@ static void exynos_drm_plane_destroy_state(struct drm_plane *plane,
kfree(old_exynos_state);
}
-static int exynos_drm_plane_atomic_set_property(struct drm_plane *plane,
- struct drm_plane_state *state,
- struct drm_property *property,
- uint64_t val)
-{
- struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
- struct exynos_drm_plane_state *exynos_state =
- to_exynos_plane_state(state);
- struct exynos_drm_private *dev_priv = plane->dev->dev_private;
- const struct exynos_drm_plane_config *config = exynos_plane->config;
-
- if (property == dev_priv->plane_zpos_property &&
- (config->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS))
- exynos_state->zpos = val;
- else
- return -EINVAL;
-
- return 0;
-}
-
-static int exynos_drm_plane_atomic_get_property(struct drm_plane *plane,
- const struct drm_plane_state *state,
- struct drm_property *property,
- uint64_t *val)
-{
- const struct exynos_drm_plane_state *exynos_state =
- container_of(state, const struct exynos_drm_plane_state, base);
- struct exynos_drm_private *dev_priv = plane->dev->dev_private;
-
- if (property == dev_priv->plane_zpos_property)
- *val = exynos_state->zpos;
- else
- return -EINVAL;
-
- return 0;
-}
-
static struct drm_plane_funcs exynos_plane_funcs = {
.update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_atomic_helper_disable_plane,
@@ -213,8 +175,6 @@ static struct drm_plane_funcs exynos_plane_funcs = {
.reset = exynos_drm_plane_reset,
.atomic_duplicate_state = exynos_drm_plane_duplicate_state,
.atomic_destroy_state = exynos_drm_plane_destroy_state,
- .atomic_set_property = exynos_drm_plane_atomic_set_property,
- .atomic_get_property = exynos_drm_plane_atomic_get_property,
};
static int
@@ -302,20 +262,23 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = {
};
static void exynos_plane_attach_zpos_property(struct drm_plane *plane,
- unsigned int zpos)
+ unsigned int zpos, bool immutable)
{
struct drm_device *dev = plane->dev;
- struct exynos_drm_private *dev_priv = dev->dev_private;
struct drm_property *prop;
- prop = dev_priv->plane_zpos_property;
- if (!prop) {
- prop = drm_property_create_range(dev, 0, "zpos",
- 0, MAX_PLANE - 1);
- if (!prop)
- return;
-
- dev_priv->plane_zpos_property = prop;
+ if (immutable) {
+ if (!dev->mode_config.zpos_immutable_property)
+ if (drm_mode_create_zpos_immutable_property(dev, 0,
+ MAX_PLANE - 1))
+ return;
+ prop = dev->mode_config.zpos_immutable_property;
+ } else {
+ if (!dev->mode_config.zpos_property)
+ if (drm_mode_create_zpos_property(dev, 0,
+ MAX_PLANE - 1))
+ return;
+ prop = dev->mode_config.zpos_property;
}
drm_object_attach_property(&plane->base, prop, zpos);
@@ -344,7 +307,8 @@ int exynos_plane_init(struct drm_device *dev,
exynos_plane->index = index;
exynos_plane->config = config;
- exynos_plane_attach_zpos_property(&exynos_plane->base, config->zpos);
+ exynos_plane_attach_zpos_property(&exynos_plane->base, config->zpos,
+ !(config->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS));
return 0;
}
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index b5fbc1cbf024..d00c201773c9 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -478,6 +478,7 @@ static void vp_video_buffer(struct mixer_context *ctx,
struct drm_display_mode *mode = &state->base.crtc->state->adjusted_mode;
struct mixer_resources *res = &ctx->mixer_res;
struct drm_framebuffer *fb = state->base.fb;
+ unsigned int priority = state->base.normalized_zpos + 1;
unsigned long flags;
dma_addr_t luma_addr[2], chroma_addr[2];
bool tiled_mode = false;
@@ -562,7 +563,7 @@ static void vp_video_buffer(struct mixer_context *ctx,
mixer_cfg_scan(ctx, mode->vdisplay);
mixer_cfg_rgb_fmt(ctx, mode->vdisplay);
- mixer_cfg_layer(ctx, plane->index, state->zpos + 1, true);
+ mixer_cfg_layer(ctx, plane->index, priority, true);
mixer_cfg_vp_blend(ctx);
mixer_run(ctx);
@@ -587,6 +588,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
struct drm_display_mode *mode = &state->base.crtc->state->adjusted_mode;
struct mixer_resources *res = &ctx->mixer_res;
struct drm_framebuffer *fb = state->base.fb;
+ unsigned int priority = state->base.normalized_zpos + 1;
unsigned long flags;
unsigned int win = plane->index;
unsigned int x_ratio = 0, y_ratio = 0;
@@ -678,7 +680,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
mixer_cfg_scan(ctx, mode->vdisplay);
mixer_cfg_rgb_fmt(ctx, mode->vdisplay);
- mixer_cfg_layer(ctx, win, state->zpos + 1, true);
+ mixer_cfg_layer(ctx, win, priority, true);
mixer_cfg_gfx_blend(ctx, win, is_alpha_format(fb->pixel_format));
/* layer update mandatory for mixer 16.0.33.0 */
--
1.9.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v5 2/5] drm/exynos: use generic code for managing zpos plane property
2016-01-27 14:44 ` [PATCH v5 2/5] drm/exynos: use generic code for managing zpos plane property Marek Szyprowski
@ 2016-02-28 23:27 ` Inki Dae
0 siblings, 0 replies; 20+ messages in thread
From: Inki Dae @ 2016-02-28 23:27 UTC (permalink / raw)
To: Marek Szyprowski, dri-devel, linux-samsung-soc
Cc: Daniel Vetter, Ville Syrjälä,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
2016년 01월 27일 23:44에 Marek Szyprowski 이(가) 쓴 글:
> This patch replaces zpos property handling custom code in Exynos DRM
> driver with calls to generic DRM code.
It'd be better to go to drm-misc.
Acked-by: Inki Dae <inki.dae@samsung.com>
Thanks,
Inki Dae
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 -
> drivers/gpu/drm/exynos/exynos_drm_plane.c | 68 ++++++++-----------------------
> drivers/gpu/drm/exynos/exynos_mixer.c | 6 ++-
> 3 files changed, 20 insertions(+), 56 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> index 17b5ded72ff1..816537886e4e 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> @@ -64,7 +64,6 @@ struct exynos_drm_plane_state {
> struct exynos_drm_rect src;
> unsigned int h_ratio;
> unsigned int v_ratio;
> - unsigned int zpos;
> };
>
> static inline struct exynos_drm_plane_state *
> @@ -217,7 +216,6 @@ struct exynos_drm_private {
> * this array is used to be aware of which crtc did it request vblank.
> */
> struct drm_crtc *crtc[MAX_CRTC];
> - struct drm_property *plane_zpos_property;
>
> unsigned long da_start;
> unsigned long da_space_size;
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> index d86227236f55..3a486939168e 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -137,9 +137,9 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
>
> exynos_state = kzalloc(sizeof(*exynos_state), GFP_KERNEL);
> if (exynos_state) {
> - exynos_state->zpos = exynos_plane->config->zpos;
> plane->state = &exynos_state->base;
> plane->state->plane = plane;
> + plane->state->zpos = exynos_plane->config->zpos;
> }
> }
>
> @@ -155,7 +155,6 @@ exynos_drm_plane_duplicate_state(struct drm_plane *plane)
> return NULL;
>
> __drm_atomic_helper_plane_duplicate_state(plane, ©->base);
> - copy->zpos = exynos_state->zpos;
> return ©->base;
> }
>
> @@ -168,43 +167,6 @@ static void exynos_drm_plane_destroy_state(struct drm_plane *plane,
> kfree(old_exynos_state);
> }
>
> -static int exynos_drm_plane_atomic_set_property(struct drm_plane *plane,
> - struct drm_plane_state *state,
> - struct drm_property *property,
> - uint64_t val)
> -{
> - struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
> - struct exynos_drm_plane_state *exynos_state =
> - to_exynos_plane_state(state);
> - struct exynos_drm_private *dev_priv = plane->dev->dev_private;
> - const struct exynos_drm_plane_config *config = exynos_plane->config;
> -
> - if (property == dev_priv->plane_zpos_property &&
> - (config->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS))
> - exynos_state->zpos = val;
> - else
> - return -EINVAL;
> -
> - return 0;
> -}
> -
> -static int exynos_drm_plane_atomic_get_property(struct drm_plane *plane,
> - const struct drm_plane_state *state,
> - struct drm_property *property,
> - uint64_t *val)
> -{
> - const struct exynos_drm_plane_state *exynos_state =
> - container_of(state, const struct exynos_drm_plane_state, base);
> - struct exynos_drm_private *dev_priv = plane->dev->dev_private;
> -
> - if (property == dev_priv->plane_zpos_property)
> - *val = exynos_state->zpos;
> - else
> - return -EINVAL;
> -
> - return 0;
> -}
> -
> static struct drm_plane_funcs exynos_plane_funcs = {
> .update_plane = drm_atomic_helper_update_plane,
> .disable_plane = drm_atomic_helper_disable_plane,
> @@ -213,8 +175,6 @@ static struct drm_plane_funcs exynos_plane_funcs = {
> .reset = exynos_drm_plane_reset,
> .atomic_duplicate_state = exynos_drm_plane_duplicate_state,
> .atomic_destroy_state = exynos_drm_plane_destroy_state,
> - .atomic_set_property = exynos_drm_plane_atomic_set_property,
> - .atomic_get_property = exynos_drm_plane_atomic_get_property,
> };
>
> static int
> @@ -302,20 +262,23 @@ static const struct drm_plane_helper_funcs plane_helper_funcs = {
> };
>
> static void exynos_plane_attach_zpos_property(struct drm_plane *plane,
> - unsigned int zpos)
> + unsigned int zpos, bool immutable)
> {
> struct drm_device *dev = plane->dev;
> - struct exynos_drm_private *dev_priv = dev->dev_private;
> struct drm_property *prop;
>
> - prop = dev_priv->plane_zpos_property;
> - if (!prop) {
> - prop = drm_property_create_range(dev, 0, "zpos",
> - 0, MAX_PLANE - 1);
> - if (!prop)
> - return;
> -
> - dev_priv->plane_zpos_property = prop;
> + if (immutable) {
> + if (!dev->mode_config.zpos_immutable_property)
> + if (drm_mode_create_zpos_immutable_property(dev, 0,
> + MAX_PLANE - 1))
> + return;
> + prop = dev->mode_config.zpos_immutable_property;
> + } else {
> + if (!dev->mode_config.zpos_property)
> + if (drm_mode_create_zpos_property(dev, 0,
> + MAX_PLANE - 1))
> + return;
> + prop = dev->mode_config.zpos_property;
> }
>
> drm_object_attach_property(&plane->base, prop, zpos);
> @@ -344,7 +307,8 @@ int exynos_plane_init(struct drm_device *dev,
> exynos_plane->index = index;
> exynos_plane->config = config;
>
> - exynos_plane_attach_zpos_property(&exynos_plane->base, config->zpos);
> + exynos_plane_attach_zpos_property(&exynos_plane->base, config->zpos,
> + !(config->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS));
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
> index b5fbc1cbf024..d00c201773c9 100644
> --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> @@ -478,6 +478,7 @@ static void vp_video_buffer(struct mixer_context *ctx,
> struct drm_display_mode *mode = &state->base.crtc->state->adjusted_mode;
> struct mixer_resources *res = &ctx->mixer_res;
> struct drm_framebuffer *fb = state->base.fb;
> + unsigned int priority = state->base.normalized_zpos + 1;
> unsigned long flags;
> dma_addr_t luma_addr[2], chroma_addr[2];
> bool tiled_mode = false;
> @@ -562,7 +563,7 @@ static void vp_video_buffer(struct mixer_context *ctx,
>
> mixer_cfg_scan(ctx, mode->vdisplay);
> mixer_cfg_rgb_fmt(ctx, mode->vdisplay);
> - mixer_cfg_layer(ctx, plane->index, state->zpos + 1, true);
> + mixer_cfg_layer(ctx, plane->index, priority, true);
> mixer_cfg_vp_blend(ctx);
> mixer_run(ctx);
>
> @@ -587,6 +588,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
> struct drm_display_mode *mode = &state->base.crtc->state->adjusted_mode;
> struct mixer_resources *res = &ctx->mixer_res;
> struct drm_framebuffer *fb = state->base.fb;
> + unsigned int priority = state->base.normalized_zpos + 1;
> unsigned long flags;
> unsigned int win = plane->index;
> unsigned int x_ratio = 0, y_ratio = 0;
> @@ -678,7 +680,7 @@ static void mixer_graph_buffer(struct mixer_context *ctx,
>
> mixer_cfg_scan(ctx, mode->vdisplay);
> mixer_cfg_rgb_fmt(ctx, mode->vdisplay);
> - mixer_cfg_layer(ctx, win, state->zpos + 1, true);
> + mixer_cfg_layer(ctx, win, priority, true);
> mixer_cfg_gfx_blend(ctx, win, is_alpha_format(fb->pixel_format));
>
> /* layer update mandatory for mixer 16.0.33.0 */
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v5 3/5] drm: simplify initialization of rotation property
2016-01-27 14:44 [PATCH v5 0/5] drm/exynos: introduce generic zpos and blending properties Marek Szyprowski
2016-01-27 14:44 ` [PATCH v5 1/5] drm: add generic zpos property Marek Szyprowski
2016-01-27 14:44 ` [PATCH v5 2/5] drm/exynos: use generic code for managing zpos plane property Marek Szyprowski
@ 2016-01-27 14:44 ` Marek Szyprowski
2016-02-29 15:06 ` Daniel Vetter
2016-02-29 15:13 ` Ville Syrjälä
2016-01-27 14:44 ` [PATCH v5 4/5] drm: add generic blending related properties Marek Szyprowski
` (2 subsequent siblings)
5 siblings, 2 replies; 20+ messages in thread
From: Marek Szyprowski @ 2016-01-27 14:44 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: Krzysztof Kozlowski, Benjamin Gaignard,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, fabien.dessenne,
Andrzej Hajda, Tobias Jakobi, vincent.abriou, Marek Szyprowski
This patch simplifies initialization of generic rotation property and
aligns the code to match recently introduced function for intializing
generic zpos property. It also adds missing documentation.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++-----
drivers/gpu/drm/drm_crtc.c | 29 ++++++++++++++++++++-----
drivers/gpu/drm/i915/intel_display.c | 6 ++---
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +--
drivers/gpu/drm/omapdrm/omap_drv.c | 3 +--
include/drm/drm_crtc.h | 4 ++--
6 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index 1ffe9c329c46..4f9606cdf0f2 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -967,12 +967,10 @@ atmel_hlcdc_plane_create_properties(struct drm_device *dev)
if (!props->alpha)
return ERR_PTR(-ENOMEM);
- dev->mode_config.rotation_property =
- drm_mode_create_rotation_property(dev,
- BIT(DRM_ROTATE_0) |
- BIT(DRM_ROTATE_90) |
- BIT(DRM_ROTATE_180) |
- BIT(DRM_ROTATE_270));
+ drm_mode_create_rotation_property(dev, BIT(DRM_ROTATE_0) |
+ BIT(DRM_ROTATE_90) |
+ BIT(DRM_ROTATE_180) |
+ BIT(DRM_ROTATE_270));
if (!dev->mode_config.rotation_property)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d40bab29747e..822ad6928144 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -5875,10 +5875,23 @@ void drm_mode_config_cleanup(struct drm_device *dev)
}
EXPORT_SYMBOL(drm_mode_config_cleanup);
-struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
- unsigned int supported_rotations)
+/**
+ * drm_mode_create_rotation_property - create generic rotation property
+ * @dev: DRM device
+ * @supported_rotations: bitmask of supported rotation modes
+ *
+ * This function initializes generic rotation property and enables support
+ * for it in drm core. Drivers can then attach this property to planes to enable
+ * support for different rotation modes.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_mode_create_rotation_property(struct drm_device *dev,
+ unsigned int supported_rotations)
{
- static const struct drm_prop_enum_list props[] = {
+ struct drm_property *prop;
+ static const struct drm_prop_enum_list values[] = {
{ DRM_ROTATE_0, "rotate-0" },
{ DRM_ROTATE_90, "rotate-90" },
{ DRM_ROTATE_180, "rotate-180" },
@@ -5887,9 +5900,13 @@ struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
{ DRM_REFLECT_Y, "reflect-y" },
};
- return drm_property_create_bitmask(dev, 0, "rotation",
- props, ARRAY_SIZE(props),
- supported_rotations);
+ prop = drm_property_create_bitmask(dev, 0, "rotation", values,
+ ARRAY_SIZE(values), supported_rotations);
+ if (!prop)
+ return -ENOMEM;
+
+ dev->mode_config.rotation_property = prop;
+ return 0;
}
EXPORT_SYMBOL(drm_mode_create_rotation_property);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2f00828ccc6e..1bce8750c308 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14046,8 +14046,7 @@ void intel_create_rotation_property(struct drm_device *dev, struct intel_plane *
if (INTEL_INFO(dev)->gen >= 9)
flags |= BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270);
- dev->mode_config.rotation_property =
- drm_mode_create_rotation_property(dev, flags);
+ drm_mode_create_rotation_property(dev, flags);
}
if (dev->mode_config.rotation_property)
drm_object_attach_property(&plane->base.base,
@@ -14183,8 +14182,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
if (INTEL_INFO(dev)->gen >= 4) {
if (!dev->mode_config.rotation_property)
- dev->mode_config.rotation_property =
- drm_mode_create_rotation_property(dev,
+ drm_mode_create_rotation_property(dev,
BIT(DRM_ROTATE_0) |
BIT(DRM_ROTATE_180));
if (dev->mode_config.rotation_property)
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index 432c09836b0e..8defeec0d453 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -76,8 +76,7 @@ static void mdp5_plane_install_rotation_property(struct drm_device *dev,
return;
if (!dev->mode_config.rotation_property)
- dev->mode_config.rotation_property =
- drm_mode_create_rotation_property(dev,
+ drm_mode_create_rotation_property(dev,
BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
if (dev->mode_config.rotation_property)
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index dfafdb602ad2..c6ce2b31f1c5 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -304,8 +304,7 @@ static int omap_modeset_init_properties(struct drm_device *dev)
struct omap_drm_private *priv = dev->dev_private;
if (priv->has_dmm) {
- dev->mode_config.rotation_property =
- drm_mode_create_rotation_property(dev,
+ drm_mode_create_rotation_property(dev,
BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270) |
BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 4f32a358d631..702f4f28f580 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -2494,8 +2494,8 @@ extern int drm_format_plane_cpp(uint32_t format, int plane);
extern int drm_format_horz_chroma_subsampling(uint32_t format);
extern int drm_format_vert_chroma_subsampling(uint32_t format);
extern const char *drm_get_format_name(uint32_t format);
-extern struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
- unsigned int supported_rotations);
+extern int drm_mode_create_rotation_property(struct drm_device *dev,
+ unsigned int supported_rotations);
extern unsigned int drm_rotation_simplify(unsigned int rotation,
unsigned int supported_rotations);
--
1.9.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v5 3/5] drm: simplify initialization of rotation property
2016-01-27 14:44 ` [PATCH v5 3/5] drm: simplify initialization of rotation property Marek Szyprowski
@ 2016-02-29 15:06 ` Daniel Vetter
2016-02-29 15:09 ` Daniel Vetter
2016-02-29 15:13 ` Ville Syrjälä
1 sibling, 1 reply; 20+ messages in thread
From: Daniel Vetter @ 2016-02-29 15:06 UTC (permalink / raw)
To: Marek Szyprowski
Cc: dri-devel, linux-samsung-soc, Inki Dae, Daniel Vetter,
Ville Syrjälä,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
On Wed, Jan 27, 2016 at 03:44:41PM +0100, Marek Szyprowski wrote:
> This patch simplifies initialization of generic rotation property and
> aligns the code to match recently introduced function for intializing
> generic zpos property. It also adds missing documentation.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
I merged patches 3-5 to drm-misc, thanks. For the blending mode I'd like
to gather a few more acks from people who have been proposing ideas in the
past (would speed up if you cc them next time around).
Thanks, Daniel
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++-----
> drivers/gpu/drm/drm_crtc.c | 29 ++++++++++++++++++++-----
> drivers/gpu/drm/i915/intel_display.c | 6 ++---
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +--
> drivers/gpu/drm/omapdrm/omap_drv.c | 3 +--
> include/drm/drm_crtc.h | 4 ++--
> 6 files changed, 33 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> index 1ffe9c329c46..4f9606cdf0f2 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> @@ -967,12 +967,10 @@ atmel_hlcdc_plane_create_properties(struct drm_device *dev)
> if (!props->alpha)
> return ERR_PTR(-ENOMEM);
>
> - dev->mode_config.rotation_property =
> - drm_mode_create_rotation_property(dev,
> - BIT(DRM_ROTATE_0) |
> - BIT(DRM_ROTATE_90) |
> - BIT(DRM_ROTATE_180) |
> - BIT(DRM_ROTATE_270));
> + drm_mode_create_rotation_property(dev, BIT(DRM_ROTATE_0) |
> + BIT(DRM_ROTATE_90) |
> + BIT(DRM_ROTATE_180) |
> + BIT(DRM_ROTATE_270));
> if (!dev->mode_config.rotation_property)
> return ERR_PTR(-ENOMEM);
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index d40bab29747e..822ad6928144 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -5875,10 +5875,23 @@ void drm_mode_config_cleanup(struct drm_device *dev)
> }
> EXPORT_SYMBOL(drm_mode_config_cleanup);
>
> -struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> - unsigned int supported_rotations)
> +/**
> + * drm_mode_create_rotation_property - create generic rotation property
> + * @dev: DRM device
> + * @supported_rotations: bitmask of supported rotation modes
> + *
> + * This function initializes generic rotation property and enables support
> + * for it in drm core. Drivers can then attach this property to planes to enable
> + * support for different rotation modes.
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_mode_create_rotation_property(struct drm_device *dev,
> + unsigned int supported_rotations)
> {
> - static const struct drm_prop_enum_list props[] = {
> + struct drm_property *prop;
> + static const struct drm_prop_enum_list values[] = {
> { DRM_ROTATE_0, "rotate-0" },
> { DRM_ROTATE_90, "rotate-90" },
> { DRM_ROTATE_180, "rotate-180" },
> @@ -5887,9 +5900,13 @@ struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> { DRM_REFLECT_Y, "reflect-y" },
> };
>
> - return drm_property_create_bitmask(dev, 0, "rotation",
> - props, ARRAY_SIZE(props),
> - supported_rotations);
> + prop = drm_property_create_bitmask(dev, 0, "rotation", values,
> + ARRAY_SIZE(values), supported_rotations);
> + if (!prop)
> + return -ENOMEM;
> +
> + dev->mode_config.rotation_property = prop;
> + return 0;
> }
> EXPORT_SYMBOL(drm_mode_create_rotation_property);
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 2f00828ccc6e..1bce8750c308 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14046,8 +14046,7 @@ void intel_create_rotation_property(struct drm_device *dev, struct intel_plane *
> if (INTEL_INFO(dev)->gen >= 9)
> flags |= BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270);
>
> - dev->mode_config.rotation_property =
> - drm_mode_create_rotation_property(dev, flags);
> + drm_mode_create_rotation_property(dev, flags);
> }
> if (dev->mode_config.rotation_property)
> drm_object_attach_property(&plane->base.base,
> @@ -14183,8 +14182,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
>
> if (INTEL_INFO(dev)->gen >= 4) {
> if (!dev->mode_config.rotation_property)
> - dev->mode_config.rotation_property =
> - drm_mode_create_rotation_property(dev,
> + drm_mode_create_rotation_property(dev,
> BIT(DRM_ROTATE_0) |
> BIT(DRM_ROTATE_180));
> if (dev->mode_config.rotation_property)
> diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> index 432c09836b0e..8defeec0d453 100644
> --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> @@ -76,8 +76,7 @@ static void mdp5_plane_install_rotation_property(struct drm_device *dev,
> return;
>
> if (!dev->mode_config.rotation_property)
> - dev->mode_config.rotation_property =
> - drm_mode_create_rotation_property(dev,
> + drm_mode_create_rotation_property(dev,
> BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
>
> if (dev->mode_config.rotation_property)
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> index dfafdb602ad2..c6ce2b31f1c5 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -304,8 +304,7 @@ static int omap_modeset_init_properties(struct drm_device *dev)
> struct omap_drm_private *priv = dev->dev_private;
>
> if (priv->has_dmm) {
> - dev->mode_config.rotation_property =
> - drm_mode_create_rotation_property(dev,
> + drm_mode_create_rotation_property(dev,
> BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
> BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270) |
> BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 4f32a358d631..702f4f28f580 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -2494,8 +2494,8 @@ extern int drm_format_plane_cpp(uint32_t format, int plane);
> extern int drm_format_horz_chroma_subsampling(uint32_t format);
> extern int drm_format_vert_chroma_subsampling(uint32_t format);
> extern const char *drm_get_format_name(uint32_t format);
> -extern struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> - unsigned int supported_rotations);
> +extern int drm_mode_create_rotation_property(struct drm_device *dev,
> + unsigned int supported_rotations);
> extern unsigned int drm_rotation_simplify(unsigned int rotation,
> unsigned int supported_rotations);
>
> --
> 1.9.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v5 3/5] drm: simplify initialization of rotation property
2016-02-29 15:06 ` Daniel Vetter
@ 2016-02-29 15:09 ` Daniel Vetter
2016-02-29 15:17 ` Daniel Vetter
0 siblings, 1 reply; 20+ messages in thread
From: Daniel Vetter @ 2016-02-29 15:09 UTC (permalink / raw)
To: Marek Szyprowski
Cc: dri-devel, linux-samsung-soc, Inki Dae, Daniel Vetter,
Ville Syrjälä,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
On Mon, Feb 29, 2016 at 04:06:40PM +0100, Daniel Vetter wrote:
> On Wed, Jan 27, 2016 at 03:44:41PM +0100, Marek Szyprowski wrote:
> > This patch simplifies initialization of generic rotation property and
> > aligns the code to match recently introduced function for intializing
> > generic zpos property. It also adds missing documentation.
> >
> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>
> I merged patches 3-5 to drm-misc, thanks. For the blending mode I'd like
> to gather a few more acks from people who have been proposing ideas in the
> past (would speed up if you cc them next time around).
Blergh, I meant patches 1-3 are merged ofc ;-)
>
> Thanks, Daniel
> > ---
> > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++-----
> > drivers/gpu/drm/drm_crtc.c | 29 ++++++++++++++++++++-----
> > drivers/gpu/drm/i915/intel_display.c | 6 ++---
> > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +--
> > drivers/gpu/drm/omapdrm/omap_drv.c | 3 +--
> > include/drm/drm_crtc.h | 4 ++--
> > 6 files changed, 33 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> > index 1ffe9c329c46..4f9606cdf0f2 100644
> > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> > @@ -967,12 +967,10 @@ atmel_hlcdc_plane_create_properties(struct drm_device *dev)
> > if (!props->alpha)
> > return ERR_PTR(-ENOMEM);
> >
> > - dev->mode_config.rotation_property =
> > - drm_mode_create_rotation_property(dev,
> > - BIT(DRM_ROTATE_0) |
> > - BIT(DRM_ROTATE_90) |
> > - BIT(DRM_ROTATE_180) |
> > - BIT(DRM_ROTATE_270));
> > + drm_mode_create_rotation_property(dev, BIT(DRM_ROTATE_0) |
> > + BIT(DRM_ROTATE_90) |
> > + BIT(DRM_ROTATE_180) |
> > + BIT(DRM_ROTATE_270));
> > if (!dev->mode_config.rotation_property)
> > return ERR_PTR(-ENOMEM);
> >
> > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> > index d40bab29747e..822ad6928144 100644
> > --- a/drivers/gpu/drm/drm_crtc.c
> > +++ b/drivers/gpu/drm/drm_crtc.c
> > @@ -5875,10 +5875,23 @@ void drm_mode_config_cleanup(struct drm_device *dev)
> > }
> > EXPORT_SYMBOL(drm_mode_config_cleanup);
> >
> > -struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> > - unsigned int supported_rotations)
> > +/**
> > + * drm_mode_create_rotation_property - create generic rotation property
> > + * @dev: DRM device
> > + * @supported_rotations: bitmask of supported rotation modes
> > + *
> > + * This function initializes generic rotation property and enables support
> > + * for it in drm core. Drivers can then attach this property to planes to enable
> > + * support for different rotation modes.
> > + *
> > + * Returns:
> > + * Zero on success, negative errno on failure.
> > + */
> > +int drm_mode_create_rotation_property(struct drm_device *dev,
> > + unsigned int supported_rotations)
> > {
> > - static const struct drm_prop_enum_list props[] = {
> > + struct drm_property *prop;
> > + static const struct drm_prop_enum_list values[] = {
> > { DRM_ROTATE_0, "rotate-0" },
> > { DRM_ROTATE_90, "rotate-90" },
> > { DRM_ROTATE_180, "rotate-180" },
> > @@ -5887,9 +5900,13 @@ struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> > { DRM_REFLECT_Y, "reflect-y" },
> > };
> >
> > - return drm_property_create_bitmask(dev, 0, "rotation",
> > - props, ARRAY_SIZE(props),
> > - supported_rotations);
> > + prop = drm_property_create_bitmask(dev, 0, "rotation", values,
> > + ARRAY_SIZE(values), supported_rotations);
> > + if (!prop)
> > + return -ENOMEM;
> > +
> > + dev->mode_config.rotation_property = prop;
> > + return 0;
> > }
> > EXPORT_SYMBOL(drm_mode_create_rotation_property);
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 2f00828ccc6e..1bce8750c308 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -14046,8 +14046,7 @@ void intel_create_rotation_property(struct drm_device *dev, struct intel_plane *
> > if (INTEL_INFO(dev)->gen >= 9)
> > flags |= BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270);
> >
> > - dev->mode_config.rotation_property =
> > - drm_mode_create_rotation_property(dev, flags);
> > + drm_mode_create_rotation_property(dev, flags);
> > }
> > if (dev->mode_config.rotation_property)
> > drm_object_attach_property(&plane->base.base,
> > @@ -14183,8 +14182,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
> >
> > if (INTEL_INFO(dev)->gen >= 4) {
> > if (!dev->mode_config.rotation_property)
> > - dev->mode_config.rotation_property =
> > - drm_mode_create_rotation_property(dev,
> > + drm_mode_create_rotation_property(dev,
> > BIT(DRM_ROTATE_0) |
> > BIT(DRM_ROTATE_180));
> > if (dev->mode_config.rotation_property)
> > diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> > index 432c09836b0e..8defeec0d453 100644
> > --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> > +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> > @@ -76,8 +76,7 @@ static void mdp5_plane_install_rotation_property(struct drm_device *dev,
> > return;
> >
> > if (!dev->mode_config.rotation_property)
> > - dev->mode_config.rotation_property =
> > - drm_mode_create_rotation_property(dev,
> > + drm_mode_create_rotation_property(dev,
> > BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
> >
> > if (dev->mode_config.rotation_property)
> > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> > index dfafdb602ad2..c6ce2b31f1c5 100644
> > --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> > @@ -304,8 +304,7 @@ static int omap_modeset_init_properties(struct drm_device *dev)
> > struct omap_drm_private *priv = dev->dev_private;
> >
> > if (priv->has_dmm) {
> > - dev->mode_config.rotation_property =
> > - drm_mode_create_rotation_property(dev,
> > + drm_mode_create_rotation_property(dev,
> > BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
> > BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270) |
> > BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
> > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> > index 4f32a358d631..702f4f28f580 100644
> > --- a/include/drm/drm_crtc.h
> > +++ b/include/drm/drm_crtc.h
> > @@ -2494,8 +2494,8 @@ extern int drm_format_plane_cpp(uint32_t format, int plane);
> > extern int drm_format_horz_chroma_subsampling(uint32_t format);
> > extern int drm_format_vert_chroma_subsampling(uint32_t format);
> > extern const char *drm_get_format_name(uint32_t format);
> > -extern struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> > - unsigned int supported_rotations);
> > +extern int drm_mode_create_rotation_property(struct drm_device *dev,
> > + unsigned int supported_rotations);
> > extern unsigned int drm_rotation_simplify(unsigned int rotation,
> > unsigned int supported_rotations);
> >
> > --
> > 1.9.2
> >
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [PATCH v5 3/5] drm: simplify initialization of rotation property
2016-02-29 15:09 ` Daniel Vetter
@ 2016-02-29 15:17 ` Daniel Vetter
0 siblings, 0 replies; 20+ messages in thread
From: Daniel Vetter @ 2016-02-29 15:17 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Krzysztof Kozlowski, linux-samsung-soc, Benjamin Gaignard,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, dri-devel,
Andrzej Hajda, Tobias Jakobi, fabien.dessenne, vincent.abriou
On Mon, Feb 29, 2016 at 04:09:31PM +0100, Daniel Vetter wrote:
> On Mon, Feb 29, 2016 at 04:06:40PM +0100, Daniel Vetter wrote:
> > On Wed, Jan 27, 2016 at 03:44:41PM +0100, Marek Szyprowski wrote:
> > > This patch simplifies initialization of generic rotation property and
> > > aligns the code to match recently introduced function for intializing
> > > generic zpos property. It also adds missing documentation.
> > >
> > > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> >
> > I merged patches 3-5 to drm-misc, thanks. For the blending mode I'd like
> > to gather a few more acks from people who have been proposing ideas in the
> > past (would speed up if you cc them next time around).
>
> Blergh, I meant patches 1-3 are merged ofc ;-)
Ok, didn't even get around to push it out before I dropped it again on
Ville's request. Please always Cc: everyone who discussed previous
versions of a patch series to get their attention. And please include all
such Cc: lines in the commit messages, so I know whom to ping on irc in
case of doubt first.
And a minor bikeshed: I prefer if there's a per-patch changelog somewhere,
not just in the cover letter. Although I guess doesn't apply here since
most patches are new/completely different.
Thanks, Daniel
> >
> > Thanks, Daniel
> > > ---
> > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++-----
> > > drivers/gpu/drm/drm_crtc.c | 29 ++++++++++++++++++++-----
> > > drivers/gpu/drm/i915/intel_display.c | 6 ++---
> > > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +--
> > > drivers/gpu/drm/omapdrm/omap_drv.c | 3 +--
> > > include/drm/drm_crtc.h | 4 ++--
> > > 6 files changed, 33 insertions(+), 22 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> > > index 1ffe9c329c46..4f9606cdf0f2 100644
> > > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> > > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> > > @@ -967,12 +967,10 @@ atmel_hlcdc_plane_create_properties(struct drm_device *dev)
> > > if (!props->alpha)
> > > return ERR_PTR(-ENOMEM);
> > >
> > > - dev->mode_config.rotation_property =
> > > - drm_mode_create_rotation_property(dev,
> > > - BIT(DRM_ROTATE_0) |
> > > - BIT(DRM_ROTATE_90) |
> > > - BIT(DRM_ROTATE_180) |
> > > - BIT(DRM_ROTATE_270));
> > > + drm_mode_create_rotation_property(dev, BIT(DRM_ROTATE_0) |
> > > + BIT(DRM_ROTATE_90) |
> > > + BIT(DRM_ROTATE_180) |
> > > + BIT(DRM_ROTATE_270));
> > > if (!dev->mode_config.rotation_property)
> > > return ERR_PTR(-ENOMEM);
> > >
> > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> > > index d40bab29747e..822ad6928144 100644
> > > --- a/drivers/gpu/drm/drm_crtc.c
> > > +++ b/drivers/gpu/drm/drm_crtc.c
> > > @@ -5875,10 +5875,23 @@ void drm_mode_config_cleanup(struct drm_device *dev)
> > > }
> > > EXPORT_SYMBOL(drm_mode_config_cleanup);
> > >
> > > -struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> > > - unsigned int supported_rotations)
> > > +/**
> > > + * drm_mode_create_rotation_property - create generic rotation property
> > > + * @dev: DRM device
> > > + * @supported_rotations: bitmask of supported rotation modes
> > > + *
> > > + * This function initializes generic rotation property and enables support
> > > + * for it in drm core. Drivers can then attach this property to planes to enable
> > > + * support for different rotation modes.
> > > + *
> > > + * Returns:
> > > + * Zero on success, negative errno on failure.
> > > + */
> > > +int drm_mode_create_rotation_property(struct drm_device *dev,
> > > + unsigned int supported_rotations)
> > > {
> > > - static const struct drm_prop_enum_list props[] = {
> > > + struct drm_property *prop;
> > > + static const struct drm_prop_enum_list values[] = {
> > > { DRM_ROTATE_0, "rotate-0" },
> > > { DRM_ROTATE_90, "rotate-90" },
> > > { DRM_ROTATE_180, "rotate-180" },
> > > @@ -5887,9 +5900,13 @@ struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> > > { DRM_REFLECT_Y, "reflect-y" },
> > > };
> > >
> > > - return drm_property_create_bitmask(dev, 0, "rotation",
> > > - props, ARRAY_SIZE(props),
> > > - supported_rotations);
> > > + prop = drm_property_create_bitmask(dev, 0, "rotation", values,
> > > + ARRAY_SIZE(values), supported_rotations);
> > > + if (!prop)
> > > + return -ENOMEM;
> > > +
> > > + dev->mode_config.rotation_property = prop;
> > > + return 0;
> > > }
> > > EXPORT_SYMBOL(drm_mode_create_rotation_property);
> > >
> > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > > index 2f00828ccc6e..1bce8750c308 100644
> > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > @@ -14046,8 +14046,7 @@ void intel_create_rotation_property(struct drm_device *dev, struct intel_plane *
> > > if (INTEL_INFO(dev)->gen >= 9)
> > > flags |= BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270);
> > >
> > > - dev->mode_config.rotation_property =
> > > - drm_mode_create_rotation_property(dev, flags);
> > > + drm_mode_create_rotation_property(dev, flags);
> > > }
> > > if (dev->mode_config.rotation_property)
> > > drm_object_attach_property(&plane->base.base,
> > > @@ -14183,8 +14182,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
> > >
> > > if (INTEL_INFO(dev)->gen >= 4) {
> > > if (!dev->mode_config.rotation_property)
> > > - dev->mode_config.rotation_property =
> > > - drm_mode_create_rotation_property(dev,
> > > + drm_mode_create_rotation_property(dev,
> > > BIT(DRM_ROTATE_0) |
> > > BIT(DRM_ROTATE_180));
> > > if (dev->mode_config.rotation_property)
> > > diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> > > index 432c09836b0e..8defeec0d453 100644
> > > --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> > > +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
> > > @@ -76,8 +76,7 @@ static void mdp5_plane_install_rotation_property(struct drm_device *dev,
> > > return;
> > >
> > > if (!dev->mode_config.rotation_property)
> > > - dev->mode_config.rotation_property =
> > > - drm_mode_create_rotation_property(dev,
> > > + drm_mode_create_rotation_property(dev,
> > > BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
> > >
> > > if (dev->mode_config.rotation_property)
> > > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> > > index dfafdb602ad2..c6ce2b31f1c5 100644
> > > --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> > > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> > > @@ -304,8 +304,7 @@ static int omap_modeset_init_properties(struct drm_device *dev)
> > > struct omap_drm_private *priv = dev->dev_private;
> > >
> > > if (priv->has_dmm) {
> > > - dev->mode_config.rotation_property =
> > > - drm_mode_create_rotation_property(dev,
> > > + drm_mode_create_rotation_property(dev,
> > > BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
> > > BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270) |
> > > BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
> > > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> > > index 4f32a358d631..702f4f28f580 100644
> > > --- a/include/drm/drm_crtc.h
> > > +++ b/include/drm/drm_crtc.h
> > > @@ -2494,8 +2494,8 @@ extern int drm_format_plane_cpp(uint32_t format, int plane);
> > > extern int drm_format_horz_chroma_subsampling(uint32_t format);
> > > extern int drm_format_vert_chroma_subsampling(uint32_t format);
> > > extern const char *drm_get_format_name(uint32_t format);
> > > -extern struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> > > - unsigned int supported_rotations);
> > > +extern int drm_mode_create_rotation_property(struct drm_device *dev,
> > > + unsigned int supported_rotations);
> > > extern unsigned int drm_rotation_simplify(unsigned int rotation,
> > > unsigned int supported_rotations);
> > >
> > > --
> > > 1.9.2
> > >
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v5 3/5] drm: simplify initialization of rotation property
2016-01-27 14:44 ` [PATCH v5 3/5] drm: simplify initialization of rotation property Marek Szyprowski
2016-02-29 15:06 ` Daniel Vetter
@ 2016-02-29 15:13 ` Ville Syrjälä
1 sibling, 0 replies; 20+ messages in thread
From: Ville Syrjälä @ 2016-02-29 15:13 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Krzysztof Kozlowski, linux-samsung-soc, Benjamin Gaignard,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, dri-devel,
Andrzej Hajda, Tobias Jakobi, fabien.dessenne, vincent.abriou
On Wed, Jan 27, 2016 at 03:44:41PM +0100, Marek Szyprowski wrote:
> This patch simplifies initialization of generic rotation property and
> aligns the code to match recently introduced function for intializing
> generic zpos property. It also adds missing documentation.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++-----
> drivers/gpu/drm/drm_crtc.c | 29 ++++++++++++++++++++-----
> drivers/gpu/drm/i915/intel_display.c | 6 ++---
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +--
> drivers/gpu/drm/omapdrm/omap_drv.c | 3 +--
> include/drm/drm_crtc.h | 4 ++--
> 6 files changed, 33 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> index 1ffe9c329c46..4f9606cdf0f2 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
> @@ -967,12 +967,10 @@ atmel_hlcdc_plane_create_properties(struct drm_device *dev)
> if (!props->alpha)
> return ERR_PTR(-ENOMEM);
>
> - dev->mode_config.rotation_property =
> - drm_mode_create_rotation_property(dev,
> - BIT(DRM_ROTATE_0) |
> - BIT(DRM_ROTATE_90) |
> - BIT(DRM_ROTATE_180) |
> - BIT(DRM_ROTATE_270));
> + drm_mode_create_rotation_property(dev, BIT(DRM_ROTATE_0) |
> + BIT(DRM_ROTATE_90) |
> + BIT(DRM_ROTATE_180) |
> + BIT(DRM_ROTATE_270));
> if (!dev->mode_config.rotation_property)
> return ERR_PTR(-ENOMEM);
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index d40bab29747e..822ad6928144 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -5875,10 +5875,23 @@ void drm_mode_config_cleanup(struct drm_device *dev)
> }
> EXPORT_SYMBOL(drm_mode_config_cleanup);
>
> -struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> - unsigned int supported_rotations)
> +/**
> + * drm_mode_create_rotation_property - create generic rotation property
> + * @dev: DRM device
> + * @supported_rotations: bitmask of supported rotation modes
> + *
> + * This function initializes generic rotation property and enables support
> + * for it in drm core. Drivers can then attach this property to planes to enable
> + * support for different rotation modes.
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_mode_create_rotation_property(struct drm_device *dev,
> + unsigned int supported_rotations)
> {
> - static const struct drm_prop_enum_list props[] = {
> + struct drm_property *prop;
> + static const struct drm_prop_enum_list values[] = {
> { DRM_ROTATE_0, "rotate-0" },
> { DRM_ROTATE_90, "rotate-90" },
> { DRM_ROTATE_180, "rotate-180" },
> @@ -5887,9 +5900,13 @@ struct drm_property *drm_mode_create_rotation_property(struct drm_device *dev,
> { DRM_REFLECT_Y, "reflect-y" },
> };
>
> - return drm_property_create_bitmask(dev, 0, "rotation",
> - props, ARRAY_SIZE(props),
> - supported_rotations);
> + prop = drm_property_create_bitmask(dev, 0, "rotation", values,
> + ARRAY_SIZE(values), supported_rotations);
> + if (!prop)
> + return -ENOMEM;
> +
> + dev->mode_config.rotation_property = prop;
Again, per-plane rotation properties are going to be needed, so this
isn't good.
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v5 4/5] drm: add generic blending related properties
2016-01-27 14:44 [PATCH v5 0/5] drm/exynos: introduce generic zpos and blending properties Marek Szyprowski
` (2 preceding siblings ...)
2016-01-27 14:44 ` [PATCH v5 3/5] drm: simplify initialization of rotation property Marek Szyprowski
@ 2016-01-27 14:44 ` Marek Szyprowski
2016-02-29 15:23 ` Ville Syrjälä
2016-01-27 14:44 ` [PATCH v5 5/5] drm/exynos: add support for blending properties Marek Szyprowski
2016-02-23 9:10 ` [PATCH v5 0/5] drm/exynos: introduce generic zpos and " Benjamin Gaignard
5 siblings, 1 reply; 20+ messages in thread
From: Marek Szyprowski @ 2016-01-27 14:44 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: Marek Szyprowski, Inki Dae, Daniel Vetter,
Ville Syrjälä,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
This patch adds code and documentation for the following blending
related properties: 'alpha', 'blending' and 'alpha_premult'.
'alpha' property defines plane's transparency used for some blending
modes.
'alpha_premult' property defines if RGB pixel data in the framebuffer
contains values pre-multiplied by its alpha value or full range RGB
values (0-255), which needs to be multiplied by pixel alpha value for
blending operation.
'blending' property selects blending mode - by selecting one of the
predefined values, user can select a pair of factors, which will be
used in the generic blending equation. For more information, see
the kerneldoc for the added code.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
Documentation/DocBook/gpu.tmpl | 47 +++++++++++++++++-
drivers/gpu/drm/drm_atomic.c | 12 +++++
drivers/gpu/drm/drm_blend.c | 110 +++++++++++++++++++++++++++++++++++++++++
include/drm/drm_crtc.h | 15 ++++++
include/uapi/drm/drm_mode.h | 101 +++++++++++++++++++++++++++++++++++++
5 files changed, 283 insertions(+), 2 deletions(-)
diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
index ae7d913adf60..e5197368e68f 100644
--- a/Documentation/DocBook/gpu.tmpl
+++ b/Documentation/DocBook/gpu.tmpl
@@ -1110,6 +1110,22 @@ int max_width, max_height;</synopsis>
</sect2>
</sect1>
+ <!-- Internals: plane blending -->
+
+ <sect1 id="drm-plane-blending">
+ <title>Plane blending</title>
+
+ <sect2>
+ <title>Plane Blending Overview</title>
+!Pinclude/uapi/drm/drm_mode.h Generic plane blending operation
+ </sect2>
+ <sect2>
+ <title>Blending Function Reference</title>
+!Iinclude/uapi/drm/drm_mode.h
+!Edrivers/gpu/drm/drm_blend.c
+ </sect2>
+ </sect1>
+
<!-- Internals: kms initialization and cleanup -->
<sect1 id="drm-kms-init">
@@ -1816,7 +1832,7 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >Description/Restrictions</td>
</tr>
<tr>
- <td rowspan="38" valign="top" >DRM</td>
+ <td rowspan="41" valign="top" >DRM</td>
<td valign="top" >Generic</td>
<td valign="top" >“rotation”</td>
<td valign="top" >BITMASK</td>
@@ -2068,7 +2084,7 @@ void intel_crt_init(struct drm_device *dev)
<td valign="top" >property to suggest an Y offset for a connector</td>
</tr>
<tr>
- <td rowspan="4" valign="top" >Optional</td>
+ <td rowspan="7" valign="top" >Optional</td>
<td valign="top" >“scaling mode”</td>
<td valign="top" >ENUM</td>
<td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
@@ -2102,6 +2118,33 @@ void intel_crt_init(struct drm_device *dev)
planes' order. Exact value range is driver dependent.</td>
</tr>
<tr>
+ <td valign="top" > "alpha" </td>
+ <td valign="top" >RANGE</td>
+ <td valign="top" >Min=0, Max= driver dependent</td>
+ <td valign="top" >Plane</td>
+ <td valign="top" >Plane's alpha value (transparency) for blending operation. Used in some blending modes. </td>
+ </tr>
+ <tr>
+ <td valign="top" > "alpha_premult" </td>
+ <td valign="top" >BOOL</td>
+ <td valign="top" >Min=0, Max=1</td>
+ <td valign="top" >Plane</td>
+ <td valign="top" >Indicates the range of the RGB data of the framebuffer attached to the given plane.
+ When enabled, RGB values fits the range from 0 to pixel's alpha value. When disabled, RGB
+ values are from 0 to 255 range and during blending operations they will be multiplied by
+ the pixel's alpha value first before computing result of blending equations. Value of this
+ property is used in some blending modes and only when user attaches framebuffer with pixel
+ format, which contains non-binary alpha channel.</td>
+ </tr>
+ <tr>
+ <td valign="top" > "blending" </td>
+ <td valign="top" >ENUM</td>
+ <td valign="top" >{ "disabled", "pixel-alpha", "const-alpha" "pixel-const-alpha" }</td>
+ <td valign="top" >Plane</td>
+ <td valign="top" >Selects algorithm used in plane blending operation. For more information, see
+ DRM_BLEND_* symbolic constant documentation. </td>
+ </tr>
+ <tr>
<td rowspan="20" valign="top" >i915</td>
<td rowspan="2" valign="top" >Generic</td>
<td valign="top" >"Broadcast RGB"</td>
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index a19201efb7d1..a85da144fd95 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -632,6 +632,12 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
state->rotation = val;
} else if (property == config->zpos_property) {
state->zpos = val;
+ } else if (property == config->alpha_property) {
+ state->alpha = val;
+ } else if (property == config->alpha_premult_property) {
+ state->alpha_premult = val;
+ } else if (property == config->blending_property) {
+ state->blending = val;
} else if (plane->funcs->atomic_set_property) {
return plane->funcs->atomic_set_property(plane, state,
property, val);
@@ -690,6 +696,12 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
*val = state->rotation;
} else if (property == config->zpos_property) {
*val = state->zpos;
+ } else if (property == config->alpha_property) {
+ *val = state->alpha;
+ } else if (property == config->alpha_premult_property) {
+ *val = state->alpha_premult;
+ } else if (property == config->blending_property) {
+ *val = state->blending;
} else if (plane->funcs->atomic_get_property) {
return plane->funcs->atomic_get_property(plane, state, property, val);
} else {
diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
index cdcb647c8ed9..eb7996a848df 100644
--- a/drivers/gpu/drm/drm_blend.c
+++ b/drivers/gpu/drm/drm_blend.c
@@ -99,6 +99,116 @@ int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
}
EXPORT_SYMBOL(drm_mode_create_zpos_immutable_property);
+/**
+ * drm_mode_create_blending_property - create generic blending property
+ * @dev: DRM device
+ * @supported_blendings: array of supported blending modes
+ * @supported_blendings_count: size of @supported_blendings array
+ *
+ * This function initializes generic blending property to selected subset
+ * of supported blending modes. Drivers can then attach this property to
+ * planes to let userspace to configure different blending modes. For more
+ * information on blending modes, see DRM_BLEND_* defines.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_mode_create_blending_property(struct drm_device *dev,
+ unsigned int *supported_blendings,
+ unsigned int supported_blendings_count)
+{
+ struct drm_property *prop;
+ static const struct drm_prop_enum_list all_values[] = {
+ { DRM_BLEND_DISABLED, "disabled" },
+ { DRM_BLEND_PIXEL_ALPHA, "pixel-alpha" },
+ { DRM_BLEND_CONST_ALPHA, "const-alpha" },
+ { DRM_BLEND_PIXEL_CONST_ALPHA, "pixel-const-alpha" },
+ };
+ struct drm_prop_enum_list *values;
+ int i, j;
+
+ values = kmalloc(supported_blendings_count * sizeof(*values),
+ GFP_KERNEL);
+ if (!values)
+ return -ENOMEM;
+
+ for (i = 0; i < supported_blendings_count; i++) {
+ for (j = 0; j < ARRAY_SIZE(all_values); j++) {
+ if (all_values[j].type == supported_blendings[i]) {
+ values[i].type = supported_blendings[i];
+ values[i].name = all_values[j].name;
+ break;
+ }
+ }
+ }
+
+ prop = drm_property_create_enum(dev, 0, "blending", values,
+ supported_blendings_count);
+ kfree(values);
+
+ if (!prop)
+ return -ENOMEM;
+
+ dev->mode_config.blending_property = prop;
+ return 0;
+}
+EXPORT_SYMBOL(drm_mode_create_blending_property);
+
+/**
+ * drm_mode_create_alpha_property - create plane alpha property
+ * @dev: DRM device
+ * @max: maximal possible value of alpha property
+ *
+ * This function initializes generic plane's alpha property. It's value is used
+ * for blending operations, depending on selected blending mode. For more
+ * information, see DRM_BLEND_* modes and its documentation. Maximum alpha value
+ * is determined by the driver.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_mode_create_alpha_property(struct drm_device *dev, unsigned int max)
+{
+ struct drm_property *prop;
+
+ prop = drm_property_create_range(dev, 0, "alpha", 0, max);
+ if (!prop)
+ return -ENOMEM;
+
+ dev->mode_config.alpha_property = prop;
+ return 0;
+}
+EXPORT_SYMBOL(drm_mode_create_alpha_property);
+
+/**
+ * drm_mode_create_alpha_premult_property - create muttable zpos property
+ * @dev: DRM device
+ *
+ * This function initializes generic plane's alpha pre-multiplication property.
+ * This property indicates the range of the RGB data of the framebuffer attached
+ * to the given plane. When enabled, RGB values fits the range from 0 to pixel's
+ * alpha value. When disabled, RGB values are from 0 to 255 range and during
+ * blending operations they will be multiplied by the pixel's alpha value first
+ * before computing result of blending equations. Value of this property is used
+ * only when user attaches framebuffer with pixel format, which contains
+ * non-binary alpha channel (for example: DRM_FORMAT_ARGB8888).
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_mode_create_alpha_premult_property(struct drm_device *dev)
+{
+ struct drm_property *prop;
+
+ prop = drm_property_create_bool(dev, 0, "alpha_premult");
+ if (!prop)
+ return -ENOMEM;
+
+ dev->mode_config.alpha_premult_property = prop;
+ return 0;
+}
+EXPORT_SYMBOL(drm_mode_create_alpha_premult_property);
+
static int drm_atomic_state_zpos_cmp(const void *a, const void *b)
{
const struct drm_plane_state *sa = *(struct drm_plane_state **)a;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 702f4f28f580..47ae79483a19 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1276,6 +1276,11 @@ struct drm_plane_state {
unsigned int zpos;
unsigned int normalized_zpos;
+ /* Plane blending */
+ unsigned int blending;
+ unsigned int alpha;
+ bool alpha_premult;
+
struct drm_atomic_state *state;
};
@@ -2098,6 +2103,9 @@ struct drm_mode_config {
struct drm_property *rotation_property;
struct drm_property *zpos_property;
struct drm_property *zpos_immutable_property;
+ struct drm_property *blending_property;
+ struct drm_property *alpha_property;
+ struct drm_property *alpha_premult_property;
struct drm_property *prop_src_x;
struct drm_property *prop_src_y;
struct drm_property *prop_src_w;
@@ -2505,6 +2513,13 @@ extern int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
unsigned int min,
unsigned int max);
+extern int drm_mode_create_blending_property(struct drm_device *dev,
+ unsigned int *supported_blendings,
+ unsigned int supported_blendings_count);
+extern int drm_mode_create_alpha_property(struct drm_device *dev,
+ unsigned int max);
+extern int drm_mode_create_alpha_premult_property(struct drm_device *dev);
+
/* Helpers */
static inline struct drm_plane *drm_plane_find(struct drm_device *dev,
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 50adb46204c2..6da7076a3856 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -596,4 +596,105 @@ struct drm_mode_destroy_blob {
__u32 blob_id;
};
+/**
+ * DOC: Generic plane blending operation
+ *
+ * Planes attached to one CRTC are blended by the hardware to produce the final
+ * result on the display. The order of planes during blending operation is
+ * determined by 'zpos' property. When order of plane for blending operation is
+ * determined, then framebuffers of all planes are placed on the display area
+ * according to the configured position and target size.
+ *
+ * Then one of the selected blending procedure is applied to each pixel on the
+ * display area to compute the final result of the blending. The blending
+ * procedure is similar to the well known glBlendFunc() API.
+ *
+ * The generic equation for blending is:
+ * outputRGB = sF * sRGB + dF * dRGB
+ *
+ * @sRGB: are RGB values of blended plane
+ *
+ * @dRGB: are RGB values of plane's background (result of previous blending or
+ * RGB pixel values of deeper planes).
+ *
+ * @sF and @dF: are one of DRM_FACTOR_* symbolic constants.
+ *
+ * Blending mode then defined as DRM_BLEND(sF, dF), which selects respective
+ * factors for the above equation. For more information, see drm_blend_mode
+ * enum.
+ */
+
+/**
+ * enum drm_blend_factor - factors for defining plane blending formula
+ * @DRM_FACTOR_ZERO: constant zero
+ * @DRM_FACTOR_ONE: constant one
+ * @DRM_FACTOR_SRC_ALPHA: pixel alpha value
+ * @DRM_FACTOR_ONE_MINUS_SRC_ALPHA: 1 - DRM_FACTOR_SRC_ALPHA
+ * @DRM_FACTOR_CONST_ALPHA: constant alpha (plane's property)
+ * @DRM_FACTOR_ONE_MINUS_CONST_ALPHA: 1 - DRM_FACTOR_CONST_ALPHA
+ * @DRM_FACTOR_SRC_CONST_ALPHA: pixel alpha value multiplied by plane's
+ * constant alpha
+ * @DRM_FACTOR_ONE_MINUS_SRC_CONST_ALPHA: 1 - DRM_FACTOR_SRC_CONST_ALPHA
+ *
+ * Values of this enum are used to define plane blending formula. Two factors
+ * have to be selected - one for source plane and one for destination
+ * (background).
+ */
+enum drm_blend_factor {
+ DRM_FACTOR_ZERO,
+ DRM_FACTOR_ONE,
+ DRM_FACTOR_SRC_ALPHA,
+ DRM_FACTOR_ONE_MINUS_SRC_ALPHA,
+ DRM_FACTOR_CONST_ALPHA,
+ DRM_FACTOR_ONE_MINUS_CONST_ALPHA,
+ DRM_FACTOR_SRC_CONST_ALPHA,
+ DRM_FACTOR_ONE_MINUS_SRC_CONST_ALPHA,
+};
+
+#define DRM_BLEND(s, d) ((d << 16) | (s))
+
+/**
+ * enum drm_blend_mode - predefined blending modes
+ * @DRM_BLEND_S_ONE_D_ZERO: no transparency; per-pixel and plane's alpha is
+ * ignored regardless of the selected pixel format.
+ * @DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA: blending with per-pixel alpha;
+ * plane's alpha is ignored, aplies only when pixel format defines alpha
+ * channel, otherwise same as @DRM_BLEND_DISABLED and
+ * @DRM_BLEND_S_ONE_D_ZERO.
+ * @DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA: blending with constant
+ * alpha; per-pixel alpha is ignored regardless of the selected pixel
+ * format.
+ * @DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA: blending with both
+ * per-pixel and plane's alpha; aplies only when pixel format defines alpha
+ * channel, otherwise same as @DRM_BLEND_CONST_ALPHA and
+ * @DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA
+ * @DRM_BLEND_DISABLED: same as @DRM_BLEND_S_ONE_D_ZERO
+ * @DRM_BLEND_PIXEL_ALPHA: same as @DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA,
+ * @DRM_BLEND_CONST_ALPHA: same as
+ * @DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA,
+ * @DRM_BLEND_PIXEL_CONST_ALPHA: same as
+ * @DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA,
+ *
+ * Values of this enum can be set to 'blend' plane's property. The actual
+ * value of each blending mode consists of two drm_blend_factor values
+ * encoded on lower 16 bits for source plane and higher 16 bits for destiantion
+ * (background).
+ */
+enum drm_blend_mode {
+ DRM_BLEND_S_ONE_D_ZERO = DRM_BLEND(DRM_FACTOR_ONE, DRM_FACTOR_ZERO),
+ DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA =
+ DRM_BLEND(DRM_FACTOR_SRC_ALPHA,
+ DRM_FACTOR_ONE_MINUS_SRC_ALPHA),
+ DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA =
+ DRM_BLEND(DRM_FACTOR_CONST_ALPHA,
+ DRM_FACTOR_ONE_MINUS_CONST_ALPHA),
+ DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA =
+ DRM_BLEND(DRM_FACTOR_SRC_CONST_ALPHA,
+ DRM_FACTOR_ONE_MINUS_SRC_CONST_ALPHA),
+ DRM_BLEND_DISABLED = DRM_BLEND_S_ONE_D_ZERO,
+ DRM_BLEND_PIXEL_ALPHA = DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA,
+ DRM_BLEND_CONST_ALPHA = DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA,
+ DRM_BLEND_PIXEL_CONST_ALPHA = DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA,
+};
+
#endif
--
1.9.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v5 4/5] drm: add generic blending related properties
2016-01-27 14:44 ` [PATCH v5 4/5] drm: add generic blending related properties Marek Szyprowski
@ 2016-02-29 15:23 ` Ville Syrjälä
0 siblings, 0 replies; 20+ messages in thread
From: Ville Syrjälä @ 2016-02-29 15:23 UTC (permalink / raw)
To: Marek Szyprowski
Cc: dri-devel, linux-samsung-soc, Inki Dae, Daniel Vetter,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
On Wed, Jan 27, 2016 at 03:44:42PM +0100, Marek Szyprowski wrote:
> This patch adds code and documentation for the following blending
> related properties: 'alpha', 'blending' and 'alpha_premult'.
>
> 'alpha' property defines plane's transparency used for some blending
> modes.
>
> 'alpha_premult' property defines if RGB pixel data in the framebuffer
> contains values pre-multiplied by its alpha value or full range RGB
> values (0-255), which needs to be multiplied by pixel alpha value for
> blending operation.
>
> 'blending' property selects blending mode - by selecting one of the
> predefined values, user can select a pair of factors, which will be
> used in the generic blending equation. For more information, see
> the kerneldoc for the added code.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> Documentation/DocBook/gpu.tmpl | 47 +++++++++++++++++-
> drivers/gpu/drm/drm_atomic.c | 12 +++++
> drivers/gpu/drm/drm_blend.c | 110 +++++++++++++++++++++++++++++++++++++++++
> include/drm/drm_crtc.h | 15 ++++++
> include/uapi/drm/drm_mode.h | 101 +++++++++++++++++++++++++++++++++++++
> 5 files changed, 283 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
> index ae7d913adf60..e5197368e68f 100644
> --- a/Documentation/DocBook/gpu.tmpl
> +++ b/Documentation/DocBook/gpu.tmpl
> @@ -1110,6 +1110,22 @@ int max_width, max_height;</synopsis>
> </sect2>
> </sect1>
>
> + <!-- Internals: plane blending -->
> +
> + <sect1 id="drm-plane-blending">
> + <title>Plane blending</title>
> +
> + <sect2>
> + <title>Plane Blending Overview</title>
> +!Pinclude/uapi/drm/drm_mode.h Generic plane blending operation
> + </sect2>
> + <sect2>
> + <title>Blending Function Reference</title>
> +!Iinclude/uapi/drm/drm_mode.h
> +!Edrivers/gpu/drm/drm_blend.c
> + </sect2>
> + </sect1>
> +
> <!-- Internals: kms initialization and cleanup -->
>
> <sect1 id="drm-kms-init">
> @@ -1816,7 +1832,7 @@ void intel_crt_init(struct drm_device *dev)
> <td valign="top" >Description/Restrictions</td>
> </tr>
> <tr>
> - <td rowspan="38" valign="top" >DRM</td>
> + <td rowspan="41" valign="top" >DRM</td>
> <td valign="top" >Generic</td>
> <td valign="top" >“rotation”</td>
> <td valign="top" >BITMASK</td>
> @@ -2068,7 +2084,7 @@ void intel_crt_init(struct drm_device *dev)
> <td valign="top" >property to suggest an Y offset for a connector</td>
> </tr>
> <tr>
> - <td rowspan="4" valign="top" >Optional</td>
> + <td rowspan="7" valign="top" >Optional</td>
> <td valign="top" >“scaling mode”</td>
> <td valign="top" >ENUM</td>
> <td valign="top" >{ "None", "Full", "Center", "Full aspect" }</td>
> @@ -2102,6 +2118,33 @@ void intel_crt_init(struct drm_device *dev)
> planes' order. Exact value range is driver dependent.</td>
> </tr>
> <tr>
> + <td valign="top" > "alpha" </td>
> + <td valign="top" >RANGE</td>
> + <td valign="top" >Min=0, Max= driver dependent</td>
> + <td valign="top" >Plane</td>
> + <td valign="top" >Plane's alpha value (transparency) for blending operation. Used in some blending modes. </td>
> + </tr>
> + <tr>
> + <td valign="top" > "alpha_premult" </td>
> + <td valign="top" >BOOL</td>
> + <td valign="top" >Min=0, Max=1</td>
> + <td valign="top" >Plane</td>
> + <td valign="top" >Indicates the range of the RGB data of the framebuffer attached to the given plane.
> + When enabled, RGB values fits the range from 0 to pixel's alpha value. When disabled, RGB
> + values are from 0 to 255 range and during blending operations they will be multiplied by
> + the pixel's alpha value first before computing result of blending equations. Value of this
> + property is used in some blending modes and only when user attaches framebuffer with pixel
> + format, which contains non-binary alpha channel.</td>
I have a hard to figure out what that is saying. The fact that it goes
on talking about ranges of the RGB values is IMO just confusing.
I'm pretty sure I've suggested it before, but I would just make this
some kind of 'alpha_premultiply' which when enabled will perform the
premultiplication, and when disabled it won't.
Description could IMO be something as simple as
"Premultiply the source RGB values with the source alpha before blending?"
> + </tr>
> + <tr>
> + <td valign="top" > "blending" </td>
> + <td valign="top" >ENUM</td>
> + <td valign="top" >{ "disabled", "pixel-alpha", "const-alpha" "pixel-const-alpha" }</td>
> + <td valign="top" >Plane</td>
> + <td valign="top" >Selects algorithm used in plane blending operation. For more information, see
> + DRM_BLEND_* symbolic constant documentation. </td>
> + </tr>
> + <tr>
> <td rowspan="20" valign="top" >i915</td>
> <td rowspan="2" valign="top" >Generic</td>
> <td valign="top" >"Broadcast RGB"</td>
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index a19201efb7d1..a85da144fd95 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -632,6 +632,12 @@ int drm_atomic_plane_set_property(struct drm_plane *plane,
> state->rotation = val;
> } else if (property == config->zpos_property) {
> state->zpos = val;
> + } else if (property == config->alpha_property) {
> + state->alpha = val;
> + } else if (property == config->alpha_premult_property) {
> + state->alpha_premult = val;
> + } else if (property == config->blending_property) {
> + state->blending = val;
> } else if (plane->funcs->atomic_set_property) {
> return plane->funcs->atomic_set_property(plane, state,
> property, val);
> @@ -690,6 +696,12 @@ drm_atomic_plane_get_property(struct drm_plane *plane,
> *val = state->rotation;
> } else if (property == config->zpos_property) {
> *val = state->zpos;
> + } else if (property == config->alpha_property) {
> + *val = state->alpha;
> + } else if (property == config->alpha_premult_property) {
> + *val = state->alpha_premult;
> + } else if (property == config->blending_property) {
> + *val = state->blending;
> } else if (plane->funcs->atomic_get_property) {
> return plane->funcs->atomic_get_property(plane, state, property, val);
> } else {
> diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c
> index cdcb647c8ed9..eb7996a848df 100644
> --- a/drivers/gpu/drm/drm_blend.c
> +++ b/drivers/gpu/drm/drm_blend.c
> @@ -99,6 +99,116 @@ int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
> }
> EXPORT_SYMBOL(drm_mode_create_zpos_immutable_property);
>
> +/**
> + * drm_mode_create_blending_property - create generic blending property
> + * @dev: DRM device
> + * @supported_blendings: array of supported blending modes
> + * @supported_blendings_count: size of @supported_blendings array
> + *
> + * This function initializes generic blending property to selected subset
> + * of supported blending modes. Drivers can then attach this property to
> + * planes to let userspace to configure different blending modes. For more
> + * information on blending modes, see DRM_BLEND_* defines.
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_mode_create_blending_property(struct drm_device *dev,
> + unsigned int *supported_blendings,
> + unsigned int supported_blendings_count)
> +{
> + struct drm_property *prop;
> + static const struct drm_prop_enum_list all_values[] = {
> + { DRM_BLEND_DISABLED, "disabled" },
> + { DRM_BLEND_PIXEL_ALPHA, "pixel-alpha" },
> + { DRM_BLEND_CONST_ALPHA, "const-alpha" },
> + { DRM_BLEND_PIXEL_CONST_ALPHA, "pixel-const-alpha" },
> + };
Why do we need these names for the modes? Can't we just use the real
GLesque things? They would at least tell you waht it's going to instead
of having to guess. Also these are clearly missing needed stuff
(eg. src=1.0 dst=1.0-src alpha)
> + struct drm_prop_enum_list *values;
> + int i, j;
> +
> + values = kmalloc(supported_blendings_count * sizeof(*values),
> + GFP_KERNEL);
> + if (!values)
> + return -ENOMEM;
> +
> + for (i = 0; i < supported_blendings_count; i++) {
> + for (j = 0; j < ARRAY_SIZE(all_values); j++) {
> + if (all_values[j].type == supported_blendings[i]) {
> + values[i].type = supported_blendings[i];
> + values[i].name = all_values[j].name;
> + break;
> + }
> + }
> + }
> +
> + prop = drm_property_create_enum(dev, 0, "blending", values,
> + supported_blendings_count);
> + kfree(values);
> +
> + if (!prop)
> + return -ENOMEM;
> +
> + dev->mode_config.blending_property = prop;
> + return 0;
> +}
> +EXPORT_SYMBOL(drm_mode_create_blending_property);
> +
> +/**
> + * drm_mode_create_alpha_property - create plane alpha property
> + * @dev: DRM device
> + * @max: maximal possible value of alpha property
> + *
> + * This function initializes generic plane's alpha property. It's value is used
> + * for blending operations, depending on selected blending mode. For more
> + * information, see DRM_BLEND_* modes and its documentation. Maximum alpha value
> + * is determined by the driver.
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_mode_create_alpha_property(struct drm_device *dev, unsigned int max)
> +{
> + struct drm_property *prop;
> +
> + prop = drm_property_create_range(dev, 0, "alpha", 0, max);
> + if (!prop)
> + return -ENOMEM;
> +
> + dev->mode_config.alpha_property = prop;
> + return 0;
> +}
> +EXPORT_SYMBOL(drm_mode_create_alpha_property);
> +
> +/**
> + * drm_mode_create_alpha_premult_property - create muttable zpos property
> + * @dev: DRM device
> + *
> + * This function initializes generic plane's alpha pre-multiplication property.
> + * This property indicates the range of the RGB data of the framebuffer attached
> + * to the given plane. When enabled, RGB values fits the range from 0 to pixel's
> + * alpha value. When disabled, RGB values are from 0 to 255 range and during
> + * blending operations they will be multiplied by the pixel's alpha value first
> + * before computing result of blending equations. Value of this property is used
> + * only when user attaches framebuffer with pixel format, which contains
> + * non-binary alpha channel (for example: DRM_FORMAT_ARGB8888).
> + *
> + * Returns:
> + * Zero on success, negative errno on failure.
> + */
> +int drm_mode_create_alpha_premult_property(struct drm_device *dev)
> +{
> + struct drm_property *prop;
> +
> + prop = drm_property_create_bool(dev, 0, "alpha_premult");
> + if (!prop)
> + return -ENOMEM;
> +
> + dev->mode_config.alpha_premult_property = prop;
> + return 0;
> +}
> +EXPORT_SYMBOL(drm_mode_create_alpha_premult_property);
> +
> static int drm_atomic_state_zpos_cmp(const void *a, const void *b)
> {
> const struct drm_plane_state *sa = *(struct drm_plane_state **)a;
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 702f4f28f580..47ae79483a19 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -1276,6 +1276,11 @@ struct drm_plane_state {
> unsigned int zpos;
> unsigned int normalized_zpos;
>
> + /* Plane blending */
> + unsigned int blending;
> + unsigned int alpha;
> + bool alpha_premult;
> +
> struct drm_atomic_state *state;
> };
>
> @@ -2098,6 +2103,9 @@ struct drm_mode_config {
> struct drm_property *rotation_property;
> struct drm_property *zpos_property;
> struct drm_property *zpos_immutable_property;
> + struct drm_property *blending_property;
> + struct drm_property *alpha_property;
> + struct drm_property *alpha_premult_property;
> struct drm_property *prop_src_x;
> struct drm_property *prop_src_y;
> struct drm_property *prop_src_w;
> @@ -2505,6 +2513,13 @@ extern int drm_mode_create_zpos_immutable_property(struct drm_device *dev,
> unsigned int min,
> unsigned int max);
>
> +extern int drm_mode_create_blending_property(struct drm_device *dev,
> + unsigned int *supported_blendings,
> + unsigned int supported_blendings_count);
> +extern int drm_mode_create_alpha_property(struct drm_device *dev,
> + unsigned int max);
> +extern int drm_mode_create_alpha_premult_property(struct drm_device *dev);
> +
> /* Helpers */
>
> static inline struct drm_plane *drm_plane_find(struct drm_device *dev,
> diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> index 50adb46204c2..6da7076a3856 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -596,4 +596,105 @@ struct drm_mode_destroy_blob {
> __u32 blob_id;
> };
>
> +/**
> + * DOC: Generic plane blending operation
> + *
> + * Planes attached to one CRTC are blended by the hardware to produce the final
> + * result on the display. The order of planes during blending operation is
> + * determined by 'zpos' property. When order of plane for blending operation is
> + * determined, then framebuffers of all planes are placed on the display area
> + * according to the configured position and target size.
> + *
> + * Then one of the selected blending procedure is applied to each pixel on the
> + * display area to compute the final result of the blending. The blending
> + * procedure is similar to the well known glBlendFunc() API.
> + *
> + * The generic equation for blending is:
> + * outputRGB = sF * sRGB + dF * dRGB
> + *
> + * @sRGB: are RGB values of blended plane
> + *
> + * @dRGB: are RGB values of plane's background (result of previous blending or
> + * RGB pixel values of deeper planes).
> + *
> + * @sF and @dF: are one of DRM_FACTOR_* symbolic constants.
> + *
> + * Blending mode then defined as DRM_BLEND(sF, dF), which selects respective
> + * factors for the above equation. For more information, see drm_blend_mode
> + * enum.
> + */
> +
> +/**
> + * enum drm_blend_factor - factors for defining plane blending formula
> + * @DRM_FACTOR_ZERO: constant zero
> + * @DRM_FACTOR_ONE: constant one
> + * @DRM_FACTOR_SRC_ALPHA: pixel alpha value
> + * @DRM_FACTOR_ONE_MINUS_SRC_ALPHA: 1 - DRM_FACTOR_SRC_ALPHA
> + * @DRM_FACTOR_CONST_ALPHA: constant alpha (plane's property)
> + * @DRM_FACTOR_ONE_MINUS_CONST_ALPHA: 1 - DRM_FACTOR_CONST_ALPHA
> + * @DRM_FACTOR_SRC_CONST_ALPHA: pixel alpha value multiplied by plane's
> + * constant alpha
> + * @DRM_FACTOR_ONE_MINUS_SRC_CONST_ALPHA: 1 - DRM_FACTOR_SRC_CONST_ALPHA
> + *
> + * Values of this enum are used to define plane blending formula. Two factors
> + * have to be selected - one for source plane and one for destination
> + * (background).
> + */
> +enum drm_blend_factor {
> + DRM_FACTOR_ZERO,
> + DRM_FACTOR_ONE,
> + DRM_FACTOR_SRC_ALPHA,
> + DRM_FACTOR_ONE_MINUS_SRC_ALPHA,
> + DRM_FACTOR_CONST_ALPHA,
> + DRM_FACTOR_ONE_MINUS_CONST_ALPHA,
> + DRM_FACTOR_SRC_CONST_ALPHA,
> + DRM_FACTOR_ONE_MINUS_SRC_CONST_ALPHA,
> +};
> +
> +#define DRM_BLEND(s, d) ((d << 16) | (s))
> +
> +/**
> + * enum drm_blend_mode - predefined blending modes
> + * @DRM_BLEND_S_ONE_D_ZERO: no transparency; per-pixel and plane's alpha is
> + * ignored regardless of the selected pixel format.
> + * @DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA: blending with per-pixel alpha;
> + * plane's alpha is ignored, aplies only when pixel format defines alpha
> + * channel, otherwise same as @DRM_BLEND_DISABLED and
> + * @DRM_BLEND_S_ONE_D_ZERO.
> + * @DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA: blending with constant
> + * alpha; per-pixel alpha is ignored regardless of the selected pixel
> + * format.
> + * @DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA: blending with both
> + * per-pixel and plane's alpha; aplies only when pixel format defines alpha
> + * channel, otherwise same as @DRM_BLEND_CONST_ALPHA and
> + * @DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA
> + * @DRM_BLEND_DISABLED: same as @DRM_BLEND_S_ONE_D_ZERO
> + * @DRM_BLEND_PIXEL_ALPHA: same as @DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA,
> + * @DRM_BLEND_CONST_ALPHA: same as
> + * @DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA,
> + * @DRM_BLEND_PIXEL_CONST_ALPHA: same as
> + * @DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA,
> + *
> + * Values of this enum can be set to 'blend' plane's property. The actual
> + * value of each blending mode consists of two drm_blend_factor values
> + * encoded on lower 16 bits for source plane and higher 16 bits for destiantion
> + * (background).
> + */
> +enum drm_blend_mode {
> + DRM_BLEND_S_ONE_D_ZERO = DRM_BLEND(DRM_FACTOR_ONE, DRM_FACTOR_ZERO),
> + DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA =
> + DRM_BLEND(DRM_FACTOR_SRC_ALPHA,
> + DRM_FACTOR_ONE_MINUS_SRC_ALPHA),
> + DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA =
> + DRM_BLEND(DRM_FACTOR_CONST_ALPHA,
> + DRM_FACTOR_ONE_MINUS_CONST_ALPHA),
> + DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA =
> + DRM_BLEND(DRM_FACTOR_SRC_CONST_ALPHA,
> + DRM_FACTOR_ONE_MINUS_SRC_CONST_ALPHA),
> + DRM_BLEND_DISABLED = DRM_BLEND_S_ONE_D_ZERO,
> + DRM_BLEND_PIXEL_ALPHA = DRM_BLEND_S_SRC_ALPHA_D_ONE_MINUS_SRC_ALPHA,
> + DRM_BLEND_CONST_ALPHA = DRM_BLEND_S_CONST_ALPHA_D_ONE_MINUS_CONST_ALPHA,
> + DRM_BLEND_PIXEL_CONST_ALPHA = DRM_BLEND_S_SRC_CONST_ALPHA_D_ONE_MINUS_SRC_CONST_ALPHA,
> +};
> +
> #endif
> --
> 1.9.2
--
Ville Syrjälä
Intel OTC
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v5 5/5] drm/exynos: add support for blending properties
2016-01-27 14:44 [PATCH v5 0/5] drm/exynos: introduce generic zpos and blending properties Marek Szyprowski
` (3 preceding siblings ...)
2016-01-27 14:44 ` [PATCH v5 4/5] drm: add generic blending related properties Marek Szyprowski
@ 2016-01-27 14:44 ` Marek Szyprowski
2016-02-28 23:31 ` Inki Dae
2016-02-23 9:10 ` [PATCH v5 0/5] drm/exynos: introduce generic zpos and " Benjamin Gaignard
5 siblings, 1 reply; 20+ messages in thread
From: Marek Szyprowski @ 2016-01-27 14:44 UTC (permalink / raw)
To: dri-devel, linux-samsung-soc
Cc: Krzysztof Kozlowski, Benjamin Gaignard,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, fabien.dessenne,
Andrzej Hajda, Tobias Jakobi, vincent.abriou, Marek Szyprowski
This patch adds support for blending related properties to Exynos DRM
core and Exynos Mixer CRTC device.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 +++
drivers/gpu/drm/exynos/exynos_drm_plane.c | 60 +++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 816537886e4e..b33d69b8bb38 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -92,6 +92,9 @@ struct exynos_drm_plane {
#define EXYNOS_DRM_PLANE_CAP_DOUBLE (1 << 0)
#define EXYNOS_DRM_PLANE_CAP_SCALE (1 << 1)
#define EXYNOS_DRM_PLANE_CAP_ZPOS (1 << 2)
+#define EXYNOS_DRM_PLANE_CAP_PLANE_ALPHA (1 << 3)
+#define EXYNOS_DRM_PLANE_CAP_PREMULT_ALPHA (1 << 4)
+#define EXYNOS_DRM_PLANE_CAP_BLENDING (1 << 5)
/*
* Exynos DRM plane configuration structure.
@@ -100,6 +103,7 @@ struct exynos_drm_plane {
* @type: type of the plane (primary, cursor or overlay).
* @pixel_formats: supported pixel formats.
* @num_pixel_formats: number of elements in 'pixel_formats'.
+ * @blending_mode: default blending mode.
* @capabilities: supported features (see EXYNOS_DRM_PLANE_CAP_*)
*/
@@ -108,6 +112,7 @@ struct exynos_drm_plane_config {
enum drm_plane_type type;
const uint32_t *pixel_formats;
unsigned int num_pixel_formats;
+ unsigned int blending_mode;
unsigned int capabilities;
};
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 3a486939168e..28502aac135f 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -140,6 +140,9 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
plane->state = &exynos_state->base;
plane->state->plane = plane;
plane->state->zpos = exynos_plane->config->zpos;
+ plane->state->alpha = 255;
+ plane->state->alpha_premult = 1;
+ plane->state->blending = exynos_plane->config->blending_mode;
}
}
@@ -284,6 +287,53 @@ static void exynos_plane_attach_zpos_property(struct drm_plane *plane,
drm_object_attach_property(&plane->base, prop, zpos);
}
+static void exynos_plane_attach_alpha_property(struct drm_plane *plane)
+{
+ struct drm_device *dev = plane->dev;
+
+ if (!dev->mode_config.alpha_property)
+ if (drm_mode_create_alpha_property(dev, 255))
+ return;
+
+ drm_object_attach_property(&plane->base,
+ dev->mode_config.alpha_property, 255);
+}
+
+static void exynos_plane_attach_alpha_premult_property(struct drm_plane *plane)
+{
+ struct drm_device *dev = plane->dev;
+
+ if (!dev->mode_config.alpha_premult_property)
+ if (drm_mode_create_alpha_premult_property(dev)) {
+ printk("failed to create alpha premult property\n");
+ return;
+ }
+
+ drm_object_attach_property(&plane->base,
+ dev->mode_config.alpha_premult_property, 1);
+}
+
+static void exynos_plane_attach_blending_property(struct drm_plane *plane,
+ unsigned int blending_mode)
+{
+ struct drm_device *dev = plane->dev;
+ static unsigned int blending_modes[] = {
+ DRM_BLEND_DISABLED,
+ DRM_BLEND_PIXEL_ALPHA,
+ DRM_BLEND_CONST_ALPHA,
+ DRM_BLEND_PIXEL_CONST_ALPHA,
+ };
+
+ if (!dev->mode_config.blending_property)
+ if (drm_mode_create_blending_property(dev, blending_modes,
+ ARRAY_SIZE(blending_modes)))
+ return;
+
+ drm_object_attach_property(&plane->base,
+ dev->mode_config.blending_property,
+ blending_mode);
+}
+
int exynos_plane_init(struct drm_device *dev,
struct exynos_drm_plane *exynos_plane,
unsigned int index, unsigned long possible_crtcs,
@@ -310,5 +360,15 @@ int exynos_plane_init(struct drm_device *dev,
exynos_plane_attach_zpos_property(&exynos_plane->base, config->zpos,
!(config->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS));
+ if (config->capabilities & EXYNOS_DRM_PLANE_CAP_PLANE_ALPHA)
+ exynos_plane_attach_alpha_property(&exynos_plane->base);
+
+ if (config->capabilities & EXYNOS_DRM_PLANE_CAP_PREMULT_ALPHA)
+ exynos_plane_attach_alpha_premult_property(&exynos_plane->base);
+
+ if (config->capabilities & EXYNOS_DRM_PLANE_CAP_BLENDING)
+ exynos_plane_attach_blending_property(&exynos_plane->base,
+ config->blending_mode);
+
return 0;
}
--
1.9.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH v5 5/5] drm/exynos: add support for blending properties
2016-01-27 14:44 ` [PATCH v5 5/5] drm/exynos: add support for blending properties Marek Szyprowski
@ 2016-02-28 23:31 ` Inki Dae
0 siblings, 0 replies; 20+ messages in thread
From: Inki Dae @ 2016-02-28 23:31 UTC (permalink / raw)
To: Marek Szyprowski, dri-devel, linux-samsung-soc
Cc: Daniel Vetter, Ville Syrjälä,
Joonyoung Shim, Seung-Woo Kim, Andrzej Hajda,
Krzysztof Kozlowski, Bartlomiej Zolnierkiewicz, Tobias Jakobi,
Gustavo Padovan, Benjamin Gaignard, vincent.abriou,
fabien.dessenne
2016년 01월 27일 23:44에 Marek Szyprowski 이(가) 쓴 글:
> This patch adds support for blending related properties to Exynos DRM
> core and Exynos Mixer CRTC device.
To drm-misc.
Acked-by : Inki Dae <inki.dae@samsung.com>
Thanks,
Inki Dae
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 +++
> drivers/gpu/drm/exynos/exynos_drm_plane.c | 60 +++++++++++++++++++++++++++++++
> 2 files changed, 65 insertions(+)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> index 816537886e4e..b33d69b8bb38 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
> @@ -92,6 +92,9 @@ struct exynos_drm_plane {
> #define EXYNOS_DRM_PLANE_CAP_DOUBLE (1 << 0)
> #define EXYNOS_DRM_PLANE_CAP_SCALE (1 << 1)
> #define EXYNOS_DRM_PLANE_CAP_ZPOS (1 << 2)
> +#define EXYNOS_DRM_PLANE_CAP_PLANE_ALPHA (1 << 3)
> +#define EXYNOS_DRM_PLANE_CAP_PREMULT_ALPHA (1 << 4)
> +#define EXYNOS_DRM_PLANE_CAP_BLENDING (1 << 5)
>
> /*
> * Exynos DRM plane configuration structure.
> @@ -100,6 +103,7 @@ struct exynos_drm_plane {
> * @type: type of the plane (primary, cursor or overlay).
> * @pixel_formats: supported pixel formats.
> * @num_pixel_formats: number of elements in 'pixel_formats'.
> + * @blending_mode: default blending mode.
> * @capabilities: supported features (see EXYNOS_DRM_PLANE_CAP_*)
> */
>
> @@ -108,6 +112,7 @@ struct exynos_drm_plane_config {
> enum drm_plane_type type;
> const uint32_t *pixel_formats;
> unsigned int num_pixel_formats;
> + unsigned int blending_mode;
> unsigned int capabilities;
> };
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> index 3a486939168e..28502aac135f 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -140,6 +140,9 @@ static void exynos_drm_plane_reset(struct drm_plane *plane)
> plane->state = &exynos_state->base;
> plane->state->plane = plane;
> plane->state->zpos = exynos_plane->config->zpos;
> + plane->state->alpha = 255;
> + plane->state->alpha_premult = 1;
> + plane->state->blending = exynos_plane->config->blending_mode;
> }
> }
>
> @@ -284,6 +287,53 @@ static void exynos_plane_attach_zpos_property(struct drm_plane *plane,
> drm_object_attach_property(&plane->base, prop, zpos);
> }
>
> +static void exynos_plane_attach_alpha_property(struct drm_plane *plane)
> +{
> + struct drm_device *dev = plane->dev;
> +
> + if (!dev->mode_config.alpha_property)
> + if (drm_mode_create_alpha_property(dev, 255))
> + return;
> +
> + drm_object_attach_property(&plane->base,
> + dev->mode_config.alpha_property, 255);
> +}
> +
> +static void exynos_plane_attach_alpha_premult_property(struct drm_plane *plane)
> +{
> + struct drm_device *dev = plane->dev;
> +
> + if (!dev->mode_config.alpha_premult_property)
> + if (drm_mode_create_alpha_premult_property(dev)) {
> + printk("failed to create alpha premult property\n");
> + return;
> + }
> +
> + drm_object_attach_property(&plane->base,
> + dev->mode_config.alpha_premult_property, 1);
> +}
> +
> +static void exynos_plane_attach_blending_property(struct drm_plane *plane,
> + unsigned int blending_mode)
> +{
> + struct drm_device *dev = plane->dev;
> + static unsigned int blending_modes[] = {
> + DRM_BLEND_DISABLED,
> + DRM_BLEND_PIXEL_ALPHA,
> + DRM_BLEND_CONST_ALPHA,
> + DRM_BLEND_PIXEL_CONST_ALPHA,
> + };
> +
> + if (!dev->mode_config.blending_property)
> + if (drm_mode_create_blending_property(dev, blending_modes,
> + ARRAY_SIZE(blending_modes)))
> + return;
> +
> + drm_object_attach_property(&plane->base,
> + dev->mode_config.blending_property,
> + blending_mode);
> +}
> +
> int exynos_plane_init(struct drm_device *dev,
> struct exynos_drm_plane *exynos_plane,
> unsigned int index, unsigned long possible_crtcs,
> @@ -310,5 +360,15 @@ int exynos_plane_init(struct drm_device *dev,
> exynos_plane_attach_zpos_property(&exynos_plane->base, config->zpos,
> !(config->capabilities & EXYNOS_DRM_PLANE_CAP_ZPOS));
>
> + if (config->capabilities & EXYNOS_DRM_PLANE_CAP_PLANE_ALPHA)
> + exynos_plane_attach_alpha_property(&exynos_plane->base);
> +
> + if (config->capabilities & EXYNOS_DRM_PLANE_CAP_PREMULT_ALPHA)
> + exynos_plane_attach_alpha_premult_property(&exynos_plane->base);
> +
> + if (config->capabilities & EXYNOS_DRM_PLANE_CAP_BLENDING)
> + exynos_plane_attach_blending_property(&exynos_plane->base,
> + config->blending_mode);
> +
> return 0;
> }
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v5 0/5] drm/exynos: introduce generic zpos and blending properties
2016-01-27 14:44 [PATCH v5 0/5] drm/exynos: introduce generic zpos and blending properties Marek Szyprowski
` (4 preceding siblings ...)
2016-01-27 14:44 ` [PATCH v5 5/5] drm/exynos: add support for blending properties Marek Szyprowski
@ 2016-02-23 9:10 ` Benjamin Gaignard
5 siblings, 0 replies; 20+ messages in thread
From: Benjamin Gaignard @ 2016-02-23 9:10 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Krzysztof Kozlowski, linux-samsung-soc,
Bartlomiej Zolnierkiewicz, Seung-Woo Kim, dri-devel,
Andrzej Hajda, Tobias Jakobi, Fabien Dessenne, Vincent Abriou
[-- Attachment #1.1: Type: text/plain, Size: 4456 bytes --]
Hi,
Any news on those patches ?
Could we rely on them to upstream z-order fix on sti driver ?
Regards,
Benjamin
2016-01-27 15:44 GMT+01:00 Marek Szyprowski <m.szyprowski@samsung.com>:
> Hello all,
>
> This patch series is a continuation of rework of blending support in
> Exynos DRM driver. Some background can be found here:
> http://www.spinics.net/lists/dri-devel/msg96969.html
>
> Daniel Vetter suggested that zpos property should be made generic, with
> well-defined semantics. This patchset is my proposal for such generic
> zpos property:
> - added zpos properties to drm core and plane state structures,
> - added helpers for normalizing zpos properties of given set of planes,
> - well defined semantics: planes are sorted by zpos values and then plane
> id value if zpos equals.
>
> The next part is a result of my survey on introducing generic plane
> blending related properties:
> http://www.spinics.net/lists/dri-devel/msg98106.html
>
> Ville Syrjälä suggested that blending mode should be defined by a pair
> of 2 factors, which define generic blending equation. I've implemented
> this approach. I hope that this code can be a base for further discussion
> on generic blending support. For more information, see patch 4/5.
>
> Patches are based on top of v4.5-rc1 release.
>
> Best regards
> Marek Szyprowski
> Samsung R&D Institute Poland
>
> Changelog:
>
> v5:
> - added patch with new generic blending and alpha properties
> - changed patchseries topic to "drm/exynos: introduce generic zpos and
> blending properties"
> - moved all generic code to separate drm_blend.c file
>
> v4: http://www.spinics.net/lists/dri-devel/msg98654.html
> - made min/max values of zpos property driver dependent (request of
> Ville Syrjälä)
> - adjusted some comments
>
> v3: http://www.spinics.net/lists/dri-devel/msg98207.html
> - on request of Daniel Vetter, moved all normalization process to DRM
> core, drivers can simply use plane_state->normalized_zpos in their
> atomic_check/update callbacks with no additional changes needed
> - updated documentation
>
> v2: http://www.spinics.net/lists/dri-devel/msg98093.html
> - dropped 2 fixes for Exynos DRM, which got merged in meantime
> - added more comments and kernel docs for core functions as suggested
> by Daniel Vetter
> - reworked initialization of zpos properties (moved assiging property
> class to common code), now the code in the driver is even simpler
> - while reworking of intialization of zpos property code, did the same
> change to generic rotation property
>
> v1: http://www.spinics.net/lists/dri-devel/msg97709.html
> - initial version
>
> Patch summary:
>
> Marek Szyprowski (5):
> drm: add generic zpos property
> drm/exynos: use generic code for managing zpos plane property
> drm: simplify initialization of rotation property
> drm: add generic blending related properties
> drm/exynos: add support for blending properties
>
> Documentation/DocBook/gpu.tmpl | 57 +++-
> drivers/gpu/drm/Makefile | 2 +-
> drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 +-
> drivers/gpu/drm/drm_atomic.c | 16 ++
> drivers/gpu/drm/drm_atomic_helper.c | 6 +
> drivers/gpu/drm/drm_blend.c | 337
> ++++++++++++++++++++++++
> drivers/gpu/drm/drm_crtc.c | 29 +-
> drivers/gpu/drm/drm_crtc_internal.h | 3 +
> drivers/gpu/drm/exynos/exynos_drm_drv.h | 7 +-
> drivers/gpu/drm/exynos/exynos_drm_plane.c | 128 +++++----
> drivers/gpu/drm/exynos/exynos_mixer.c | 6 +-
> drivers/gpu/drm/i915/intel_display.c | 6 +-
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +-
> drivers/gpu/drm/omapdrm/omap_drv.c | 3 +-
> include/drm/drm_crtc.h | 36 ++-
> include/uapi/drm/drm_mode.h | 101 +++++++
> 16 files changed, 669 insertions(+), 81 deletions(-)
> create mode 100644 drivers/gpu/drm/drm_blend.c
>
> --
> 1.9.2
>
>
--
Benjamin Gaignard
Graphic Working Group
Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
Follow *Linaro: *Facebook <http://www.facebook.com/pages/Linaro> | Twitter
<http://twitter.com/#!/linaroorg> | Blog
<http://www.linaro.org/linaro-blog/>
[-- Attachment #1.2: Type: text/html, Size: 7183 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread