[PATCH v4 3/3] WIP: drm/logicvc: Add plane colorkey support

Paul Kocialkowski
2019-12-03T15:06:22Z

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
drivers/gpu/drm/logicvc/logicvc_drm.h | 3 +
drivers/gpu/drm/logicvc/logicvc_layer.c | 147 +++++++++++++++++++++++-
drivers/gpu/drm/logicvc/logicvc_layer.h | 7 ++
3 files changed, 153 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h
index cc728d5a4aee..52f3c09b9659 100644
--- a/drivers/gpu/drm/logicvc/logicvc_drm.h
+++ b/drivers/gpu/drm/logicvc/logicvc_drm.h
@@ -55,6 +55,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 c7b092d592ad..ce821781e148 100644
--- a/drivers/gpu/drm/logicvc/logicvc_layer.c
+++ b/drivers/gpu/drm/logicvc/logicvc_layer.c
@@ -22,6 +22,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,
@@ -131,6 +133,7 @@ static void logicvc_plane_atomic_update(struct drm_plane *drm_plane,
struct logicvc_layer *layer = logicvc_layer(drm_plane);
struct logicvc_drm *logicvc = layer->logicvc;
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;
@@ -206,6 +209,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;
@@ -213,7 +225,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);
}
@@ -234,13 +247,112 @@ 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_layer *layer = logicvc_layer(drm_plane);
+ struct logicvc_drm *logicvc = layer->logicvc;
+ 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(logicvc->drm->dev, layer_state);
+ drm_plane->state = NULL;
+ }
+
+ layer_state = devm_kzalloc(logicvc->drm->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_layer *layer = logicvc_layer(drm_plane);
+ struct logicvc_drm *logicvc = layer->logicvc;
+ 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(logicvc->drm->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_layer *layer = logicvc_layer(drm_plane);
+ struct logicvc_drm *logicvc = layer->logicvc;
+ struct logicvc_layer_state *layer_state = logicvc_layer_state(state);
+
+ __drm_atomic_helper_plane_destroy_state(&layer_state->drm_plane_state);
+
+ devm_kfree(logicvc->drm->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_layer *layer = logicvc_layer(drm_plane);
+ struct logicvc_drm *logicvc = layer->logicvc;
+ 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_layer *layer = logicvc_layer(drm_plane);
+ struct logicvc_drm *logicvc = layer->logicvc;
+ 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_layer *layer,
@@ -508,6 +620,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;
@@ -545,6 +662,7 @@ void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc)

int logicvc_layers_init(struct logicvc_drm *logicvc)
{
+ struct drm_device *drm = logicvc->drm;
struct device_node *of_node = logicvc->drm->dev->of_node;
struct device_node *layer_node = NULL;
struct device_node *layers_node;
@@ -552,6 +670,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, 0, "colorkey_enabled");
+ if (!logicvc->colorkey_enabled_property)
+ goto error;
+
+ logicvc->colorkey_value_property =
+ drm_property_create_range(drm, 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");
@@ -590,5 +719,15 @@ 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, logicvc->colorkey_value_property);
+ logicvc->colorkey_value_property = NULL;
+ }
+
+ if (logicvc->colorkey_enabled_property) {
+ drm_property_destroy(drm, 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 71b3f177b093..2fb161217081 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_drm *logicvc;

--
2.24.0