From patchwork Mon Nov 2 15:53:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowski X-Patchwork-Id: 11874249 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=-9.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 A52DCC00A89 for ; Mon, 2 Nov 2020 15:59:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E88520786 for ; Mon, 2 Nov 2020 15:59:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E88520786 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D28786E0F0; Mon, 2 Nov 2020 15:58:59 +0000 (UTC) Received: from mslow2.mail.gandi.net (mslow2.mail.gandi.net [217.70.178.242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC6CC6E544 for ; Mon, 2 Nov 2020 15:58:57 +0000 (UTC) Received: from relay3-d.mail.gandi.net (unknown [217.70.183.195]) by mslow2.mail.gandi.net (Postfix) with ESMTP id 6EDEA3B208E for ; Mon, 2 Nov 2020 15:53:45 +0000 (UTC) X-Originating-IP: 90.1.129.152 Received: from localhost.localdomain (alille-651-1-130-152.w90-1.abo.wanadoo.fr [90.1.129.152]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id C05E260011; Mon, 2 Nov 2020 15:53:22 +0000 (UTC) From: Paul Kocialkowski To: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 3/3] NOTFORMERGE: drm/logicvc: Add plane colorkey support Date: Mon, 2 Nov 2020 16:53:08 +0100 Message-Id: <20201102155308.142691-4-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201102155308.142691-1-paul.kocialkowski@bootlin.com> References: <20201102155308.142691-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Thomas Petazzoni , Paul Kocialkowski , Rob Herring , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --- drivers/gpu/drm/logicvc/logicvc_drm.h | 3 + drivers/gpu/drm/logicvc/logicvc_layer.c | 143 +++++++++++++++++++++++- drivers/gpu/drm/logicvc/logicvc_layer.h | 7 ++ 3 files changed, 149 insertions(+), 4 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 9188d45cef77..8f2b61540535 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, @@ -135,6 +137,7 @@ static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, struct logicvc_layer *layer = logicvc_layer(drm_plane); struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); struct drm_plane_state *state = drm_plane->state; + struct logicvc_layer_state *layer_state = logicvc_layer_state(state); struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; struct drm_framebuffer *fb = state->fb; @@ -210,6 +213,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; @@ -217,7 +229,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); } @@ -238,13 +251,108 @@ 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, @@ -525,6 +633,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_DEBUG_DRIVER("Registering layer #%d\n", index); layer->formats = formats; @@ -573,6 +686,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_ERROR("No layers node found in the description\n"); @@ -611,5 +735,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;