From patchwork Tue Sep 14 20:05:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 511065 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFFE2C433F5 for ; Tue, 14 Sep 2021 20:13:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A43AE6112E for ; Tue, 14 Sep 2021 20:13:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233519AbhINUO4 (ORCPT ); Tue, 14 Sep 2021 16:14:56 -0400 Received: from mslow1.mail.gandi.net ([217.70.178.240]:45143 "EHLO mslow1.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233688AbhINUOw (ORCPT ); Tue, 14 Sep 2021 16:14:52 -0400 Received: from relay9-d.mail.gandi.net (unknown [217.70.183.199]) by mslow1.mail.gandi.net (Postfix) with ESMTP id 5713FCA4B1; Tue, 14 Sep 2021 20:06:14 +0000 (UTC) Received: (Authenticated sender: paul.kocialkowski@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 38CB0FF80B; Tue, 14 Sep 2021 20:05:52 +0000 (UTC) From: Paul Kocialkowski To: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: David Airlie , Daniel Vetter , Rob Herring , Lee Jones , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Paul Kocialkowski , Thomas Petazzoni Subject: [PATCH v9 4/4] NOTFORMERGE: drm/logicvc: Add plane colorkey support Date: Tue, 14 Sep 2021 22:05:39 +0200 Message-Id: <20210914200539.732093-5-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210914200539.732093-1-paul.kocialkowski@bootlin.com> References: <20210914200539.732093-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Paul Kocialkowski --- drivers/gpu/drm/logicvc/logicvc_drm.h | 3 + drivers/gpu/drm/logicvc/logicvc_layer.c | 151 +++++++++++++++++++++++- drivers/gpu/drm/logicvc/logicvc_layer.h | 7 ++ 3 files changed, 155 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h index 68bbac6c4ab9..d69a686ab0f1 100644 --- a/drivers/gpu/drm/logicvc/logicvc_drm.h +++ b/drivers/gpu/drm/logicvc/logicvc_drm.h @@ -59,6 +59,9 @@ struct logicvc_drm { struct list_head layers_list; struct logicvc_crtc *crtc; struct logicvc_interface *interface; + + struct drm_property *colorkey_enabled_property; + struct drm_property *colorkey_value_property; }; #endif diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.c b/drivers/gpu/drm/logicvc/logicvc_layer.c index 4345d29c61a7..4f180d445480 100644 --- a/drivers/gpu/drm/logicvc/logicvc_layer.c +++ b/drivers/gpu/drm/logicvc/logicvc_layer.c @@ -23,6 +23,8 @@ #define logicvc_layer(p) \ container_of(p, struct logicvc_layer, drm_plane) +#define logicvc_layer_state(p) \ + container_of(p, struct logicvc_layer_state, drm_plane_state) static uint32_t logicvc_layer_formats_rgb16[] = { DRM_FORMAT_RGB565, @@ -141,6 +143,8 @@ static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, struct drm_device *drm_dev = &logicvc->drm_dev; struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, drm_plane); + struct logicvc_layer_state *layer_state = + logicvc_layer_state(new_state); struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; struct drm_framebuffer *fb = new_state->fb; @@ -218,6 +222,15 @@ static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, alpha); } + /* Layer colorkey */ + + if (layer_state->colorkey_enabled) { + reg = layer_state->colorkey_value; + + regmap_write(logicvc->regmap, + LOGICVC_LAYER_COLOR_KEY_REG(index), reg); + } + /* Layer control */ reg = LOGICVC_LAYER_CTRL_ENABLE; @@ -225,7 +238,8 @@ static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, if (logicvc_layer_format_inverted(fb->format->format)) reg |= LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT; - reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; + if (!layer_state->colorkey_enabled) + reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), reg); } @@ -246,13 +260,109 @@ static struct drm_plane_helper_funcs logicvc_plane_helper_funcs = { .atomic_disable = logicvc_plane_atomic_disable, }; +static void logicvc_plane_reset(struct drm_plane *drm_plane) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + struct device *dev = logicvc->drm_dev.dev; + struct logicvc_layer_state *layer_state; + + if (drm_plane->state) { + layer_state = logicvc_layer_state(drm_plane->state); + __drm_atomic_helper_plane_destroy_state(drm_plane->state); + devm_kfree(dev, layer_state); + drm_plane->state = NULL; + } + + layer_state = devm_kzalloc(dev, sizeof(*layer_state), GFP_KERNEL); + if (!layer_state) + return; + + __drm_atomic_helper_plane_reset(drm_plane, + &layer_state->drm_plane_state); +} + +static struct drm_plane_state * +logicvc_plane_atomic_duplicate_state(struct drm_plane *drm_plane) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + struct device *dev = logicvc->drm_dev.dev; + struct logicvc_layer_state *layer_state_current; + struct logicvc_layer_state *layer_state; + + if (WARN_ON(!drm_plane->state)) + return NULL; + + layer_state_current = logicvc_layer_state(drm_plane->state); + layer_state = devm_kzalloc(dev, sizeof(*layer_state), GFP_KERNEL); + if (!layer_state) + return NULL; + + layer_state->colorkey_enabled = layer_state_current->colorkey_enabled; + layer_state->colorkey_value = layer_state_current->colorkey_value; + + __drm_atomic_helper_plane_duplicate_state(drm_plane, + &layer_state->drm_plane_state); + + return &layer_state->drm_plane_state; +} + +static void logicvc_plane_destroy_state(struct drm_plane *drm_plane, + struct drm_plane_state *state) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + struct device *dev = logicvc->drm_dev.dev; + struct logicvc_layer_state *layer_state = logicvc_layer_state(state); + + __drm_atomic_helper_plane_destroy_state(&layer_state->drm_plane_state); + + devm_kfree(dev, layer_state); +} + +static int logicvc_plane_atomic_set_property(struct drm_plane *drm_plane, + struct drm_plane_state *state, + struct drm_property *property, + uint64_t value) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + struct logicvc_layer_state *layer_state = logicvc_layer_state(state); + + if (property == logicvc->colorkey_enabled_property) + layer_state->colorkey_enabled = !!value; + else if (property == logicvc->colorkey_value_property) + layer_state->colorkey_value = (uint32_t)value; + else + return -ENOENT; + + return 0; +} + +static int logicvc_plane_atomic_get_property(struct drm_plane *drm_plane, + const struct drm_plane_state *state, + struct drm_property *property, + uint64_t *value) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + struct logicvc_layer_state *layer_state = logicvc_layer_state(state); + + if (property == logicvc->colorkey_enabled_property) + *value = layer_state->colorkey_enabled; + else if (property == logicvc->colorkey_value_property) + *value = layer_state->colorkey_value; + else + return -ENOENT; + + return 0; +} + static const struct drm_plane_funcs logicvc_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = drm_plane_cleanup, - .reset = drm_atomic_helper_plane_reset, - .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, + .reset = logicvc_plane_reset, + .atomic_duplicate_state = logicvc_plane_atomic_duplicate_state, + .atomic_destroy_state = logicvc_plane_destroy_state, + .atomic_set_property = logicvc_plane_atomic_set_property, + .atomic_get_property = logicvc_plane_atomic_get_property, }; int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, @@ -349,7 +459,8 @@ int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, return 0; } -static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc_layer *layer) +static struct logicvc_layer_formats * +logicvc_layer_formats_lookup(struct logicvc_layer *layer) { bool alpha; unsigned int i = 0; @@ -368,7 +479,8 @@ static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc return NULL; } -static unsigned int logicvc_layer_formats_count(struct logicvc_layer_formats *formats) +static unsigned int +logicvc_layer_formats_count(struct logicvc_layer_formats *formats) { unsigned int count = 0; @@ -537,6 +649,11 @@ static int logicvc_layer_init(struct logicvc_drm *logicvc, drm_plane_create_zpos_immutable_property(&layer->drm_plane, zpos); + drm_object_attach_property(&layer->drm_plane.base, + logicvc->colorkey_enabled_property, 0); + drm_object_attach_property(&layer->drm_plane.base, + logicvc->colorkey_value_property, 0); + drm_dbg_kms(drm_dev, "Registering layer #%d\n", index); layer->formats = formats; @@ -585,6 +702,17 @@ int logicvc_layers_init(struct logicvc_drm *logicvc) struct logicvc_layer *next; int ret = 0; + logicvc->colorkey_enabled_property = + drm_property_create_bool(drm_dev, 0, "colorkey_enabled"); + if (!logicvc->colorkey_enabled_property) + goto error; + + logicvc->colorkey_value_property = + drm_property_create_range(drm_dev, 0, "colorkey_value", + 0, 0xffffffff); + if (!logicvc->colorkey_value_property) + goto error; + layers_node = of_get_child_by_name(of_node, "layers"); if (!layers_node) { drm_err(drm_dev, "No layers node found in the description\n"); @@ -624,5 +752,16 @@ int logicvc_layers_init(struct logicvc_drm *logicvc) list_for_each_entry_safe(layer, next, &logicvc->layers_list, list) logicvc_layer_fini(logicvc, layer); + if (logicvc->colorkey_value_property) { + drm_property_destroy(drm_dev, logicvc->colorkey_value_property); + logicvc->colorkey_value_property = NULL; + } + + if (logicvc->colorkey_enabled_property) { + drm_property_destroy(drm_dev, + logicvc->colorkey_enabled_property); + logicvc->colorkey_enabled_property = NULL; + } + return ret; } diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.h b/drivers/gpu/drm/logicvc/logicvc_layer.h index c5767c81f446..69bb208ad79c 100644 --- a/drivers/gpu/drm/logicvc/logicvc_layer.h +++ b/drivers/gpu/drm/logicvc/logicvc_layer.h @@ -39,6 +39,13 @@ struct logicvc_layer_formats { uint32_t *formats; }; +struct logicvc_layer_state { + struct drm_plane_state drm_plane_state; + + bool colorkey_enabled; + uint32_t colorkey_value; +}; + struct logicvc_layer { struct logicvc_layer_config config; struct logicvc_layer_formats *formats;