From mboxrd@z Thu Jan 1 00:00:00 1970 From: boris.brezillon@free-electrons.com (Boris Brezillon) Date: Tue, 9 Jan 2018 13:31:36 +0100 Subject: [PATCH 06/19] drm/blend: Add a generic alpha property In-Reply-To: <5c765fc730d75cb362dc37bcdb3b3aeacc7bdb30.1515494838.git-series.maxime.ripard@free-electrons.com> References: <5c765fc730d75cb362dc37bcdb3b3aeacc7bdb30.1515494838.git-series.maxime.ripard@free-electrons.com> Message-ID: <20180109133136.1dae4259@bbrezillon> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, 9 Jan 2018 11:56:25 +0100 Maxime Ripard wrote: > Some drivers duplicate the logic to create a property to store a per-plane > alpha. > > Let's create a helper in order to move that to the core. > > Cc: Boris Brezillon Reviewed-by: Boris Brezillon > Cc: Laurent Pinchart > Signed-off-by: Maxime Ripard > --- > Documentation/gpu/kms-properties.csv | 2 +- > drivers/gpu/drm/drm_atomic.c | 4 ++++- > drivers/gpu/drm/drm_atomic_helper.c | 1 +- > drivers/gpu/drm/drm_blend.c | 32 +++++++++++++++++++++++++++++- > include/drm/drm_blend.h | 1 +- > include/drm/drm_plane.h | 6 +++++- > 6 files changed, 45 insertions(+), 1 deletion(-) > > diff --git a/Documentation/gpu/kms-properties.csv b/Documentation/gpu/kms-properties.csv > index 927b65e14219..a3c3969c1992 100644 > --- a/Documentation/gpu/kms-properties.csv > +++ b/Documentation/gpu/kms-properties.csv > @@ -99,5 +99,5 @@ radeon,DVI-I,?coherent?,RANGE,"Min=0, Max=1",Connector,TBD > ,,"""underscan vborder""",RANGE,"Min=0, Max=128",Connector,TBD > ,Audio,?audio?,ENUM,"{ ""off"", ""on"", ""auto"" }",Connector,TBD > ,FMT Dithering,?dither?,ENUM,"{ ""off"", ""on"" }",Connector,TBD > -rcar-du,Generic,"""alpha""",RANGE,"Min=0, Max=255",Plane,TBD > +,,"""alpha""",RANGE,"Min=0, Max=255",Plane,Opacity of the plane from transparent (0) to opaque (255) > ,,"""colorkey""",RANGE,"Min=0, Max=0x01ffffff",Plane,TBD > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index c2da5585e201..ade18cf62c89 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -749,6 +749,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, > state->src_w = val; > } else if (property == config->prop_src_h) { > state->src_h = val; > + } else if (property == plane->alpha_property) { > + state->alpha = val; > } else if (property == plane->rotation_property) { > if (!is_power_of_2(val & DRM_MODE_ROTATE_MASK)) > return -EINVAL; > @@ -810,6 +812,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane, > *val = state->src_w; > } else if (property == config->prop_src_h) { > *val = state->src_h; > + } else if (property == plane->alpha_property) { > + *val = state->alpha; > } else if (property == plane->rotation_property) { > *val = state->rotation; > } else if (property == plane->zpos_property) { > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 71d712f1b56a..018993df4c18 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -3372,6 +3372,7 @@ void drm_atomic_helper_plane_reset(struct drm_plane *plane) > > if (plane->state) { > plane->state->plane = plane; > + plane->state->alpha = 255; > plane->state->rotation = DRM_MODE_ROTATE_0; > } > } > diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c > index 2e5e089dd912..8eea2a8af458 100644 > --- a/drivers/gpu/drm/drm_blend.c > +++ b/drivers/gpu/drm/drm_blend.c > @@ -104,6 +104,38 @@ > */ > > /** > + * drm_plane_create_alpha_property - create a new alpha property > + * @plane: drm plane > + * @alpha: initial value of alpha, from 0 (transparent) to 255 (opaque) > + * > + * This function initializes a generic, mutable, alpha property and > + * enables support for it in the DRM core. > + * > + * Drivers can then attach this property to their plane to enable > + * support for configurable plane alpha. > + * > + * Returns: > + * 0 on success, negative error code on failure. > + */ > +int drm_plane_create_alpha_property(struct drm_plane *plane, u8 alpha) > +{ > + struct drm_property *prop; > + > + prop = drm_property_create_range(plane->dev, 0, "alpha", 0, 255); > + if (!prop) > + return -ENOMEM; > + > + drm_object_attach_property(&plane->base, prop, alpha); > + plane->alpha_property = prop; > + > + if (plane->state) > + plane->state->alpha = alpha; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_plane_create_alpha_property); > + > +/** > * drm_plane_create_rotation_property - create a new rotation property > * @plane: drm plane > * @rotation: initial value of the rotation property > diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h > index 17606026590b..5979a8fce453 100644 > --- a/include/drm/drm_blend.h > +++ b/include/drm/drm_blend.h > @@ -36,6 +36,7 @@ static inline bool drm_rotation_90_or_270(unsigned int rotation) > return rotation & (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270); > } > > +int drm_plane_create_alpha_property(struct drm_plane *plane, u8 alpha); > int drm_plane_create_rotation_property(struct drm_plane *plane, > unsigned int rotation, > unsigned int supported_rotations); > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > index 571615079230..a5e26064b132 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -42,6 +42,7 @@ struct drm_modeset_acquire_ctx; > * 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) > + * @alpha: opacity of the plane > * @rotation: rotation of the plane > * @zpos: priority of the given plane on crtc (optional) > * Note that multiple active planes on the same crtc can have an identical > @@ -105,6 +106,9 @@ struct drm_plane_state { > uint32_t src_x, src_y; > uint32_t src_h, src_w; > > + /* Plane opacity */ > + u8 alpha; > + > /* Plane rotation */ > unsigned int rotation; > > @@ -481,6 +485,7 @@ enum drm_plane_type { > * @funcs: helper functions > * @properties: property tracking for this plane > * @type: type of plane (overlay, primary, cursor) > + * @alpha_property: alpha property for this plane > * @zpos_property: zpos property for this plane > * @rotation_property: rotation property for this plane > * @helper_private: mid-layer private data > @@ -546,6 +551,7 @@ struct drm_plane { > */ > struct drm_plane_state *state; > > + struct drm_property *alpha_property; > struct drm_property *zpos_property; > struct drm_property *rotation_property; > }; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH 06/19] drm/blend: Add a generic alpha property Date: Tue, 9 Jan 2018 13:31:36 +0100 Message-ID: <20180109133136.1dae4259@bbrezillon> References: <5c765fc730d75cb362dc37bcdb3b3aeacc7bdb30.1515494838.git-series.maxime.ripard@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BF6F89C8D for ; Tue, 9 Jan 2018 12:31:48 +0000 (UTC) In-Reply-To: <5c765fc730d75cb362dc37bcdb3b3aeacc7bdb30.1515494838.git-series.maxime.ripard@free-electrons.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maxime Ripard Cc: Thomas Petazzoni , Laurent Pinchart , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Chen-Yu Tsai , Daniel Vetter , linux-arm-kernel@lists.infradead.org, thomas@vitsch.nl List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAgOSBKYW4gMjAxOCAxMTo1NjoyNSArMDEwMApNYXhpbWUgUmlwYXJkIDxtYXhpbWUu cmlwYXJkQGZyZWUtZWxlY3Ryb25zLmNvbT4gd3JvdGU6Cgo+IFNvbWUgZHJpdmVycyBkdXBsaWNh dGUgdGhlIGxvZ2ljIHRvIGNyZWF0ZSBhIHByb3BlcnR5IHRvIHN0b3JlIGEgcGVyLXBsYW5lCj4g YWxwaGEuCj4gCj4gTGV0J3MgY3JlYXRlIGEgaGVscGVyIGluIG9yZGVyIHRvIG1vdmUgdGhhdCB0 byB0aGUgY29yZS4KPiAKPiBDYzogQm9yaXMgQnJlemlsbG9uIDxib3Jpcy5icmV6aWxsb25AZnJl ZS1lbGVjdHJvbnMuY29tPgoKUmV2aWV3ZWQtYnk6IEJvcmlzIEJyZXppbGxvbiA8Ym9yaXMuYnJl emlsbG9uQGZyZWUtZWxlY3Ryb25zLmNvbT4KCj4gQ2M6IExhdXJlbnQgUGluY2hhcnQgPGxhdXJl bnQucGluY2hhcnRAaWRlYXNvbmJvYXJkLmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBNYXhpbWUgUmlw YXJkIDxtYXhpbWUucmlwYXJkQGZyZWUtZWxlY3Ryb25zLmNvbT4KPiAtLS0KPiAgRG9jdW1lbnRh dGlvbi9ncHUva21zLXByb3BlcnRpZXMuY3N2IHwgIDIgKy0KPiAgZHJpdmVycy9ncHUvZHJtL2Ry bV9hdG9taWMuYyAgICAgICAgIHwgIDQgKysrKy0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMgIHwgIDEgKy0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jICAgICAg ICAgIHwgMzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCj4gIGluY2x1ZGUvZHJtL2Ry bV9ibGVuZC5oICAgICAgICAgICAgICB8ICAxICstCj4gIGluY2x1ZGUvZHJtL2RybV9wbGFuZS5o ICAgICAgICAgICAgICB8ICA2ICsrKysrLQo+ICA2IGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlv bnMoKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9ncHUv a21zLXByb3BlcnRpZXMuY3N2IGIvRG9jdW1lbnRhdGlvbi9ncHUva21zLXByb3BlcnRpZXMuY3N2 Cj4gaW5kZXggOTI3YjY1ZTE0MjE5Li5hM2MzOTY5YzE5OTIgMTAwNjQ0Cj4gLS0tIGEvRG9jdW1l bnRhdGlvbi9ncHUva21zLXByb3BlcnRpZXMuY3N2Cj4gKysrIGIvRG9jdW1lbnRhdGlvbi9ncHUv a21zLXByb3BlcnRpZXMuY3N2Cj4gQEAgLTk5LDUgKzk5LDUgQEAgcmFkZW9uLERWSS1JLOKAnGNv aGVyZW504oCdLFJBTkdFLCJNaW49MCwgTWF4PTEiLENvbm5lY3RvcixUQkQKPiAgLCwiIiJ1bmRl cnNjYW4gdmJvcmRlciIiIixSQU5HRSwiTWluPTAsIE1heD0xMjgiLENvbm5lY3RvcixUQkQKPiAg LEF1ZGlvLOKAnGF1ZGlv4oCdLEVOVU0sInsgIiJvZmYiIiwgIiJvbiIiLCAiImF1dG8iIiB9IixD b25uZWN0b3IsVEJECj4gICxGTVQgRGl0aGVyaW5nLOKAnGRpdGhlcuKAnSxFTlVNLCJ7ICIib2Zm IiIsICIib24iIiB9IixDb25uZWN0b3IsVEJECj4gLXJjYXItZHUsR2VuZXJpYywiIiJhbHBoYSIi IixSQU5HRSwiTWluPTAsIE1heD0yNTUiLFBsYW5lLFRCRAo+ICssLCIiImFscGhhIiIiLFJBTkdF LCJNaW49MCwgTWF4PTI1NSIsUGxhbmUsT3BhY2l0eSBvZiB0aGUgcGxhbmUgZnJvbSB0cmFuc3Bh cmVudCAoMCkgdG8gb3BhcXVlICgyNTUpCj4gICwsIiIiY29sb3JrZXkiIiIsUkFOR0UsIk1pbj0w LCBNYXg9MHgwMWZmZmZmZiIsUGxhbmUsVEJECj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCj4gaW5kZXggYzJk YTU1ODVlMjAxLi5hZGUxOGNmNjJjODkgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9hdG9taWMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiBAQCAtNzQ5 LDYgKzc0OSw4IEBAIHN0YXRpYyBpbnQgZHJtX2F0b21pY19wbGFuZV9zZXRfcHJvcGVydHkoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gIAkJc3RhdGUtPnNyY193ID0gdmFsOwo+ICAJfSBlbHNl IGlmIChwcm9wZXJ0eSA9PSBjb25maWctPnByb3Bfc3JjX2gpIHsKPiAgCQlzdGF0ZS0+c3JjX2gg PSB2YWw7Cj4gKwl9IGVsc2UgaWYgKHByb3BlcnR5ID09IHBsYW5lLT5hbHBoYV9wcm9wZXJ0eSkg ewo+ICsJCXN0YXRlLT5hbHBoYSA9IHZhbDsKPiAgCX0gZWxzZSBpZiAocHJvcGVydHkgPT0gcGxh bmUtPnJvdGF0aW9uX3Byb3BlcnR5KSB7Cj4gIAkJaWYgKCFpc19wb3dlcl9vZl8yKHZhbCAmIERS TV9NT0RFX1JPVEFURV9NQVNLKSkKPiAgCQkJcmV0dXJuIC1FSU5WQUw7Cj4gQEAgLTgxMCw2ICs4 MTIsOCBAQCBkcm1fYXRvbWljX3BsYW5lX2dldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKPiAgCQkqdmFsID0gc3RhdGUtPnNyY193Owo+ICAJfSBlbHNlIGlmIChwcm9wZXJ0eSA9 PSBjb25maWctPnByb3Bfc3JjX2gpIHsKPiAgCQkqdmFsID0gc3RhdGUtPnNyY19oOwo+ICsJfSBl bHNlIGlmIChwcm9wZXJ0eSA9PSBwbGFuZS0+YWxwaGFfcHJvcGVydHkpIHsKPiArCQkqdmFsID0g c3RhdGUtPmFscGhhOwo+ICAJfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBwbGFuZS0+cm90YXRpb25f cHJvcGVydHkpIHsKPiAgCQkqdmFsID0gc3RhdGUtPnJvdGF0aW9uOwo+ICAJfSBlbHNlIGlmIChw cm9wZXJ0eSA9PSBwbGFuZS0+enBvc19wcm9wZXJ0eSkgewo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj X2hlbHBlci5jCj4gaW5kZXggNzFkNzEyZjFiNTZhLi4wMTg5OTNkZjRjMTggMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+IEBAIC0zMzcyLDYgKzMzNzIsNyBAQCB2b2lkIGRy bV9hdG9taWNfaGVscGVyX3BsYW5lX3Jlc2V0KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQo+ICAK PiAgCWlmIChwbGFuZS0+c3RhdGUpIHsKPiAgCQlwbGFuZS0+c3RhdGUtPnBsYW5lID0gcGxhbmU7 Cj4gKwkJcGxhbmUtPnN0YXRlLT5hbHBoYSA9IDI1NTsKPiAgCQlwbGFuZS0+c3RhdGUtPnJvdGF0 aW9uID0gRFJNX01PREVfUk9UQVRFXzA7Cj4gIAl9Cj4gIH0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2RybV9ibGVuZC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jCj4gaW5k ZXggMmU1ZTA4OWRkOTEyLi44ZWVhMmE4YWY0NTggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2RybV9ibGVuZC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jCj4gQEAg LTEwNCw2ICsxMDQsMzggQEAKPiAgICovCj4gIAo+ICAvKioKPiArICogZHJtX3BsYW5lX2NyZWF0 ZV9hbHBoYV9wcm9wZXJ0eSAtIGNyZWF0ZSBhIG5ldyBhbHBoYSBwcm9wZXJ0eQo+ICsgKiBAcGxh bmU6IGRybSBwbGFuZQo+ICsgKiBAYWxwaGE6IGluaXRpYWwgdmFsdWUgb2YgYWxwaGEsIGZyb20g MCAodHJhbnNwYXJlbnQpIHRvIDI1NSAob3BhcXVlKQo+ICsgKgo+ICsgKiBUaGlzIGZ1bmN0aW9u IGluaXRpYWxpemVzIGEgZ2VuZXJpYywgbXV0YWJsZSwgYWxwaGEgcHJvcGVydHkgYW5kCj4gKyAq IGVuYWJsZXMgc3VwcG9ydCBmb3IgaXQgaW4gdGhlIERSTSBjb3JlLgo+ICsgKgo+ICsgKiBEcml2 ZXJzIGNhbiB0aGVuIGF0dGFjaCB0aGlzIHByb3BlcnR5IHRvIHRoZWlyIHBsYW5lIHRvIGVuYWJs ZQo+ICsgKiBzdXBwb3J0IGZvciBjb25maWd1cmFibGUgcGxhbmUgYWxwaGEuCj4gKyAqCj4gKyAq IFJldHVybnM6Cj4gKyAqIDAgb24gc3VjY2VzcywgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBmYWls dXJlLgo+ICsgKi8KPiAraW50IGRybV9wbGFuZV9jcmVhdGVfYWxwaGFfcHJvcGVydHkoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsIHU4IGFscGhhKQo+ICt7Cj4gKwlzdHJ1Y3QgZHJtX3Byb3BlcnR5 ICpwcm9wOwo+ICsKPiArCXByb3AgPSBkcm1fcHJvcGVydHlfY3JlYXRlX3JhbmdlKHBsYW5lLT5k ZXYsIDAsICJhbHBoYSIsIDAsIDI1NSk7Cj4gKwlpZiAoIXByb3ApCj4gKwkJcmV0dXJuIC1FTk9N RU07Cj4gKwo+ICsJZHJtX29iamVjdF9hdHRhY2hfcHJvcGVydHkoJnBsYW5lLT5iYXNlLCBwcm9w LCBhbHBoYSk7Cj4gKwlwbGFuZS0+YWxwaGFfcHJvcGVydHkgPSBwcm9wOwo+ICsKPiArCWlmIChw bGFuZS0+c3RhdGUpCj4gKwkJcGxhbmUtPnN0YXRlLT5hbHBoYSA9IGFscGhhOwo+ICsKPiArCXJl dHVybiAwOwo+ICt9Cj4gK0VYUE9SVF9TWU1CT0woZHJtX3BsYW5lX2NyZWF0ZV9hbHBoYV9wcm9w ZXJ0eSk7Cj4gKwo+ICsvKioKPiAgICogZHJtX3BsYW5lX2NyZWF0ZV9yb3RhdGlvbl9wcm9wZXJ0 eSAtIGNyZWF0ZSBhIG5ldyByb3RhdGlvbiBwcm9wZXJ0eQo+ICAgKiBAcGxhbmU6IGRybSBwbGFu ZQo+ICAgKiBAcm90YXRpb246IGluaXRpYWwgdmFsdWUgb2YgdGhlIHJvdGF0aW9uIHByb3BlcnR5 Cj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9ibGVuZC5oIGIvaW5jbHVkZS9kcm0vZHJt X2JsZW5kLmgKPiBpbmRleCAxNzYwNjAyNjU5MGIuLjU5NzlhOGZjZTQ1MyAxMDA2NDQKPiAtLS0g YS9pbmNsdWRlL2RybS9kcm1fYmxlbmQuaAo+ICsrKyBiL2luY2x1ZGUvZHJtL2RybV9ibGVuZC5o Cj4gQEAgLTM2LDYgKzM2LDcgQEAgc3RhdGljIGlubGluZSBib29sIGRybV9yb3RhdGlvbl85MF9v cl8yNzAodW5zaWduZWQgaW50IHJvdGF0aW9uKQo+ICAJcmV0dXJuIHJvdGF0aW9uICYgKERSTV9N T0RFX1JPVEFURV85MCB8IERSTV9NT0RFX1JPVEFURV8yNzApOwo+ICB9Cj4gIAo+ICtpbnQgZHJt X3BsYW5lX2NyZWF0ZV9hbHBoYV9wcm9wZXJ0eShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgdTgg YWxwaGEpOwo+ICBpbnQgZHJtX3BsYW5lX2NyZWF0ZV9yb3RhdGlvbl9wcm9wZXJ0eShzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSwKPiAgCQkJCSAgICAgICB1bnNpZ25lZCBpbnQgcm90YXRpb24sCj4g IAkJCQkgICAgICAgdW5zaWduZWQgaW50IHN1cHBvcnRlZF9yb3RhdGlvbnMpOwo+IGRpZmYgLS1n aXQgYS9pbmNsdWRlL2RybS9kcm1fcGxhbmUuaCBiL2luY2x1ZGUvZHJtL2RybV9wbGFuZS5oCj4g aW5kZXggNTcxNjE1MDc5MjMwLi5hNWUyNjA2NGIxMzIgMTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9k cm0vZHJtX3BsYW5lLmgKPiArKysgYi9pbmNsdWRlL2RybS9kcm1fcGxhbmUuaAo+IEBAIC00Miw2 ICs0Miw3IEBAIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eDsKPiAgICoJcGxhbmUgKGlu IDE2LjE2KQo+ICAgKiBAc3JjX3c6IHdpZHRoIG9mIHZpc2libGUgcG9ydGlvbiBvZiBwbGFuZSAo aW4gMTYuMTYpCj4gICAqIEBzcmNfaDogaGVpZ2h0IG9mIHZpc2libGUgcG9ydGlvbiBvZiBwbGFu ZSAoaW4gMTYuMTYpCj4gKyAqIEBhbHBoYTogb3BhY2l0eSBvZiB0aGUgcGxhbmUKPiAgICogQHJv dGF0aW9uOiByb3RhdGlvbiBvZiB0aGUgcGxhbmUKPiAgICogQHpwb3M6IHByaW9yaXR5IG9mIHRo ZSBnaXZlbiBwbGFuZSBvbiBjcnRjIChvcHRpb25hbCkKPiAgICoJTm90ZSB0aGF0IG11bHRpcGxl IGFjdGl2ZSBwbGFuZXMgb24gdGhlIHNhbWUgY3J0YyBjYW4gaGF2ZSBhbiBpZGVudGljYWwKPiBA QCAtMTA1LDYgKzEwNiw5IEBAIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgewo+ICAJdWludDMyX3Qg c3JjX3gsIHNyY195Owo+ICAJdWludDMyX3Qgc3JjX2gsIHNyY193Owo+ICAKPiArCS8qIFBsYW5l IG9wYWNpdHkgKi8KPiArCXU4IGFscGhhOwo+ICsKPiAgCS8qIFBsYW5lIHJvdGF0aW9uICovCj4g IAl1bnNpZ25lZCBpbnQgcm90YXRpb247Cj4gIAo+IEBAIC00ODEsNiArNDg1LDcgQEAgZW51bSBk cm1fcGxhbmVfdHlwZSB7Cj4gICAqIEBmdW5jczogaGVscGVyIGZ1bmN0aW9ucwo+ICAgKiBAcHJv cGVydGllczogcHJvcGVydHkgdHJhY2tpbmcgZm9yIHRoaXMgcGxhbmUKPiAgICogQHR5cGU6IHR5 cGUgb2YgcGxhbmUgKG92ZXJsYXksIHByaW1hcnksIGN1cnNvcikKPiArICogQGFscGhhX3Byb3Bl cnR5OiBhbHBoYSBwcm9wZXJ0eSBmb3IgdGhpcyBwbGFuZQo+ICAgKiBAenBvc19wcm9wZXJ0eTog enBvcyBwcm9wZXJ0eSBmb3IgdGhpcyBwbGFuZQo+ICAgKiBAcm90YXRpb25fcHJvcGVydHk6IHJv dGF0aW9uIHByb3BlcnR5IGZvciB0aGlzIHBsYW5lCj4gICAqIEBoZWxwZXJfcHJpdmF0ZTogbWlk LWxheWVyIHByaXZhdGUgZGF0YQo+IEBAIC01NDYsNiArNTUxLDcgQEAgc3RydWN0IGRybV9wbGFu ZSB7Cj4gIAkgKi8KPiAgCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlOwo+ICAKPiArCXN0 cnVjdCBkcm1fcHJvcGVydHkgKmFscGhhX3Byb3BlcnR5Owo+ICAJc3RydWN0IGRybV9wcm9wZXJ0 eSAqenBvc19wcm9wZXJ0eTsKPiAgCXN0cnVjdCBkcm1fcHJvcGVydHkgKnJvdGF0aW9uX3Byb3Bl cnR5Owo+ICB9OwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752664AbeAIMbt convert rfc822-to-8bit (ORCPT + 1 other); Tue, 9 Jan 2018 07:31:49 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:54585 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752114AbeAIMbs (ORCPT ); Tue, 9 Jan 2018 07:31:48 -0500 Date: Tue, 9 Jan 2018 13:31:36 +0100 From: Boris Brezillon To: Maxime Ripard Cc: Chen-Yu Tsai , Daniel Vetter , Jani Nikula , Sean Paul , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , thomas@vitsch.nl, Laurent Pinchart Subject: Re: [PATCH 06/19] drm/blend: Add a generic alpha property Message-ID: <20180109133136.1dae4259@bbrezillon> In-Reply-To: <5c765fc730d75cb362dc37bcdb3b3aeacc7bdb30.1515494838.git-series.maxime.ripard@free-electrons.com> References: <5c765fc730d75cb362dc37bcdb3b3aeacc7bdb30.1515494838.git-series.maxime.ripard@free-electrons.com> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Tue, 9 Jan 2018 11:56:25 +0100 Maxime Ripard wrote: > Some drivers duplicate the logic to create a property to store a per-plane > alpha. > > Let's create a helper in order to move that to the core. > > Cc: Boris Brezillon Reviewed-by: Boris Brezillon > Cc: Laurent Pinchart > Signed-off-by: Maxime Ripard > --- > Documentation/gpu/kms-properties.csv | 2 +- > drivers/gpu/drm/drm_atomic.c | 4 ++++- > drivers/gpu/drm/drm_atomic_helper.c | 1 +- > drivers/gpu/drm/drm_blend.c | 32 +++++++++++++++++++++++++++++- > include/drm/drm_blend.h | 1 +- > include/drm/drm_plane.h | 6 +++++- > 6 files changed, 45 insertions(+), 1 deletion(-) > > diff --git a/Documentation/gpu/kms-properties.csv b/Documentation/gpu/kms-properties.csv > index 927b65e14219..a3c3969c1992 100644 > --- a/Documentation/gpu/kms-properties.csv > +++ b/Documentation/gpu/kms-properties.csv > @@ -99,5 +99,5 @@ radeon,DVI-I,“coherent”,RANGE,"Min=0, Max=1",Connector,TBD > ,,"""underscan vborder""",RANGE,"Min=0, Max=128",Connector,TBD > ,Audio,“audio”,ENUM,"{ ""off"", ""on"", ""auto"" }",Connector,TBD > ,FMT Dithering,“dither”,ENUM,"{ ""off"", ""on"" }",Connector,TBD > -rcar-du,Generic,"""alpha""",RANGE,"Min=0, Max=255",Plane,TBD > +,,"""alpha""",RANGE,"Min=0, Max=255",Plane,Opacity of the plane from transparent (0) to opaque (255) > ,,"""colorkey""",RANGE,"Min=0, Max=0x01ffffff",Plane,TBD > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index c2da5585e201..ade18cf62c89 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -749,6 +749,8 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane, > state->src_w = val; > } else if (property == config->prop_src_h) { > state->src_h = val; > + } else if (property == plane->alpha_property) { > + state->alpha = val; > } else if (property == plane->rotation_property) { > if (!is_power_of_2(val & DRM_MODE_ROTATE_MASK)) > return -EINVAL; > @@ -810,6 +812,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane, > *val = state->src_w; > } else if (property == config->prop_src_h) { > *val = state->src_h; > + } else if (property == plane->alpha_property) { > + *val = state->alpha; > } else if (property == plane->rotation_property) { > *val = state->rotation; > } else if (property == plane->zpos_property) { > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index 71d712f1b56a..018993df4c18 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -3372,6 +3372,7 @@ void drm_atomic_helper_plane_reset(struct drm_plane *plane) > > if (plane->state) { > plane->state->plane = plane; > + plane->state->alpha = 255; > plane->state->rotation = DRM_MODE_ROTATE_0; > } > } > diff --git a/drivers/gpu/drm/drm_blend.c b/drivers/gpu/drm/drm_blend.c > index 2e5e089dd912..8eea2a8af458 100644 > --- a/drivers/gpu/drm/drm_blend.c > +++ b/drivers/gpu/drm/drm_blend.c > @@ -104,6 +104,38 @@ > */ > > /** > + * drm_plane_create_alpha_property - create a new alpha property > + * @plane: drm plane > + * @alpha: initial value of alpha, from 0 (transparent) to 255 (opaque) > + * > + * This function initializes a generic, mutable, alpha property and > + * enables support for it in the DRM core. > + * > + * Drivers can then attach this property to their plane to enable > + * support for configurable plane alpha. > + * > + * Returns: > + * 0 on success, negative error code on failure. > + */ > +int drm_plane_create_alpha_property(struct drm_plane *plane, u8 alpha) > +{ > + struct drm_property *prop; > + > + prop = drm_property_create_range(plane->dev, 0, "alpha", 0, 255); > + if (!prop) > + return -ENOMEM; > + > + drm_object_attach_property(&plane->base, prop, alpha); > + plane->alpha_property = prop; > + > + if (plane->state) > + plane->state->alpha = alpha; > + > + return 0; > +} > +EXPORT_SYMBOL(drm_plane_create_alpha_property); > + > +/** > * drm_plane_create_rotation_property - create a new rotation property > * @plane: drm plane > * @rotation: initial value of the rotation property > diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h > index 17606026590b..5979a8fce453 100644 > --- a/include/drm/drm_blend.h > +++ b/include/drm/drm_blend.h > @@ -36,6 +36,7 @@ static inline bool drm_rotation_90_or_270(unsigned int rotation) > return rotation & (DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270); > } > > +int drm_plane_create_alpha_property(struct drm_plane *plane, u8 alpha); > int drm_plane_create_rotation_property(struct drm_plane *plane, > unsigned int rotation, > unsigned int supported_rotations); > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > index 571615079230..a5e26064b132 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -42,6 +42,7 @@ struct drm_modeset_acquire_ctx; > * 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) > + * @alpha: opacity of the plane > * @rotation: rotation of the plane > * @zpos: priority of the given plane on crtc (optional) > * Note that multiple active planes on the same crtc can have an identical > @@ -105,6 +106,9 @@ struct drm_plane_state { > uint32_t src_x, src_y; > uint32_t src_h, src_w; > > + /* Plane opacity */ > + u8 alpha; > + > /* Plane rotation */ > unsigned int rotation; > > @@ -481,6 +485,7 @@ enum drm_plane_type { > * @funcs: helper functions > * @properties: property tracking for this plane > * @type: type of plane (overlay, primary, cursor) > + * @alpha_property: alpha property for this plane > * @zpos_property: zpos property for this plane > * @rotation_property: rotation property for this plane > * @helper_private: mid-layer private data > @@ -546,6 +551,7 @@ struct drm_plane { > */ > struct drm_plane_state *state; > > + struct drm_property *alpha_property; > struct drm_property *zpos_property; > struct drm_property *rotation_property; > };