forked from Minki/linux
5fd27c2a1f
A few changes, but most notably improving the HDMI support merged in 4.13, by reporting the DDC adapter as an i2c bus, and by adding CEC support through the CEC framework. -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJZl0SwAAoJEBx+YmzsjxAg4gkP/Rsyxww/f3+wX2COAc3uS0U9 +COEsvf0ztrVIP9xAIf+m29UxB9u6dP2KTKANFyAf4b42coW6fUimV4iQmdDKAxY Y/BNUV8SyDidFmxUo7Cy3uVFzA61+wsMPOXMpJA5uQa/eNpsbHEQhsZWEsYLymZF WV7h+Hepm+pVPTnbM1j5Pd2J+VISGBdacnXFjW2KzA+PdPoPT1fmKIQ39/OtPQzH RV1J4HPEVWZfZIJz9i2NK3J7GhRR5u9NnzfGZfWf0SHzujURuytJwgIvEm5dgLeD +XuUsCvVzkUB4jTY+T1qmVPQ+GcazyinKIu6ZU9pP1xkc+Apu79OapOdvmx95yIV l9l4Q0BuJvuWsZTP8lT4EMO7oyRE0oDleKgHQ6BbnqwTKY9pltEp4Wl7ovPibXje YjjierdO8WxUq8NhSW50S/EAu2oopbCp0YApdQVmMDlZ4bx41GWDmLlCaDsECakQ vQLtI5eQK1EbrQcJjioemdikt+xcrZ7+J35x1qLQ9aNwa49RI5WSIzOTxsqWHZYw 6wXv/HN6atPbRspnwgRlwtVYUOoSZ1xT+lST0rizRLJW4G8srzfPpjtXLaP8zWp+ IvJ+ntbn1O9CSBz70IovX/AnrWxMK3Guf1dFWE68JfSw/fxhUpF1RpHdi+yvZJpS xgedqXmmlYAMNlro9Ikg =6GJs -----END PGP SIGNATURE----- Merge tag 'sunxi-drm-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into drm-next Allwinner DRM changes for 4.14 A few changes, but most notably improving the HDMI support merged in 4.13, by reporting the DDC adapter as an i2c bus, and by adding CEC support through the CEC framework. * tag 'sunxi-drm-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: sun4i_hdmi: add CEC support dt-bindings: display: sunxi: Improve endpoint ID scheme readability drm/sun4i: tcon: remove unused function drm/sun4i: Remove useless atomic_check drm/sun4i: Add if statement instead of depends on drm/sun4i: hdmi: Implement I2C adapter for A10s DDC bus drm/sun4i: constify drm_plane_helper_funcs
180 lines
5.3 KiB
C
180 lines
5.3 KiB
C
/*
|
|
* Copyright (C) 2015 Free Electrons
|
|
* Copyright (C) 2015 NextThing Co
|
|
*
|
|
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_plane_helper.h>
|
|
#include <drm/drmP.h>
|
|
|
|
#include "sun4i_backend.h"
|
|
#include "sun4i_layer.h"
|
|
#include "sunxi_engine.h"
|
|
|
|
struct sun4i_plane_desc {
|
|
enum drm_plane_type type;
|
|
u8 pipe;
|
|
const uint32_t *formats;
|
|
uint32_t nformats;
|
|
};
|
|
|
|
static void sun4i_backend_layer_atomic_disable(struct drm_plane *plane,
|
|
struct drm_plane_state *old_state)
|
|
{
|
|
struct sun4i_layer *layer = plane_to_sun4i_layer(plane);
|
|
struct sun4i_backend *backend = layer->backend;
|
|
|
|
sun4i_backend_layer_enable(backend, layer->id, false);
|
|
}
|
|
|
|
static void sun4i_backend_layer_atomic_update(struct drm_plane *plane,
|
|
struct drm_plane_state *old_state)
|
|
{
|
|
struct sun4i_layer *layer = plane_to_sun4i_layer(plane);
|
|
struct sun4i_backend *backend = layer->backend;
|
|
|
|
sun4i_backend_update_layer_coord(backend, layer->id, plane);
|
|
sun4i_backend_update_layer_formats(backend, layer->id, plane);
|
|
sun4i_backend_update_layer_buffer(backend, layer->id, plane);
|
|
sun4i_backend_layer_enable(backend, layer->id, true);
|
|
}
|
|
|
|
static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = {
|
|
.atomic_disable = sun4i_backend_layer_atomic_disable,
|
|
.atomic_update = sun4i_backend_layer_atomic_update,
|
|
};
|
|
|
|
static const struct drm_plane_funcs sun4i_backend_layer_funcs = {
|
|
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
|
|
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
|
|
.destroy = drm_plane_cleanup,
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
.reset = drm_atomic_helper_plane_reset,
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
};
|
|
|
|
static const uint32_t sun4i_backend_layer_formats_primary[] = {
|
|
DRM_FORMAT_ARGB8888,
|
|
DRM_FORMAT_RGB888,
|
|
DRM_FORMAT_RGB565,
|
|
DRM_FORMAT_XRGB8888,
|
|
};
|
|
|
|
static const uint32_t sun4i_backend_layer_formats_overlay[] = {
|
|
DRM_FORMAT_ARGB8888,
|
|
DRM_FORMAT_ARGB4444,
|
|
DRM_FORMAT_ARGB1555,
|
|
DRM_FORMAT_RGBA5551,
|
|
DRM_FORMAT_RGBA4444,
|
|
DRM_FORMAT_RGB888,
|
|
DRM_FORMAT_RGB565,
|
|
DRM_FORMAT_XRGB8888,
|
|
};
|
|
|
|
static const struct sun4i_plane_desc sun4i_backend_planes[] = {
|
|
{
|
|
.type = DRM_PLANE_TYPE_PRIMARY,
|
|
.pipe = 0,
|
|
.formats = sun4i_backend_layer_formats_primary,
|
|
.nformats = ARRAY_SIZE(sun4i_backend_layer_formats_primary),
|
|
},
|
|
{
|
|
.type = DRM_PLANE_TYPE_OVERLAY,
|
|
.pipe = 1,
|
|
.formats = sun4i_backend_layer_formats_overlay,
|
|
.nformats = ARRAY_SIZE(sun4i_backend_layer_formats_overlay),
|
|
},
|
|
};
|
|
|
|
static struct sun4i_layer *sun4i_layer_init_one(struct drm_device *drm,
|
|
struct sun4i_backend *backend,
|
|
const struct sun4i_plane_desc *plane)
|
|
{
|
|
struct sun4i_layer *layer;
|
|
int ret;
|
|
|
|
layer = devm_kzalloc(drm->dev, sizeof(*layer), GFP_KERNEL);
|
|
if (!layer)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
/* possible crtcs are set later */
|
|
ret = drm_universal_plane_init(drm, &layer->plane, 0,
|
|
&sun4i_backend_layer_funcs,
|
|
plane->formats, plane->nformats,
|
|
NULL, plane->type, NULL);
|
|
if (ret) {
|
|
dev_err(drm->dev, "Couldn't initialize layer\n");
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
drm_plane_helper_add(&layer->plane,
|
|
&sun4i_backend_layer_helper_funcs);
|
|
layer->backend = backend;
|
|
|
|
return layer;
|
|
}
|
|
|
|
struct drm_plane **sun4i_layers_init(struct drm_device *drm,
|
|
struct sunxi_engine *engine)
|
|
{
|
|
struct drm_plane **planes;
|
|
struct sun4i_backend *backend = engine_to_sun4i_backend(engine);
|
|
int i;
|
|
|
|
planes = devm_kcalloc(drm->dev, ARRAY_SIZE(sun4i_backend_planes) + 1,
|
|
sizeof(*planes), GFP_KERNEL);
|
|
if (!planes)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
/*
|
|
* The hardware is a bit unusual here.
|
|
*
|
|
* Even though it supports 4 layers, it does the composition
|
|
* in two separate steps.
|
|
*
|
|
* The first one is assigning a layer to one of its two
|
|
* pipes. If more that 1 layer is assigned to the same pipe,
|
|
* and if pixels overlaps, the pipe will take the pixel from
|
|
* the layer with the highest priority.
|
|
*
|
|
* The second step is the actual alpha blending, that takes
|
|
* the two pipes as input, and uses the eventual alpha
|
|
* component to do the transparency between the two.
|
|
*
|
|
* This two steps scenario makes us unable to guarantee a
|
|
* robust alpha blending between the 4 layers in all
|
|
* situations. So we just expose two layers, one per pipe. On
|
|
* SoCs that support it, sprites could fill the need for more
|
|
* layers.
|
|
*/
|
|
for (i = 0; i < ARRAY_SIZE(sun4i_backend_planes); i++) {
|
|
const struct sun4i_plane_desc *plane = &sun4i_backend_planes[i];
|
|
struct sun4i_layer *layer;
|
|
|
|
layer = sun4i_layer_init_one(drm, backend, plane);
|
|
if (IS_ERR(layer)) {
|
|
dev_err(drm->dev, "Couldn't initialize %s plane\n",
|
|
i ? "overlay" : "primary");
|
|
return ERR_CAST(layer);
|
|
};
|
|
|
|
DRM_DEBUG_DRIVER("Assigning %s plane to pipe %d\n",
|
|
i ? "overlay" : "primary", plane->pipe);
|
|
regmap_update_bits(engine->regs, SUN4I_BACKEND_ATTCTL_REG0(i),
|
|
SUN4I_BACKEND_ATTCTL_REG0_LAY_PIPESEL_MASK,
|
|
SUN4I_BACKEND_ATTCTL_REG0_LAY_PIPESEL(plane->pipe));
|
|
|
|
layer->id = i;
|
|
planes[i] = &layer->plane;
|
|
};
|
|
|
|
return planes;
|
|
}
|