Commit 871bcdfe authored by Vincent Abriou's avatar Vincent Abriou Committed by Benjamin Gaignard

drm/sti: code clean up

Purpose is to simplify the STI driver:
- remove layer structure
- consider video subdev as part of the compositor (like mixer subdev)
- remove useless STI_VID0 and STI_VID1 enum
Signed-off-by: default avatarVincent Abriou <vincent.abriou@st.com>
Reviewed-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
parent bf60b29f
sticompositor-y := \ sticompositor-y := \
sti_layer.o \
sti_mixer.o \ sti_mixer.o \
sti_gdp.o \ sti_gdp.o \
sti_vid.o \ sti_vid.o \
......
...@@ -14,10 +14,12 @@ ...@@ -14,10 +14,12 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include "sti_compositor.h" #include "sti_compositor.h"
#include "sti_cursor.h"
#include "sti_drm_crtc.h" #include "sti_drm_crtc.h"
#include "sti_drm_drv.h" #include "sti_drm_drv.h"
#include "sti_drm_plane.h" #include "sti_drm_plane.h"
#include "sti_gdp.h" #include "sti_gdp.h"
#include "sti_vid.h"
#include "sti_vtg.h" #include "sti_vtg.h"
/* /*
...@@ -31,7 +33,7 @@ struct sti_compositor_data stih407_compositor_data = { ...@@ -31,7 +33,7 @@ struct sti_compositor_data stih407_compositor_data = {
{STI_GPD_SUBDEV, (int)STI_GDP_1, 0x200}, {STI_GPD_SUBDEV, (int)STI_GDP_1, 0x200},
{STI_GPD_SUBDEV, (int)STI_GDP_2, 0x300}, {STI_GPD_SUBDEV, (int)STI_GDP_2, 0x300},
{STI_GPD_SUBDEV, (int)STI_GDP_3, 0x400}, {STI_GPD_SUBDEV, (int)STI_GDP_3, 0x400},
{STI_VID_SUBDEV, (int)STI_VID_0, 0x700}, {STI_VID_SUBDEV, (int)STI_HQVDP_0, 0x700},
{STI_MIXER_MAIN_SUBDEV, STI_MIXER_MAIN, 0xC00}, {STI_MIXER_MAIN_SUBDEV, STI_MIXER_MAIN, 0xC00},
{STI_MIXER_AUX_SUBDEV, STI_MIXER_AUX, 0xD00}, {STI_MIXER_AUX_SUBDEV, STI_MIXER_AUX, 0xD00},
}, },
...@@ -53,14 +55,31 @@ struct sti_compositor_data stih416_compositor_data = { ...@@ -53,14 +55,31 @@ struct sti_compositor_data stih416_compositor_data = {
}, },
}; };
static int sti_compositor_init_subdev(struct sti_compositor *compo, static int sti_compositor_bind(struct device *dev,
struct sti_compositor_subdev_descriptor *desc, struct device *master,
unsigned int array_size) void *data)
{ {
unsigned int i, mixer_id = 0, layer_id = 0; struct sti_compositor *compo = dev_get_drvdata(dev);
struct drm_device *drm_dev = data;
unsigned int i, mixer_id = 0, vid_id = 0, crtc_id = 0, plane_id = 0;
struct sti_drm_private *dev_priv = drm_dev->dev_private;
struct drm_plane *cursor = NULL;
struct drm_plane *primary = NULL;
struct sti_compositor_subdev_descriptor *desc = compo->data.subdev_desc;
unsigned int array_size = compo->data.nb_subdev;
struct sti_plane *plane;
dev_priv->compo = compo;
/* Register mixer subdev and video subdev first */
for (i = 0; i < array_size; i++) { for (i = 0; i < array_size; i++) {
switch (desc[i].type) { switch (desc[i].type) {
case STI_VID_SUBDEV:
compo->vid[vid_id++] =
sti_vid_create(compo->dev, desc[i].id,
compo->regs + desc[i].offset);
break;
case STI_MIXER_MAIN_SUBDEV: case STI_MIXER_MAIN_SUBDEV:
case STI_MIXER_AUX_SUBDEV: case STI_MIXER_AUX_SUBDEV:
compo->mixer[mixer_id++] = compo->mixer[mixer_id++] =
...@@ -68,81 +87,72 @@ static int sti_compositor_init_subdev(struct sti_compositor *compo, ...@@ -68,81 +87,72 @@ static int sti_compositor_init_subdev(struct sti_compositor *compo,
compo->regs + desc[i].offset); compo->regs + desc[i].offset);
break; break;
case STI_GPD_SUBDEV: case STI_GPD_SUBDEV:
case STI_VID_SUBDEV:
case STI_CURSOR_SUBDEV: case STI_CURSOR_SUBDEV:
compo->layer[layer_id++] = /* Nothing to do, wait for the second round */
sti_layer_create(compo->dev, desc[i].id,
compo->regs + desc[i].offset);
break; break;
default: default:
DRM_ERROR("Unknow subdev compoment type\n"); DRM_ERROR("Unknow subdev compoment type\n");
return 1; return 1;
} }
} }
compo->nb_mixers = mixer_id;
compo->nb_layers = layer_id;
return 0;
}
static int sti_compositor_bind(struct device *dev, struct device *master, /* Register the other subdevs, create crtc and planes */
void *data) for (i = 0; i < array_size; i++) {
{ enum drm_plane_type plane_type = DRM_PLANE_TYPE_OVERLAY;
struct sti_compositor *compo = dev_get_drvdata(dev);
struct drm_device *drm_dev = data;
unsigned int i, crtc = 0, plane = 0;
struct sti_drm_private *dev_priv = drm_dev->dev_private;
struct drm_plane *cursor = NULL;
struct drm_plane *primary = NULL;
dev_priv->compo = compo;
for (i = 0; i < compo->nb_layers; i++) {
if (compo->layer[i]) {
enum sti_layer_desc desc = compo->layer[i]->desc;
enum sti_layer_type type = desc & STI_LAYER_TYPE_MASK;
enum drm_plane_type plane_type = DRM_PLANE_TYPE_OVERLAY;
if (crtc < compo->nb_mixers) if (crtc_id < mixer_id)
plane_type = DRM_PLANE_TYPE_PRIMARY; plane_type = DRM_PLANE_TYPE_PRIMARY;
switch (type) { switch (desc[i].type) {
case STI_CUR: case STI_MIXER_MAIN_SUBDEV:
cursor = sti_drm_plane_init(drm_dev, case STI_MIXER_AUX_SUBDEV:
compo->layer[i], case STI_VID_SUBDEV:
1, DRM_PLANE_TYPE_CURSOR); /* Nothing to do, already done at the first round */
break; break;
case STI_GDP: case STI_CURSOR_SUBDEV:
case STI_VID: plane = sti_cursor_create(compo->dev, desc[i].id,
primary = sti_drm_plane_init(drm_dev, compo->regs + desc[i].offset);
compo->layer[i], if (!plane) {
(1 << compo->nb_mixers) - 1, DRM_ERROR("Can't create CURSOR plane\n");
plane_type);
plane++;
break; break;
case STI_BCK: }
case STI_VDP: cursor = sti_drm_plane_init(drm_dev, plane, 1,
DRM_PLANE_TYPE_CURSOR);
plane_id++;
break;
case STI_GPD_SUBDEV:
plane = sti_gdp_create(compo->dev, desc[i].id,
compo->regs + desc[i].offset);
if (!plane) {
DRM_ERROR("Can't create GDP plane\n");
break; break;
} }
primary = sti_drm_plane_init(drm_dev, plane,
(1 << mixer_id) - 1,
plane_type);
plane_id++;
break;
default:
DRM_ERROR("Unknown subdev compoment type\n");
return 1;
}
/* The first planes are reserved for primary planes*/ /* The first planes are reserved for primary planes*/
if (crtc < compo->nb_mixers && primary) { if (crtc_id < mixer_id && primary) {
sti_drm_crtc_init(drm_dev, compo->mixer[crtc], sti_drm_crtc_init(drm_dev, compo->mixer[crtc_id],
primary, cursor); primary, cursor);
crtc++; crtc_id++;
cursor = NULL; cursor = NULL;
primary = NULL; primary = NULL;
}
} }
} }
drm_vblank_init(drm_dev, crtc); drm_vblank_init(drm_dev, crtc_id);
/* Allow usage of vblank without having to call drm_irq_install */ /* Allow usage of vblank without having to call drm_irq_install */
drm_dev->irq_enabled = 1; drm_dev->irq_enabled = 1;
DRM_DEBUG_DRIVER("Initialized %d DRM CRTC(s) and %d DRM plane(s)\n", DRM_DEBUG_DRIVER("Initialized %d DRM CRTC(s) and %d DRM plane(s)\n",
crtc, plane); crtc_id, plane_id);
DRM_DEBUG_DRIVER("DRM plane(s) for VID/VDP not created yet\n"); DRM_DEBUG_DRIVER("DRM plane(s) for VID/VDP not created yet\n");
return 0; return 0;
...@@ -179,7 +189,6 @@ static int sti_compositor_probe(struct platform_device *pdev) ...@@ -179,7 +189,6 @@ static int sti_compositor_probe(struct platform_device *pdev)
struct device_node *vtg_np; struct device_node *vtg_np;
struct sti_compositor *compo; struct sti_compositor *compo;
struct resource *res; struct resource *res;
int err;
compo = devm_kzalloc(dev, sizeof(*compo), GFP_KERNEL); compo = devm_kzalloc(dev, sizeof(*compo), GFP_KERNEL);
if (!compo) { if (!compo) {
...@@ -251,12 +260,6 @@ static int sti_compositor_probe(struct platform_device *pdev) ...@@ -251,12 +260,6 @@ static int sti_compositor_probe(struct platform_device *pdev)
if (vtg_np) if (vtg_np)
compo->vtg_aux = of_vtg_find(vtg_np); compo->vtg_aux = of_vtg_find(vtg_np);
/* Initialize compositor subdevices */
err = sti_compositor_init_subdev(compo, compo->data.subdev_desc,
compo->data.nb_subdev);
if (err)
return err;
platform_set_drvdata(pdev, compo); platform_set_drvdata(pdev, compo);
return component_add(&pdev->dev, &sti_compositor_ops); return component_add(&pdev->dev, &sti_compositor_ops);
......
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include "sti_layer.h" #include "sti_drm_plane.h"
#include "sti_mixer.h" #include "sti_mixer.h"
#define WAIT_NEXT_VSYNC_MS 50 /*ms*/ #define WAIT_NEXT_VSYNC_MS 50 /*ms*/
#define STI_MAX_LAYER 8
#define STI_MAX_MIXER 2 #define STI_MAX_MIXER 2
#define STI_MAX_VID 1
enum sti_compositor_subdev_type { enum sti_compositor_subdev_type {
STI_MIXER_MAIN_SUBDEV, STI_MIXER_MAIN_SUBDEV,
...@@ -59,11 +59,9 @@ struct sti_compositor_data { ...@@ -59,11 +59,9 @@ struct sti_compositor_data {
* @rst_main: reset control of the main path * @rst_main: reset control of the main path
* @rst_aux: reset control of the aux path * @rst_aux: reset control of the aux path
* @mixer: array of mixers * @mixer: array of mixers
* @vid: array of vids
* @vtg_main: vtg for main data path * @vtg_main: vtg for main data path
* @vtg_aux: vtg for auxillary data path * @vtg_aux: vtg for auxillary data path
* @layer: array of layers
* @nb_mixers: number of mixers for this compositor
* @nb_layers: number of layers (GDP,VID,...) for this compositor
* @vtg_vblank_nb: callback for VTG VSYNC notification * @vtg_vblank_nb: callback for VTG VSYNC notification
*/ */
struct sti_compositor { struct sti_compositor {
...@@ -77,11 +75,9 @@ struct sti_compositor { ...@@ -77,11 +75,9 @@ struct sti_compositor {
struct reset_control *rst_main; struct reset_control *rst_main;
struct reset_control *rst_aux; struct reset_control *rst_aux;
struct sti_mixer *mixer[STI_MAX_MIXER]; struct sti_mixer *mixer[STI_MAX_MIXER];
struct sti_vid *vid[STI_MAX_VID];
struct sti_vtg *vtg_main; struct sti_vtg *vtg_main;
struct sti_vtg *vtg_aux; struct sti_vtg *vtg_aux;
struct sti_layer *layer[STI_MAX_LAYER];
int nb_mixers;
int nb_layers;
struct notifier_block vtg_vblank_nb; struct notifier_block vtg_vblank_nb;
}; };
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include "sti_cursor.h" #include "sti_cursor.h"
#include "sti_layer.h" #include "sti_drm_plane.h"
#include "sti_vtg.h" #include "sti_vtg.h"
/* Registers */ /* Registers */
...@@ -42,7 +42,9 @@ struct dma_pixmap { ...@@ -42,7 +42,9 @@ struct dma_pixmap {
/** /**
* STI Cursor structure * STI Cursor structure
* *
* @layer: layer structure * @sti_plane: sti_plane structure
* @dev: driver device
* @regs: cursor registers
* @width: cursor width * @width: cursor width
* @height: cursor height * @height: cursor height
* @clut: color look up table * @clut: color look up table
...@@ -50,7 +52,9 @@ struct dma_pixmap { ...@@ -50,7 +52,9 @@ struct dma_pixmap {
* @pixmap: pixmap dma buffer (clut8-format cursor) * @pixmap: pixmap dma buffer (clut8-format cursor)
*/ */
struct sti_cursor { struct sti_cursor {
struct sti_layer layer; struct sti_plane plane;
struct device *dev;
void __iomem *regs;
unsigned int width; unsigned int width;
unsigned int height; unsigned int height;
unsigned short *clut; unsigned short *clut;
...@@ -62,22 +66,22 @@ static const uint32_t cursor_supported_formats[] = { ...@@ -62,22 +66,22 @@ static const uint32_t cursor_supported_formats[] = {
DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB8888,
}; };
#define to_sti_cursor(x) container_of(x, struct sti_cursor, layer) #define to_sti_cursor(x) container_of(x, struct sti_cursor, plane)
static const uint32_t *sti_cursor_get_formats(struct sti_layer *layer) static const uint32_t *sti_cursor_get_formats(struct sti_plane *plane)
{ {
return cursor_supported_formats; return cursor_supported_formats;
} }
static unsigned int sti_cursor_get_nb_formats(struct sti_layer *layer) static unsigned int sti_cursor_get_nb_formats(struct sti_plane *plane)
{ {
return ARRAY_SIZE(cursor_supported_formats); return ARRAY_SIZE(cursor_supported_formats);
} }
static void sti_cursor_argb8888_to_clut8(struct sti_layer *layer) static void sti_cursor_argb8888_to_clut8(struct sti_plane *plane)
{ {
struct sti_cursor *cursor = to_sti_cursor(layer); struct sti_cursor *cursor = to_sti_cursor(plane);
u32 *src = layer->vaddr; u32 *src = plane->vaddr;
u8 *dst = cursor->pixmap.base; u8 *dst = cursor->pixmap.base;
unsigned int i, j; unsigned int i, j;
u32 a, r, g, b; u32 a, r, g, b;
...@@ -96,42 +100,42 @@ static void sti_cursor_argb8888_to_clut8(struct sti_layer *layer) ...@@ -96,42 +100,42 @@ static void sti_cursor_argb8888_to_clut8(struct sti_layer *layer)
} }
} }
static int sti_cursor_prepare_layer(struct sti_layer *layer, bool first_prepare) static int sti_cursor_prepare_plane(struct sti_plane *plane, bool first_prepare)
{ {
struct sti_cursor *cursor = to_sti_cursor(layer); struct sti_cursor *cursor = to_sti_cursor(plane);
struct drm_display_mode *mode = layer->mode; struct drm_display_mode *mode = plane->mode;
u32 y, x; u32 y, x;
u32 val; u32 val;
DRM_DEBUG_DRIVER("\n"); DRM_DEBUG_DRIVER("\n");
dev_dbg(layer->dev, "%s %s\n", __func__, sti_layer_to_str(layer)); dev_dbg(cursor->dev, "%s %s\n", __func__, sti_plane_to_str(plane));
if (layer->src_w < STI_CURS_MIN_SIZE || if (plane->src_w < STI_CURS_MIN_SIZE ||
layer->src_h < STI_CURS_MIN_SIZE || plane->src_h < STI_CURS_MIN_SIZE ||
layer->src_w > STI_CURS_MAX_SIZE || plane->src_w > STI_CURS_MAX_SIZE ||
layer->src_h > STI_CURS_MAX_SIZE) { plane->src_h > STI_CURS_MAX_SIZE) {
DRM_ERROR("Invalid cursor size (%dx%d)\n", DRM_ERROR("Invalid cursor size (%dx%d)\n",
layer->src_w, layer->src_h); plane->src_w, plane->src_h);
return -EINVAL; return -EINVAL;
} }
/* If the cursor size has changed, re-allocated the pixmap */ /* If the cursor size has changed, re-allocated the pixmap */
if (!cursor->pixmap.base || if (!cursor->pixmap.base ||
(cursor->width != layer->src_w) || (cursor->width != plane->src_w) ||
(cursor->height != layer->src_h)) { (cursor->height != plane->src_h)) {
cursor->width = layer->src_w; cursor->width = plane->src_w;
cursor->height = layer->src_h; cursor->height = plane->src_h;
if (cursor->pixmap.base) if (cursor->pixmap.base)
dma_free_writecombine(layer->dev, dma_free_writecombine(cursor->dev,
cursor->pixmap.size, cursor->pixmap.size,
cursor->pixmap.base, cursor->pixmap.base,
cursor->pixmap.paddr); cursor->pixmap.paddr);
cursor->pixmap.size = cursor->width * cursor->height; cursor->pixmap.size = cursor->width * cursor->height;
cursor->pixmap.base = dma_alloc_writecombine(layer->dev, cursor->pixmap.base = dma_alloc_writecombine(cursor->dev,
cursor->pixmap.size, cursor->pixmap.size,
&cursor->pixmap.paddr, &cursor->pixmap.paddr,
GFP_KERNEL | GFP_DMA); GFP_KERNEL | GFP_DMA);
...@@ -142,55 +146,54 @@ static int sti_cursor_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -142,55 +146,54 @@ static int sti_cursor_prepare_layer(struct sti_layer *layer, bool first_prepare)
} }
/* Convert ARGB8888 to CLUT8 */ /* Convert ARGB8888 to CLUT8 */
sti_cursor_argb8888_to_clut8(layer); sti_cursor_argb8888_to_clut8(plane);
/* AWS and AWE depend on the mode */ /* AWS and AWE depend on the mode */
y = sti_vtg_get_line_number(*mode, 0); y = sti_vtg_get_line_number(*mode, 0);
x = sti_vtg_get_pixel_number(*mode, 0); x = sti_vtg_get_pixel_number(*mode, 0);
val = y << 16 | x; val = y << 16 | x;
writel(val, layer->regs + CUR_AWS); writel(val, cursor->regs + CUR_AWS);
y = sti_vtg_get_line_number(*mode, mode->vdisplay - 1); y = sti_vtg_get_line_number(*mode, mode->vdisplay - 1);
x = sti_vtg_get_pixel_number(*mode, mode->hdisplay - 1); x = sti_vtg_get_pixel_number(*mode, mode->hdisplay - 1);
val = y << 16 | x; val = y << 16 | x;
writel(val, layer->regs + CUR_AWE); writel(val, cursor->regs + CUR_AWE);
if (first_prepare) { if (first_prepare) {
/* Set and fetch CLUT */ /* Set and fetch CLUT */
writel(cursor->clut_paddr, layer->regs + CUR_CML); writel(cursor->clut_paddr, cursor->regs + CUR_CML);
writel(CUR_CTL_CLUT_UPDATE, layer->regs + CUR_CTL); writel(CUR_CTL_CLUT_UPDATE, cursor->regs + CUR_CTL);
} }
return 0; return 0;
} }
static int sti_cursor_commit_layer(struct sti_layer *layer) static int sti_cursor_commit_plane(struct sti_plane *plane)
{ {
struct sti_cursor *cursor = to_sti_cursor(layer); struct sti_cursor *cursor = to_sti_cursor(plane);
struct drm_display_mode *mode = layer->mode; struct drm_display_mode *mode = plane->mode;
u32 ydo, xdo; u32 ydo, xdo;
dev_dbg(layer->dev, "%s %s\n", __func__, sti_layer_to_str(layer)); dev_dbg(cursor->dev, "%s %s\n", __func__, sti_plane_to_str(plane));
/* Set memory location, size, and position */ /* Set memory location, size, and position */
writel(cursor->pixmap.paddr, layer->regs + CUR_PML); writel(cursor->pixmap.paddr, cursor->regs + CUR_PML);
writel(cursor->width, layer->regs + CUR_PMP); writel(cursor->width, cursor->regs + CUR_PMP);
writel(cursor->height << 16 | cursor->width, layer->regs + CUR_SIZE); writel(cursor->height << 16 | cursor->width, cursor->regs + CUR_SIZE);
ydo = sti_vtg_get_line_number(*mode, layer->dst_y); ydo = sti_vtg_get_line_number(*mode, plane->dst_y);
xdo = sti_vtg_get_pixel_number(*mode, layer->dst_y); xdo = sti_vtg_get_pixel_number(*mode, plane->dst_y);
writel((ydo << 16) | xdo, layer->regs + CUR_VPO); writel((ydo << 16) | xdo, cursor->regs + CUR_VPO);
return 0; return 0;
} }
static int sti_cursor_disable_layer(struct sti_layer *layer) static int sti_cursor_disable_plane(struct sti_plane *plane)
{ {
return 0; return 0;
} }
static void sti_cursor_init(struct sti_layer *layer) static void sti_cursor_init(struct sti_cursor *cursor)
{ {
struct sti_cursor *cursor = to_sti_cursor(layer);
unsigned short *base = cursor->clut; unsigned short *base = cursor->clut;
unsigned int a, r, g, b; unsigned int a, r, g, b;
...@@ -205,16 +208,16 @@ static void sti_cursor_init(struct sti_layer *layer) ...@@ -205,16 +208,16 @@ static void sti_cursor_init(struct sti_layer *layer)
(b * 5); (b * 5);
} }
static const struct sti_layer_funcs cursor_ops = { static const struct sti_plane_funcs cursor_plane_ops = {
.get_formats = sti_cursor_get_formats, .get_formats = sti_cursor_get_formats,
.get_nb_formats = sti_cursor_get_nb_formats, .get_nb_formats = sti_cursor_get_nb_formats,
.init = sti_cursor_init, .prepare = sti_cursor_prepare_plane,
.prepare = sti_cursor_prepare_layer, .commit = sti_cursor_commit_plane,
.commit = sti_cursor_commit_layer, .disable = sti_cursor_disable_plane,
.disable = sti_cursor_disable_layer,
}; };
struct sti_layer *sti_cursor_create(struct device *dev) struct sti_plane *sti_cursor_create(struct device *dev, int desc,
void __iomem *baseaddr)
{ {
struct sti_cursor *cursor; struct sti_cursor *cursor;
...@@ -236,7 +239,12 @@ struct sti_layer *sti_cursor_create(struct device *dev) ...@@ -236,7 +239,12 @@ struct sti_layer *sti_cursor_create(struct device *dev)
return NULL; return NULL;
} }
cursor->layer.ops = &cursor_ops; cursor->dev = dev;
cursor->regs = baseaddr;
cursor->plane.desc = desc;
cursor->plane.ops = &cursor_plane_ops;
return (struct sti_layer *)cursor; sti_cursor_init(cursor);
return &cursor->plane;
} }
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#ifndef _STI_CURSOR_H_ #ifndef _STI_CURSOR_H_
#define _STI_CURSOR_H_ #define _STI_CURSOR_H_
struct sti_layer *sti_cursor_create(struct device *dev); struct sti_plane *sti_cursor_create(struct device *dev, int desc,
void __iomem *baseaddr);
#endif #endif
...@@ -41,7 +41,7 @@ static void sti_drm_crtc_prepare(struct drm_crtc *crtc) ...@@ -41,7 +41,7 @@ static void sti_drm_crtc_prepare(struct drm_crtc *crtc)
DRM_INFO("Failed to prepare/enable compo_aux clk\n"); DRM_INFO("Failed to prepare/enable compo_aux clk\n");
} }
sti_mixer_clear_all_layers(mixer); sti_mixer_clear_all_planes(mixer);
} }
static void sti_drm_crtc_commit(struct drm_crtc *crtc) static void sti_drm_crtc_commit(struct drm_crtc *crtc)
...@@ -49,23 +49,21 @@ static void sti_drm_crtc_commit(struct drm_crtc *crtc) ...@@ -49,23 +49,21 @@ static void sti_drm_crtc_commit(struct drm_crtc *crtc)
struct sti_mixer *mixer = to_sti_mixer(crtc); struct sti_mixer *mixer = to_sti_mixer(crtc);
struct device *dev = mixer->dev; struct device *dev = mixer->dev;
struct sti_compositor *compo = dev_get_drvdata(dev); struct sti_compositor *compo = dev_get_drvdata(dev);
struct sti_layer *layer; struct sti_plane *plane;
if ((!mixer || !compo)) { if ((!mixer || !compo)) {
DRM_ERROR("Can not find mixer or compositor)\n"); DRM_ERROR("Can't find mixer or compositor)\n");
return; return;
} }
/* get GDP which is reserved to the CRTC FB */ /* get GDP which is reserved to the CRTC FB */
layer = to_sti_layer(crtc->primary); plane = to_sti_plane(crtc->primary);
if (layer) if (!plane)
sti_layer_commit(layer); DRM_ERROR("Can't find CRTC dedicated plane (GDP0)\n");
else
DRM_ERROR("Can not find CRTC dedicated plane (GDP0)\n");
/* Enable layer on mixer */ /* Enable plane on mixer */
if (sti_mixer_set_layer_status(mixer, layer, true)) if (sti_mixer_set_plane_status(mixer, plane, true))
DRM_ERROR("Can not enable layer at mixer\n"); DRM_ERROR("Cannot enable plane at mixer\n");
drm_crtc_vblank_on(crtc); drm_crtc_vblank_on(crtc);
} }
...@@ -122,7 +120,7 @@ sti_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode) ...@@ -122,7 +120,7 @@ sti_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode)
res = sti_mixer_active_video_area(mixer, &crtc->mode); res = sti_mixer_active_video_area(mixer, &crtc->mode);
if (res) { if (res) {
DRM_ERROR("Can not set active video area\n"); DRM_ERROR("Can't set active video area\n");
return -EINVAL; return -EINVAL;
} }
...@@ -164,7 +162,7 @@ sti_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) ...@@ -164,7 +162,7 @@ sti_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
sti_drm_crtc_mode_set(crtc, &crtc->state->adjusted_mode); sti_drm_crtc_mode_set(crtc, &crtc->state->adjusted_mode);
} }
static void sti_drm_atomic_begin(struct drm_crtc *crtc) static void sti_drm_crtc_atomic_begin(struct drm_crtc *crtc)
{ {
struct sti_mixer *mixer = to_sti_mixer(crtc); struct sti_mixer *mixer = to_sti_mixer(crtc);
...@@ -178,7 +176,7 @@ static void sti_drm_atomic_begin(struct drm_crtc *crtc) ...@@ -178,7 +176,7 @@ static void sti_drm_atomic_begin(struct drm_crtc *crtc)
} }
} }
static void sti_drm_atomic_flush(struct drm_crtc *crtc) static void sti_drm_crtc_atomic_flush(struct drm_crtc *crtc)
{ {
} }
...@@ -191,8 +189,8 @@ static struct drm_crtc_helper_funcs sti_crtc_helper_funcs = { ...@@ -191,8 +189,8 @@ static struct drm_crtc_helper_funcs sti_crtc_helper_funcs = {
.mode_set_nofb = sti_drm_crtc_mode_set_nofb, .mode_set_nofb = sti_drm_crtc_mode_set_nofb,
.mode_set_base = drm_helper_crtc_mode_set_base, .mode_set_base = drm_helper_crtc_mode_set_base,
.disable = sti_drm_crtc_disable, .disable = sti_drm_crtc_disable,
.atomic_begin = sti_drm_atomic_begin, .atomic_begin = sti_drm_crtc_atomic_begin,
.atomic_flush = sti_drm_atomic_flush, .atomic_flush = sti_drm_crtc_atomic_flush,
}; };
static void sti_drm_crtc_destroy(struct drm_crtc *crtc) static void sti_drm_crtc_destroy(struct drm_crtc *crtc)
...@@ -248,6 +246,8 @@ int sti_drm_crtc_enable_vblank(struct drm_device *dev, int crtc) ...@@ -248,6 +246,8 @@ int sti_drm_crtc_enable_vblank(struct drm_device *dev, int crtc)
struct sti_compositor *compo = dev_priv->compo; struct sti_compositor *compo = dev_priv->compo;
struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb; struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb;
DRM_DEBUG_DRIVER("\n");
if (sti_vtg_register_client(crtc == STI_MIXER_MAIN ? if (sti_vtg_register_client(crtc == STI_MIXER_MAIN ?
compo->vtg_main : compo->vtg_aux, compo->vtg_main : compo->vtg_aux,
vtg_vblank_nb, crtc)) { vtg_vblank_nb, crtc)) {
...@@ -309,7 +309,7 @@ int sti_drm_crtc_init(struct drm_device *drm_dev, struct sti_mixer *mixer, ...@@ -309,7 +309,7 @@ int sti_drm_crtc_init(struct drm_device *drm_dev, struct sti_mixer *mixer,
res = drm_crtc_init_with_planes(drm_dev, crtc, primary, cursor, res = drm_crtc_init_with_planes(drm_dev, crtc, primary, cursor,
&sti_crtc_funcs); &sti_crtc_funcs);
if (res) { if (res) {
DRM_ERROR("Can not initialze CRTC\n"); DRM_ERROR("Can't initialze CRTC\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_fb_cma_helper.h>
#include <drm/drm_plane_helper.h> #include <drm/drm_plane_helper.h>
#include "sti_compositor.h" #include "sti_compositor.h"
...@@ -15,120 +17,165 @@ ...@@ -15,120 +17,165 @@
#include "sti_drm_plane.h" #include "sti_drm_plane.h"
#include "sti_vtg.h" #include "sti_vtg.h"
/* (Background) < GDP0 < GDP1 < VID0 < VID1 < GDP2 < GDP3 < (ForeGround) */ /* (Background) < GDP0 < GDP1 < HQVDP0 < GDP2 < GDP3 < (ForeGround) */
enum sti_layer_desc sti_layer_default_zorder[] = { enum sti_plane_desc sti_plane_default_zorder[] = {
STI_GDP_0, STI_GDP_0,
STI_GDP_1, STI_GDP_1,
STI_VID_0, STI_HQVDP_0,
STI_VID_1,
STI_GDP_2, STI_GDP_2,
STI_GDP_3, STI_GDP_3,
}; };
static int const char *sti_plane_to_str(struct sti_plane *plane)
sti_drm_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
struct drm_framebuffer *fb, int crtc_x, int crtc_y,
unsigned int crtc_w, unsigned int crtc_h,
uint32_t src_x, uint32_t src_y,
uint32_t src_w, uint32_t src_h)
{ {
struct sti_layer *layer = to_sti_layer(plane); switch (plane->desc) {
struct sti_mixer *mixer = to_sti_mixer(crtc); case STI_GDP_0:
return "GDP0";
case STI_GDP_1:
return "GDP1";
case STI_GDP_2:
return "GDP2";
case STI_GDP_3:
return "GDP3";
case STI_HQVDP_0:
return "HQVDP0";
case STI_CURSOR:
return "CURSOR";
default:
return "<UNKNOWN PLANE>";
}
}
EXPORT_SYMBOL(sti_plane_to_str);
static int sti_plane_prepare(struct sti_plane *plane,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
struct drm_display_mode *mode, int mixer_id,
int dest_x, int dest_y, int dest_w, int dest_h,
int src_x, int src_y, int src_w, int src_h)
{
struct drm_gem_cma_object *cma_obj;
unsigned int i;
int res; int res;
DRM_DEBUG_KMS("CRTC:%d (%s) drm plane:%d (%s)\n", if (!plane || !fb || !mode) {
crtc->base.id, sti_mixer_to_str(mixer), DRM_ERROR("Null fb, plane or mode\n");
plane->base.id, sti_layer_to_str(layer)); return 1;
DRM_DEBUG_KMS("(%dx%d)@(%d,%d)\n", crtc_w, crtc_h, crtc_x, crtc_y); }
res = sti_mixer_set_layer_depth(mixer, layer); cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
if (res) { if (!cma_obj) {
DRM_ERROR("Can not set layer depth\n"); DRM_ERROR("Can't get CMA GEM object for fb\n");
return res; return 1;
} }
/* src_x are in 16.16 format. */ plane->fb = fb;
res = sti_layer_prepare(layer, crtc, fb, plane->mode = mode;
&crtc->mode, mixer->id, plane->mixer_id = mixer_id;
crtc_x, crtc_y, crtc_w, crtc_h, plane->dst_x = dest_x;
src_x >> 16, src_y >> 16, plane->dst_y = dest_y;
src_w >> 16, src_h >> 16); plane->dst_w = clamp_val(dest_w, 0, mode->crtc_hdisplay - dest_x);
if (res) { plane->dst_h = clamp_val(dest_h, 0, mode->crtc_vdisplay - dest_y);
DRM_ERROR("Layer prepare failed\n"); plane->src_x = src_x;
return res; plane->src_y = src_y;
plane->src_w = src_w;
plane->src_h = src_h;
plane->format = fb->pixel_format;
plane->vaddr = cma_obj->vaddr;
plane->paddr = cma_obj->paddr;
for (i = 0; i < 4; i++) {
plane->pitches[i] = fb->pitches[i];
plane->offsets[i] = fb->offsets[i];
} }
res = sti_layer_commit(layer); DRM_DEBUG_DRIVER("%s is associated with mixer_id %d\n",
if (res) { sti_plane_to_str(plane),
DRM_ERROR("Layer commit failed\n"); plane->mixer_id);
return res; DRM_DEBUG_DRIVER("%s dst=(%dx%d)@(%d,%d) - src=(%dx%d)@(%d,%d)\n",
sti_plane_to_str(plane),
plane->dst_w, plane->dst_h, plane->dst_x, plane->dst_y,
plane->src_w, plane->src_h, plane->src_x,
plane->src_y);
DRM_DEBUG_DRIVER("drm FB:%d format:%.4s phys@:0x%lx\n", fb->base.id,
(char *)&plane->format, (unsigned long)plane->paddr);
if (!plane->ops->prepare) {
DRM_ERROR("Cannot prepare\n");
return 1;
} }
res = sti_mixer_set_layer_status(mixer, layer, true); res = plane->ops->prepare(plane, !plane->enabled);
if (res) { if (res) {
DRM_ERROR("Can not enable layer at mixer\n"); DRM_ERROR("Plane prepare failed\n");
return res; return res;
} }
plane->enabled = true;
return 0; return 0;
} }
static int sti_drm_disable_plane(struct drm_plane *plane) static int sti_plane_commit(struct sti_plane *plane)
{ {
struct sti_layer *layer; if (!plane)
struct sti_mixer *mixer; return 1;
int lay_res, mix_res;
if (!plane->crtc) { if (!plane->ops->commit) {
DRM_DEBUG_DRIVER("drm plane:%d not enabled\n", plane->base.id); DRM_ERROR("Cannot commit\n");
return 0; return 1;
} }
layer = to_sti_layer(plane);
mixer = to_sti_mixer(plane->crtc);
DRM_DEBUG_DRIVER("CRTC:%d (%s) drm plane:%d (%s)\n", return plane->ops->commit(plane);
plane->crtc->base.id, sti_mixer_to_str(mixer), }
plane->base.id, sti_layer_to_str(layer));
/* Disable layer at mixer level */ static int sti_plane_disable(struct sti_plane *plane)
mix_res = sti_mixer_set_layer_status(mixer, layer, false); {
if (mix_res) int res;
DRM_ERROR("Can not disable layer at mixer\n");
/* Wait a while to be sure that a Vsync event is received */ DRM_DEBUG_DRIVER("%s\n", sti_plane_to_str(plane));
msleep(WAIT_NEXT_VSYNC_MS); if (!plane)
return 1;
/* Then disable layer itself */ if (!plane->enabled)
lay_res = sti_layer_disable(layer); return 0;
if (lay_res)
DRM_ERROR("Layer disable failed\n");
if (lay_res || mix_res) if (!plane->ops->disable) {
return -EINVAL; DRM_ERROR("Cannot disable\n");
return 1;
}
res = plane->ops->disable(plane);
if (res) {
DRM_ERROR("Plane disable failed\n");
return res;
}
plane->enabled = false;
return 0; return 0;
} }
static void sti_drm_plane_destroy(struct drm_plane *plane) static void sti_drm_plane_destroy(struct drm_plane *drm_plane)
{ {
DRM_DEBUG_DRIVER("\n"); DRM_DEBUG_DRIVER("\n");
drm_plane_helper_disable(plane); drm_plane_helper_disable(drm_plane);
drm_plane_cleanup(plane); drm_plane_cleanup(drm_plane);
} }
static int sti_drm_plane_set_property(struct drm_plane *plane, static int sti_drm_plane_set_property(struct drm_plane *drm_plane,
struct drm_property *property, struct drm_property *property,
uint64_t val) uint64_t val)
{ {
struct drm_device *dev = plane->dev; struct drm_device *dev = drm_plane->dev;
struct sti_drm_private *private = dev->dev_private; struct sti_drm_private *private = dev->dev_private;
struct sti_layer *layer = to_sti_layer(plane); struct sti_plane *plane = to_sti_plane(drm_plane);
DRM_DEBUG_DRIVER("\n"); DRM_DEBUG_DRIVER("\n");
if (property == private->plane_zorder_property) { if (property == private->plane_zorder_property) {
layer->zorder = val; plane->zorder = val;
return 0; return 0;
} }
...@@ -145,57 +192,105 @@ static struct drm_plane_funcs sti_drm_plane_funcs = { ...@@ -145,57 +192,105 @@ static struct drm_plane_funcs sti_drm_plane_funcs = {
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state, .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
}; };
static int sti_drm_plane_prepare_fb(struct drm_plane *plane, static int sti_drm_plane_atomic_check(struct drm_plane *drm_plane,
struct drm_framebuffer *fb,
const struct drm_plane_state *new_state)
{
return 0;
}
static void sti_drm_plane_cleanup_fb(struct drm_plane *plane,
struct drm_framebuffer *fb,
const struct drm_plane_state *old_fb)
{
}
static int sti_drm_plane_atomic_check(struct drm_plane *plane,
struct drm_plane_state *state) struct drm_plane_state *state)
{ {
return 0; return 0;
} }
static void sti_drm_plane_atomic_update(struct drm_plane *plane, static void sti_drm_plane_atomic_update(struct drm_plane *drm_plane,
struct drm_plane_state *oldstate) struct drm_plane_state *oldstate)
{ {
struct drm_plane_state *state = plane->state; struct drm_plane_state *state = drm_plane->state;
struct sti_plane *plane = to_sti_plane(drm_plane);
struct sti_mixer *mixer = to_sti_mixer(state->crtc);
int res;
DRM_DEBUG_KMS("CRTC:%d (%s) drm plane:%d (%s)\n",
state->crtc->base.id, sti_mixer_to_str(mixer),
drm_plane->base.id, sti_plane_to_str(plane));
DRM_DEBUG_KMS("(%dx%d)@(%d,%d)\n",
state->crtc_w, state->crtc_h,
state->crtc_x, state->crtc_y);
res = sti_mixer_set_plane_depth(mixer, plane);
if (res) {
DRM_ERROR("Cannot set plane depth\n");
return;
}
sti_drm_update_plane(plane, state->crtc, state->fb, /* src_x are in 16.16 format */
state->crtc_x, state->crtc_y, res = sti_plane_prepare(plane, state->crtc, state->fb,
state->crtc_w, state->crtc_h, &state->crtc->mode, mixer->id,
state->src_x, state->src_y, state->crtc_x, state->crtc_y,
state->src_w, state->src_h); state->crtc_w, state->crtc_h,
state->src_x >> 16, state->src_y >> 16,
state->src_w >> 16, state->src_h >> 16);
if (res) {
DRM_ERROR("Plane prepare failed\n");
return;
}
res = sti_plane_commit(plane);
if (res) {
DRM_ERROR("Plane commit failed\n");
return;
}
res = sti_mixer_set_plane_status(mixer, plane, true);
if (res) {
DRM_ERROR("Cannot enable plane at mixer\n");
return;
}
} }
static void sti_drm_plane_atomic_disable(struct drm_plane *plane, static void sti_drm_plane_atomic_disable(struct drm_plane *drm_plane,
struct drm_plane_state *oldstate) struct drm_plane_state *oldstate)
{ {
sti_drm_disable_plane(plane); struct sti_plane *plane = to_sti_plane(drm_plane);
struct sti_mixer *mixer = to_sti_mixer(drm_plane->crtc);
int res;
if (!drm_plane->crtc) {
DRM_DEBUG_DRIVER("drm plane:%d not enabled\n",
drm_plane->base.id);
return;
}
DRM_DEBUG_DRIVER("CRTC:%d (%s) drm plane:%d (%s)\n",
drm_plane->crtc->base.id, sti_mixer_to_str(mixer),
drm_plane->base.id, sti_plane_to_str(plane));
/* Disable plane at mixer level */
res = sti_mixer_set_plane_status(mixer, plane, false);
if (res) {
DRM_ERROR("Cannot disable plane at mixer\n");
return;
}
/* Wait a while to be sure that a Vsync event is received */
msleep(WAIT_NEXT_VSYNC_MS);
/* Then disable plane itself */
res = sti_plane_disable(plane);
if (res) {
DRM_ERROR("Plane disable failed\n");
return;
}
} }
static const struct drm_plane_helper_funcs sti_drm_plane_helpers_funcs = { static const struct drm_plane_helper_funcs sti_drm_plane_helpers_funcs = {
.prepare_fb = sti_drm_plane_prepare_fb,
.cleanup_fb = sti_drm_plane_cleanup_fb,
.atomic_check = sti_drm_plane_atomic_check, .atomic_check = sti_drm_plane_atomic_check,
.atomic_update = sti_drm_plane_atomic_update, .atomic_update = sti_drm_plane_atomic_update,
.atomic_disable = sti_drm_plane_atomic_disable, .atomic_disable = sti_drm_plane_atomic_disable,
}; };
static void sti_drm_plane_attach_zorder_property(struct drm_plane *plane) static void sti_drm_plane_attach_zorder_property(struct drm_plane *drm_plane)
{ {
struct drm_device *dev = plane->dev; struct drm_device *dev = drm_plane->dev;
struct sti_drm_private *private = dev->dev_private; struct sti_drm_private *private = dev->dev_private;
struct sti_plane *plane = to_sti_plane(drm_plane);
struct drm_property *prop; struct drm_property *prop;
struct sti_layer *layer = to_sti_layer(plane);
prop = private->plane_zorder_property; prop = private->plane_zorder_property;
if (!prop) { if (!prop) {
...@@ -207,40 +302,43 @@ static void sti_drm_plane_attach_zorder_property(struct drm_plane *plane) ...@@ -207,40 +302,43 @@ static void sti_drm_plane_attach_zorder_property(struct drm_plane *plane)
private->plane_zorder_property = prop; private->plane_zorder_property = prop;
} }
drm_object_attach_property(&plane->base, prop, layer->zorder); drm_object_attach_property(&drm_plane->base, prop, plane->zorder);
} }
struct drm_plane *sti_drm_plane_init(struct drm_device *dev, struct drm_plane *sti_drm_plane_init(struct drm_device *dev,
struct sti_layer *layer, struct sti_plane *plane,
unsigned int possible_crtcs, unsigned int possible_crtcs,
enum drm_plane_type type) enum drm_plane_type type)
{ {
int err, i; int err, i;
err = drm_universal_plane_init(dev, &layer->plane, possible_crtcs, err = drm_universal_plane_init(dev, &plane->drm_plane,
&sti_drm_plane_funcs, possible_crtcs,
sti_layer_get_formats(layer), &sti_drm_plane_funcs,
sti_layer_get_nb_formats(layer), type); plane->ops->get_formats(plane),
plane->ops->get_nb_formats(plane),
type);
if (err) { if (err) {
DRM_ERROR("Failed to initialize plane\n"); DRM_ERROR("Failed to initialize universal plane\n");
return NULL; return NULL;
} }
drm_plane_helper_add(&layer->plane, &sti_drm_plane_helpers_funcs); drm_plane_helper_add(&plane->drm_plane,
&sti_drm_plane_helpers_funcs);
for (i = 0; i < ARRAY_SIZE(sti_layer_default_zorder); i++) for (i = 0; i < ARRAY_SIZE(sti_plane_default_zorder); i++)
if (sti_layer_default_zorder[i] == layer->desc) if (sti_plane_default_zorder[i] == plane->desc)
break; break;
layer->zorder = i + 1; plane->zorder = i + 1;
if (type == DRM_PLANE_TYPE_OVERLAY) if (type == DRM_PLANE_TYPE_OVERLAY)
sti_drm_plane_attach_zorder_property(&layer->plane); sti_drm_plane_attach_zorder_property(&plane->drm_plane);
DRM_DEBUG_DRIVER("drm plane:%d mapped to %s with zorder:%llu\n", DRM_DEBUG_DRIVER("drm plane:%d mapped to %s with zorder:%d\n",
layer->plane.base.id, plane->drm_plane.base.id,
sti_layer_to_str(layer), layer->zorder); sti_plane_to_str(plane), plane->zorder);
return &layer->plane; return &plane->drm_plane;
} }
EXPORT_SYMBOL(sti_drm_plane_init); EXPORT_SYMBOL(sti_drm_plane_init);
...@@ -9,10 +9,97 @@ ...@@ -9,10 +9,97 @@
#include <drm/drmP.h> #include <drm/drmP.h>
struct sti_layer; #define to_sti_plane(x) container_of(x, struct sti_plane, drm_plane)
#define STI_PLANE_TYPE_SHIFT 8
#define STI_PLANE_TYPE_MASK (~((1 << STI_PLANE_TYPE_SHIFT) - 1))
enum sti_plane_type {
STI_GDP = 1 << STI_PLANE_TYPE_SHIFT,
STI_VDP = 2 << STI_PLANE_TYPE_SHIFT,
STI_CUR = 3 << STI_PLANE_TYPE_SHIFT,
STI_BCK = 4 << STI_PLANE_TYPE_SHIFT
};
enum sti_plane_id_of_type {
STI_ID_0 = 0,
STI_ID_1 = 1,
STI_ID_2 = 2,
STI_ID_3 = 3
};
enum sti_plane_desc {
STI_GDP_0 = STI_GDP | STI_ID_0,
STI_GDP_1 = STI_GDP | STI_ID_1,
STI_GDP_2 = STI_GDP | STI_ID_2,
STI_GDP_3 = STI_GDP | STI_ID_3,
STI_HQVDP_0 = STI_VDP | STI_ID_0,
STI_CURSOR = STI_CUR,
STI_BACK = STI_BCK
};
/**
* STI plane structure
*
* @plane: drm plane it is bound to (if any)
* @fb: drm fb it is bound to
* @mode: display mode
* @desc: plane type & id
* @ops: plane functions
* @zorder: plane z-order
* @mixer_id: id of the mixer used to display the plane
* @enabled: to know if the plane is active or not
* @src_x src_y: coordinates of the input (fb) area
* @src_w src_h: size of the input (fb) area
* @dst_x dst_y: coordinates of the output (crtc) area
* @dst_w dst_h: size of the output (crtc) area
* @format: format
* @pitches: pitch of 'planes' (eg: Y, U, V)
* @offsets: offset of 'planes'
* @vaddr: virtual address of the input buffer
* @paddr: physical address of the input buffer
*/
struct sti_plane {
struct drm_plane drm_plane;
struct drm_framebuffer *fb;
struct drm_display_mode *mode;
enum sti_plane_desc desc;
const struct sti_plane_funcs *ops;
int zorder;
int mixer_id;
bool enabled;
int src_x, src_y;
int src_w, src_h;
int dst_x, dst_y;
int dst_w, dst_h;
uint32_t format;
unsigned int pitches[4];
unsigned int offsets[4];
void *vaddr;
dma_addr_t paddr;
};
/**
* STI plane functions structure
*
* @get_formats: get plane supported formats
* @get_nb_formats: get number of format supported
* @prepare: prepare plane before rendering
* @commit: set plane for rendering
* @disable: disable plane
*/
struct sti_plane_funcs {
const uint32_t* (*get_formats)(struct sti_plane *plane);
unsigned int (*get_nb_formats)(struct sti_plane *plane);
int (*prepare)(struct sti_plane *plane, bool first_prepare);
int (*commit)(struct sti_plane *plane);
int (*disable)(struct sti_plane *plane);
};
struct drm_plane *sti_drm_plane_init(struct drm_device *dev, struct drm_plane *sti_drm_plane_init(struct drm_device *dev,
struct sti_layer *layer, struct sti_plane *sti_plane,
unsigned int possible_crtcs, unsigned int possible_crtcs,
enum drm_plane_type type); enum drm_plane_type type);
const char *sti_plane_to_str(struct sti_plane *plane);
#endif #endif
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include "sti_compositor.h" #include "sti_compositor.h"
#include "sti_drm_plane.h"
#include "sti_gdp.h" #include "sti_gdp.h"
#include "sti_layer.h"
#include "sti_vtg.h" #include "sti_vtg.h"
#define ALPHASWITCH BIT(6) #define ALPHASWITCH BIT(6)
...@@ -85,16 +85,20 @@ struct sti_gdp_node_list { ...@@ -85,16 +85,20 @@ struct sti_gdp_node_list {
/** /**
* STI GDP structure * STI GDP structure
* *
* @layer: layer structure * @sti_plane: sti_plane structure
* @dev: driver device
* @regs: gdp registers
* @clk_pix: pixel clock for the current gdp * @clk_pix: pixel clock for the current gdp
* @clk_main_parent: gdp parent clock if main path used * @clk_main_parent: gdp parent clock if main path used
* @clk_aux_parent: gdp parent clock if aux path used * @clk_aux_parent: gdp parent clock if aux path used
* @vtg_field_nb: callback for VTG FIELD (top or bottom) notification * @vtg_field_nb: callback for VTG FIELD (top or bottom) notification
* @is_curr_top: true if the current node processed is the top field * @is_curr_top: true if the current node processed is the top field
* @node_list: array of node list * @node_list: array of node list
*/ */
struct sti_gdp { struct sti_gdp {
struct sti_layer layer; struct sti_plane plane;
struct device *dev;
void __iomem *regs;
struct clk *clk_pix; struct clk *clk_pix;
struct clk *clk_main_parent; struct clk *clk_main_parent;
struct clk *clk_aux_parent; struct clk *clk_aux_parent;
...@@ -103,7 +107,7 @@ struct sti_gdp { ...@@ -103,7 +107,7 @@ struct sti_gdp {
struct sti_gdp_node_list node_list[GDP_NODE_NB_BANK]; struct sti_gdp_node_list node_list[GDP_NODE_NB_BANK];
}; };
#define to_sti_gdp(x) container_of(x, struct sti_gdp, layer) #define to_sti_gdp(x) container_of(x, struct sti_gdp, plane)
static const uint32_t gdp_supported_formats[] = { static const uint32_t gdp_supported_formats[] = {
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
...@@ -120,12 +124,12 @@ static const uint32_t gdp_supported_formats[] = { ...@@ -120,12 +124,12 @@ static const uint32_t gdp_supported_formats[] = {
DRM_FORMAT_C8, DRM_FORMAT_C8,
}; };
static const uint32_t *sti_gdp_get_formats(struct sti_layer *layer) static const uint32_t *sti_gdp_get_formats(struct sti_plane *plane)
{ {
return gdp_supported_formats; return gdp_supported_formats;
} }
static unsigned int sti_gdp_get_nb_formats(struct sti_layer *layer) static unsigned int sti_gdp_get_nb_formats(struct sti_plane *plane)
{ {
return ARRAY_SIZE(gdp_supported_formats); return ARRAY_SIZE(gdp_supported_formats);
} }
...@@ -175,20 +179,20 @@ static int sti_gdp_get_alpharange(int format) ...@@ -175,20 +179,20 @@ static int sti_gdp_get_alpharange(int format)
/** /**
* sti_gdp_get_free_nodes * sti_gdp_get_free_nodes
* @layer: gdp layer * @plane: gdp plane
* *
* Look for a GDP node list that is not currently read by the HW. * Look for a GDP node list that is not currently read by the HW.
* *
* RETURNS: * RETURNS:
* Pointer to the free GDP node list * Pointer to the free GDP node list
*/ */
static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_layer *layer) static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_plane *plane)
{ {
int hw_nvn; int hw_nvn;
struct sti_gdp *gdp = to_sti_gdp(layer); struct sti_gdp *gdp = to_sti_gdp(plane);
unsigned int i; unsigned int i;
hw_nvn = readl(layer->regs + GAM_GDP_NVN_OFFSET); hw_nvn = readl(gdp->regs + GAM_GDP_NVN_OFFSET);
if (!hw_nvn) if (!hw_nvn)
goto end; goto end;
...@@ -199,7 +203,7 @@ static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_layer *layer) ...@@ -199,7 +203,7 @@ static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_layer *layer)
/* in hazardious cases restart with the first node */ /* in hazardious cases restart with the first node */
DRM_ERROR("inconsistent NVN for %s: 0x%08X\n", DRM_ERROR("inconsistent NVN for %s: 0x%08X\n",
sti_layer_to_str(layer), hw_nvn); sti_plane_to_str(plane), hw_nvn);
end: end:
return &gdp->node_list[0]; return &gdp->node_list[0];
...@@ -207,7 +211,7 @@ static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_layer *layer) ...@@ -207,7 +211,7 @@ static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_layer *layer)
/** /**
* sti_gdp_get_current_nodes * sti_gdp_get_current_nodes
* @layer: GDP layer * @plane: GDP plane
* *
* Look for GDP nodes that are currently read by the HW. * Look for GDP nodes that are currently read by the HW.
* *
...@@ -215,13 +219,13 @@ static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_layer *layer) ...@@ -215,13 +219,13 @@ static struct sti_gdp_node_list *sti_gdp_get_free_nodes(struct sti_layer *layer)
* Pointer to the current GDP node list * Pointer to the current GDP node list
*/ */
static static
struct sti_gdp_node_list *sti_gdp_get_current_nodes(struct sti_layer *layer) struct sti_gdp_node_list *sti_gdp_get_current_nodes(struct sti_plane *plane)
{ {
int hw_nvn; int hw_nvn;
struct sti_gdp *gdp = to_sti_gdp(layer); struct sti_gdp *gdp = to_sti_gdp(plane);
unsigned int i; unsigned int i;
hw_nvn = readl(layer->regs + GAM_GDP_NVN_OFFSET); hw_nvn = readl(gdp->regs + GAM_GDP_NVN_OFFSET);
if (!hw_nvn) if (!hw_nvn)
goto end; goto end;
...@@ -232,28 +236,28 @@ struct sti_gdp_node_list *sti_gdp_get_current_nodes(struct sti_layer *layer) ...@@ -232,28 +236,28 @@ struct sti_gdp_node_list *sti_gdp_get_current_nodes(struct sti_layer *layer)
end: end:
DRM_DEBUG_DRIVER("Warning, NVN 0x%08X for %s does not match any node\n", DRM_DEBUG_DRIVER("Warning, NVN 0x%08X for %s does not match any node\n",
hw_nvn, sti_layer_to_str(layer)); hw_nvn, sti_plane_to_str(plane));
return NULL; return NULL;
} }
/** /**
* sti_gdp_prepare_layer * sti_gdp_prepare
* @lay: gdp layer * @plane: gdp plane
* @first_prepare: true if it is the first time this function is called * @first_prepare: true if it is the first time this function is called
* *
* Update the free GDP node list according to the layer properties. * Update the free GDP node list according to the plane properties.
* *
* RETURNS: * RETURNS:
* 0 on success. * 0 on success.
*/ */
static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare) static int sti_gdp_prepare(struct sti_plane *plane, bool first_prepare)
{ {
struct sti_gdp_node_list *list; struct sti_gdp_node_list *list;
struct sti_gdp_node *top_field, *btm_field; struct sti_gdp_node *top_field, *btm_field;
struct drm_display_mode *mode = layer->mode; struct drm_display_mode *mode = plane->mode;
struct device *dev = layer->dev; struct sti_gdp *gdp = to_sti_gdp(plane);
struct sti_gdp *gdp = to_sti_gdp(layer); struct device *dev = gdp->dev;
struct sti_compositor *compo = dev_get_drvdata(dev); struct sti_compositor *compo = dev_get_drvdata(dev);
int format; int format;
unsigned int depth, bpp; unsigned int depth, bpp;
...@@ -261,20 +265,20 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -261,20 +265,20 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
int res; int res;
u32 ydo, xdo, yds, xds; u32 ydo, xdo, yds, xds;
list = sti_gdp_get_free_nodes(layer); list = sti_gdp_get_free_nodes(plane);
top_field = list->top_field; top_field = list->top_field;
btm_field = list->btm_field; btm_field = list->btm_field;
dev_dbg(dev, "%s %s top_node:0x%p btm_node:0x%p\n", __func__, dev_dbg(dev, "%s %s top_node:0x%p btm_node:0x%p\n", __func__,
sti_layer_to_str(layer), top_field, btm_field); sti_plane_to_str(plane), top_field, btm_field);
/* Build the top field from layer params */ /* Build the top field from plane params */
top_field->gam_gdp_agc = GAM_GDP_AGC_FULL_RANGE; top_field->gam_gdp_agc = GAM_GDP_AGC_FULL_RANGE;
top_field->gam_gdp_ctl = WAIT_NEXT_VSYNC; top_field->gam_gdp_ctl = WAIT_NEXT_VSYNC;
format = sti_gdp_fourcc2format(layer->format); format = sti_gdp_fourcc2format(plane->format);
if (format == -1) { if (format == -1) {
DRM_ERROR("Format not supported by GDP %.4s\n", DRM_ERROR("Format not supported by GDP %.4s\n",
(char *)&layer->format); (char *)&plane->format);
return 1; return 1;
} }
top_field->gam_gdp_ctl |= format; top_field->gam_gdp_ctl |= format;
...@@ -282,22 +286,22 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -282,22 +286,22 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
top_field->gam_gdp_ppt &= ~GAM_GDP_PPT_IGNORE; top_field->gam_gdp_ppt &= ~GAM_GDP_PPT_IGNORE;
/* pixel memory location */ /* pixel memory location */
drm_fb_get_bpp_depth(layer->format, &depth, &bpp); drm_fb_get_bpp_depth(plane->format, &depth, &bpp);
top_field->gam_gdp_pml = (u32) layer->paddr + layer->offsets[0]; top_field->gam_gdp_pml = (u32)plane->paddr + plane->offsets[0];
top_field->gam_gdp_pml += layer->src_x * (bpp >> 3); top_field->gam_gdp_pml += plane->src_x * (bpp >> 3);
top_field->gam_gdp_pml += layer->src_y * layer->pitches[0]; top_field->gam_gdp_pml += plane->src_y * plane->pitches[0];
/* input parameters */ /* input parameters */
top_field->gam_gdp_pmp = layer->pitches[0]; top_field->gam_gdp_pmp = plane->pitches[0];
top_field->gam_gdp_size = top_field->gam_gdp_size =
clamp_val(layer->src_h, 0, GAM_GDP_SIZE_MAX) << 16 | clamp_val(plane->src_h, 0, GAM_GDP_SIZE_MAX) << 16 |
clamp_val(layer->src_w, 0, GAM_GDP_SIZE_MAX); clamp_val(plane->src_w, 0, GAM_GDP_SIZE_MAX);
/* output parameters */ /* output parameters */
ydo = sti_vtg_get_line_number(*mode, layer->dst_y); ydo = sti_vtg_get_line_number(*mode, plane->dst_y);
yds = sti_vtg_get_line_number(*mode, layer->dst_y + layer->dst_h - 1); yds = sti_vtg_get_line_number(*mode, plane->dst_y + plane->dst_h - 1);
xdo = sti_vtg_get_pixel_number(*mode, layer->dst_x); xdo = sti_vtg_get_pixel_number(*mode, plane->dst_x);
xds = sti_vtg_get_pixel_number(*mode, layer->dst_x + layer->dst_w - 1); xds = sti_vtg_get_pixel_number(*mode, plane->dst_x + plane->dst_w - 1);
top_field->gam_gdp_vpo = (ydo << 16) | xdo; top_field->gam_gdp_vpo = (ydo << 16) | xdo;
top_field->gam_gdp_vps = (yds << 16) | xds; top_field->gam_gdp_vps = (yds << 16) | xds;
...@@ -307,15 +311,15 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -307,15 +311,15 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
btm_field->gam_gdp_nvn = list->top_field_paddr; btm_field->gam_gdp_nvn = list->top_field_paddr;
/* Interlaced mode */ /* Interlaced mode */
if (layer->mode->flags & DRM_MODE_FLAG_INTERLACE) if (plane->mode->flags & DRM_MODE_FLAG_INTERLACE)
btm_field->gam_gdp_pml = top_field->gam_gdp_pml + btm_field->gam_gdp_pml = top_field->gam_gdp_pml +
layer->pitches[0]; plane->pitches[0];
if (first_prepare) { if (first_prepare) {
/* Register gdp callback */ /* Register gdp callback */
if (sti_vtg_register_client(layer->mixer_id == STI_MIXER_MAIN ? if (sti_vtg_register_client(plane->mixer_id == STI_MIXER_MAIN ?
compo->vtg_main : compo->vtg_aux, compo->vtg_main : compo->vtg_aux,
&gdp->vtg_field_nb, layer->mixer_id)) { &gdp->vtg_field_nb, plane->mixer_id)) {
DRM_ERROR("Cannot register VTG notifier\n"); DRM_ERROR("Cannot register VTG notifier\n");
return 1; return 1;
} }
...@@ -325,7 +329,7 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -325,7 +329,7 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
struct clk *clkp; struct clk *clkp;
/* According to the mixer used, the gdp pixel clock /* According to the mixer used, the gdp pixel clock
* should have a different parent clock. */ * should have a different parent clock. */
if (layer->mixer_id == STI_MIXER_MAIN) if (plane->mixer_id == STI_MIXER_MAIN)
clkp = gdp->clk_main_parent; clkp = gdp->clk_main_parent;
else else
clkp = gdp->clk_aux_parent; clkp = gdp->clk_aux_parent;
...@@ -351,8 +355,8 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -351,8 +355,8 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
} }
/** /**
* sti_gdp_commit_layer * sti_gdp_commit
* @lay: gdp layer * @plane: gdp plane
* *
* Update the NVN field of the 'right' field of the current GDP node (being * Update the NVN field of the 'right' field of the current GDP node (being
* used by the HW) with the address of the updated ('free') top field GDP node. * used by the HW) with the address of the updated ('free') top field GDP node.
...@@ -365,38 +369,38 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -365,38 +369,38 @@ static int sti_gdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
* RETURNS: * RETURNS:
* 0 on success. * 0 on success.
*/ */
static int sti_gdp_commit_layer(struct sti_layer *layer) static int sti_gdp_commit(struct sti_plane *plane)
{ {
struct sti_gdp_node_list *updated_list = sti_gdp_get_free_nodes(layer); struct sti_gdp_node_list *updated_list = sti_gdp_get_free_nodes(plane);
struct sti_gdp_node *updated_top_node = updated_list->top_field; struct sti_gdp_node *updated_top_node = updated_list->top_field;
struct sti_gdp_node *updated_btm_node = updated_list->btm_field; struct sti_gdp_node *updated_btm_node = updated_list->btm_field;
struct sti_gdp *gdp = to_sti_gdp(layer); struct sti_gdp *gdp = to_sti_gdp(plane);
u32 dma_updated_top = updated_list->top_field_paddr; u32 dma_updated_top = updated_list->top_field_paddr;
u32 dma_updated_btm = updated_list->btm_field_paddr; u32 dma_updated_btm = updated_list->btm_field_paddr;
struct sti_gdp_node_list *curr_list = sti_gdp_get_current_nodes(layer); struct sti_gdp_node_list *curr_list = sti_gdp_get_current_nodes(plane);
dev_dbg(layer->dev, "%s %s top/btm_node:0x%p/0x%p\n", __func__, dev_dbg(gdp->dev, "%s %s top/btm_node:0x%p/0x%p\n", __func__,
sti_layer_to_str(layer), sti_plane_to_str(plane),
updated_top_node, updated_btm_node); updated_top_node, updated_btm_node);
dev_dbg(layer->dev, "Current NVN:0x%X\n", dev_dbg(gdp->dev, "Current NVN:0x%X\n",
readl(layer->regs + GAM_GDP_NVN_OFFSET)); readl(gdp->regs + GAM_GDP_NVN_OFFSET));
dev_dbg(layer->dev, "Posted buff: %lx current buff: %x\n", dev_dbg(gdp->dev, "Posted buff: %lx current buff: %x\n",
(unsigned long)layer->paddr, (unsigned long)plane->paddr,
readl(layer->regs + GAM_GDP_PML_OFFSET)); readl(gdp->regs + GAM_GDP_PML_OFFSET));
if (curr_list == NULL) { if (curr_list == NULL) {
/* First update or invalid node should directly write in the /* First update or invalid node should directly write in the
* hw register */ * hw register */
DRM_DEBUG_DRIVER("%s first update (or invalid node)", DRM_DEBUG_DRIVER("%s first update (or invalid node)",
sti_layer_to_str(layer)); sti_plane_to_str(plane));
writel(gdp->is_curr_top == true ? writel(gdp->is_curr_top == true ?
dma_updated_btm : dma_updated_top, dma_updated_btm : dma_updated_top,
layer->regs + GAM_GDP_NVN_OFFSET); gdp->regs + GAM_GDP_NVN_OFFSET);
return 0; return 0;
} }
if (layer->mode->flags & DRM_MODE_FLAG_INTERLACE) { if (plane->mode->flags & DRM_MODE_FLAG_INTERLACE) {
if (gdp->is_curr_top == true) { if (gdp->is_curr_top == true) {
/* Do not update in the middle of the frame, but /* Do not update in the middle of the frame, but
* postpone the update after the bottom field has * postpone the update after the bottom field has
...@@ -405,32 +409,32 @@ static int sti_gdp_commit_layer(struct sti_layer *layer) ...@@ -405,32 +409,32 @@ static int sti_gdp_commit_layer(struct sti_layer *layer)
} else { } else {
/* Direct update to avoid one frame delay */ /* Direct update to avoid one frame delay */
writel(dma_updated_top, writel(dma_updated_top,
layer->regs + GAM_GDP_NVN_OFFSET); gdp->regs + GAM_GDP_NVN_OFFSET);
} }
} else { } else {
/* Direct update for progressive to avoid one frame delay */ /* Direct update for progressive to avoid one frame delay */
writel(dma_updated_top, layer->regs + GAM_GDP_NVN_OFFSET); writel(dma_updated_top, gdp->regs + GAM_GDP_NVN_OFFSET);
} }
return 0; return 0;
} }
/** /**
* sti_gdp_disable_layer * sti_gdp_disable
* @lay: gdp layer * @plane: gdp plane
* *
* Disable a GDP. * Disable a GDP.
* *
* RETURNS: * RETURNS:
* 0 on success. * 0 on success.
*/ */
static int sti_gdp_disable_layer(struct sti_layer *layer) static int sti_gdp_disable(struct sti_plane *plane)
{ {
unsigned int i; unsigned int i;
struct sti_gdp *gdp = to_sti_gdp(layer); struct sti_gdp *gdp = to_sti_gdp(plane);
struct sti_compositor *compo = dev_get_drvdata(layer->dev); struct sti_compositor *compo = dev_get_drvdata(gdp->dev);
DRM_DEBUG_DRIVER("%s\n", sti_layer_to_str(layer)); DRM_DEBUG_DRIVER("%s\n", sti_plane_to_str(plane));
/* Set the nodes as 'to be ignored on mixer' */ /* Set the nodes as 'to be ignored on mixer' */
for (i = 0; i < GDP_NODE_NB_BANK; i++) { for (i = 0; i < GDP_NODE_NB_BANK; i++) {
...@@ -438,7 +442,7 @@ static int sti_gdp_disable_layer(struct sti_layer *layer) ...@@ -438,7 +442,7 @@ static int sti_gdp_disable_layer(struct sti_layer *layer)
gdp->node_list[i].btm_field->gam_gdp_ppt |= GAM_GDP_PPT_IGNORE; gdp->node_list[i].btm_field->gam_gdp_ppt |= GAM_GDP_PPT_IGNORE;
} }
if (sti_vtg_unregister_client(layer->mixer_id == STI_MIXER_MAIN ? if (sti_vtg_unregister_client(plane->mixer_id == STI_MIXER_MAIN ?
compo->vtg_main : compo->vtg_aux, &gdp->vtg_field_nb)) compo->vtg_main : compo->vtg_aux, &gdp->vtg_field_nb))
DRM_DEBUG_DRIVER("Warning: cannot unregister VTG notifier\n"); DRM_DEBUG_DRIVER("Warning: cannot unregister VTG notifier\n");
...@@ -479,10 +483,9 @@ int sti_gdp_field_cb(struct notifier_block *nb, ...@@ -479,10 +483,9 @@ int sti_gdp_field_cb(struct notifier_block *nb,
return 0; return 0;
} }
static void sti_gdp_init(struct sti_layer *layer) static void sti_gdp_init(struct sti_gdp *gdp)
{ {
struct sti_gdp *gdp = to_sti_gdp(layer); struct device_node *np = gdp->dev->of_node;
struct device_node *np = layer->dev->of_node;
dma_addr_t dma_addr; dma_addr_t dma_addr;
void *base; void *base;
unsigned int i, size; unsigned int i, size;
...@@ -490,8 +493,8 @@ static void sti_gdp_init(struct sti_layer *layer) ...@@ -490,8 +493,8 @@ static void sti_gdp_init(struct sti_layer *layer)
/* Allocate all the nodes within a single memory page */ /* Allocate all the nodes within a single memory page */
size = sizeof(struct sti_gdp_node) * size = sizeof(struct sti_gdp_node) *
GDP_NODE_PER_FIELD * GDP_NODE_NB_BANK; GDP_NODE_PER_FIELD * GDP_NODE_NB_BANK;
base = dma_alloc_writecombine(layer->dev, base = dma_alloc_writecombine(gdp->dev,
size, &dma_addr, GFP_KERNEL | GFP_DMA); size, &dma_addr, GFP_KERNEL | GFP_DMA);
if (!base) { if (!base) {
DRM_ERROR("Failed to allocate memory for GDP node\n"); DRM_ERROR("Failed to allocate memory for GDP node\n");
...@@ -526,7 +529,7 @@ static void sti_gdp_init(struct sti_layer *layer) ...@@ -526,7 +529,7 @@ static void sti_gdp_init(struct sti_layer *layer)
/* GDP of STiH407 chip have its own pixel clock */ /* GDP of STiH407 chip have its own pixel clock */
char *clk_name; char *clk_name;
switch (layer->desc) { switch (gdp->plane.desc) {
case STI_GDP_0: case STI_GDP_0:
clk_name = "pix_gdp1"; clk_name = "pix_gdp1";
break; break;
...@@ -544,30 +547,30 @@ static void sti_gdp_init(struct sti_layer *layer) ...@@ -544,30 +547,30 @@ static void sti_gdp_init(struct sti_layer *layer)
return; return;
} }
gdp->clk_pix = devm_clk_get(layer->dev, clk_name); gdp->clk_pix = devm_clk_get(gdp->dev, clk_name);
if (IS_ERR(gdp->clk_pix)) if (IS_ERR(gdp->clk_pix))
DRM_ERROR("Cannot get %s clock\n", clk_name); DRM_ERROR("Cannot get %s clock\n", clk_name);
gdp->clk_main_parent = devm_clk_get(layer->dev, "main_parent"); gdp->clk_main_parent = devm_clk_get(gdp->dev, "main_parent");
if (IS_ERR(gdp->clk_main_parent)) if (IS_ERR(gdp->clk_main_parent))
DRM_ERROR("Cannot get main_parent clock\n"); DRM_ERROR("Cannot get main_parent clock\n");
gdp->clk_aux_parent = devm_clk_get(layer->dev, "aux_parent"); gdp->clk_aux_parent = devm_clk_get(gdp->dev, "aux_parent");
if (IS_ERR(gdp->clk_aux_parent)) if (IS_ERR(gdp->clk_aux_parent))
DRM_ERROR("Cannot get aux_parent clock\n"); DRM_ERROR("Cannot get aux_parent clock\n");
} }
} }
static const struct sti_layer_funcs gdp_ops = { static const struct sti_plane_funcs gdp_plane_ops = {
.get_formats = sti_gdp_get_formats, .get_formats = sti_gdp_get_formats,
.get_nb_formats = sti_gdp_get_nb_formats, .get_nb_formats = sti_gdp_get_nb_formats,
.init = sti_gdp_init, .prepare = sti_gdp_prepare,
.prepare = sti_gdp_prepare_layer, .commit = sti_gdp_commit,
.commit = sti_gdp_commit_layer, .disable = sti_gdp_disable,
.disable = sti_gdp_disable_layer,
}; };
struct sti_layer *sti_gdp_create(struct device *dev, int id) struct sti_plane *sti_gdp_create(struct device *dev, int desc,
void __iomem *baseaddr)
{ {
struct sti_gdp *gdp; struct sti_gdp *gdp;
...@@ -577,8 +580,14 @@ struct sti_layer *sti_gdp_create(struct device *dev, int id) ...@@ -577,8 +580,14 @@ struct sti_layer *sti_gdp_create(struct device *dev, int id)
return NULL; return NULL;
} }
gdp->layer.ops = &gdp_ops; gdp->dev = dev;
gdp->regs = baseaddr;
gdp->plane.desc = desc;
gdp->plane.ops = &gdp_plane_ops;
gdp->vtg_field_nb.notifier_call = sti_gdp_field_cb; gdp->vtg_field_nb.notifier_call = sti_gdp_field_cb;
return (struct sti_layer *)gdp; sti_gdp_init(gdp);
return &gdp->plane;
} }
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
struct sti_layer *sti_gdp_create(struct device *dev, int id); struct sti_plane *sti_gdp_create(struct device *dev, int desc,
void __iomem *baseaddr);
#endif #endif
...@@ -588,7 +588,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector) ...@@ -588,7 +588,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
return count; return count;
fail: fail:
DRM_ERROR("Can not read HDMI EDID\n"); DRM_ERROR("Can't read HDMI EDID\n");
return 0; return 0;
} }
......
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include "sti_drm_plane.h" #include "sti_drm_plane.h"
#include "sti_hqvdp.h"
#include "sti_hqvdp_lut.h" #include "sti_hqvdp_lut.h"
#include "sti_layer.h"
#include "sti_vtg.h" #include "sti_vtg.h"
/* Firmware name */ /* Firmware name */
...@@ -322,8 +320,7 @@ struct sti_hqvdp_cmd { ...@@ -322,8 +320,7 @@ struct sti_hqvdp_cmd {
* @dev: driver device * @dev: driver device
* @drm_dev: the drm device * @drm_dev: the drm device
* @regs: registers * @regs: registers
* @layer: layer structure for hqvdp it self * @plane: plane structure for hqvdp it self
* @vid_plane: VID plug used as link with compositor IP
* @clk: IP clock * @clk: IP clock
* @clk_pix_main: pix main clock * @clk_pix_main: pix main clock
* @reset: reset control * @reset: reset control
...@@ -334,13 +331,13 @@ struct sti_hqvdp_cmd { ...@@ -334,13 +331,13 @@ struct sti_hqvdp_cmd {
* @hqvdp_cmd: buffer of commands * @hqvdp_cmd: buffer of commands
* @hqvdp_cmd_paddr: physical address of hqvdp_cmd * @hqvdp_cmd_paddr: physical address of hqvdp_cmd
* @vtg: vtg for main data path * @vtg: vtg for main data path
* @xp70_initialized: true if xp70 is already initialized
*/ */
struct sti_hqvdp { struct sti_hqvdp {
struct device *dev; struct device *dev;
struct drm_device *drm_dev; struct drm_device *drm_dev;
void __iomem *regs; void __iomem *regs;
struct sti_layer layer; struct sti_plane plane;
struct drm_plane *vid_plane;
struct clk *clk; struct clk *clk;
struct clk *clk_pix_main; struct clk *clk_pix_main;
struct reset_control *reset; struct reset_control *reset;
...@@ -351,20 +348,21 @@ struct sti_hqvdp { ...@@ -351,20 +348,21 @@ struct sti_hqvdp {
void *hqvdp_cmd; void *hqvdp_cmd;
dma_addr_t hqvdp_cmd_paddr; dma_addr_t hqvdp_cmd_paddr;
struct sti_vtg *vtg; struct sti_vtg *vtg;
bool xp70_initialized;
}; };
#define to_sti_hqvdp(x) container_of(x, struct sti_hqvdp, layer) #define to_sti_hqvdp(x) container_of(x, struct sti_hqvdp, plane)
static const uint32_t hqvdp_supported_formats[] = { static const uint32_t hqvdp_supported_formats[] = {
DRM_FORMAT_NV12, DRM_FORMAT_NV12,
}; };
static const uint32_t *sti_hqvdp_get_formats(struct sti_layer *layer) static const uint32_t *sti_hqvdp_get_formats(struct sti_plane *plane)
{ {
return hqvdp_supported_formats; return hqvdp_supported_formats;
} }
static unsigned int sti_hqvdp_get_nb_formats(struct sti_layer *layer) static unsigned int sti_hqvdp_get_nb_formats(struct sti_plane *plane)
{ {
return ARRAY_SIZE(hqvdp_supported_formats); return ARRAY_SIZE(hqvdp_supported_formats);
} }
...@@ -484,7 +482,7 @@ static void sti_hqvdp_update_hvsrc(enum sti_hvsrc_orient orient, int scale, ...@@ -484,7 +482,7 @@ static void sti_hqvdp_update_hvsrc(enum sti_hvsrc_orient orient, int scale,
/** /**
* sti_hqvdp_check_hw_scaling * sti_hqvdp_check_hw_scaling
* @layer: hqvdp layer * @plane: hqvdp plane
* *
* Check if the HW is able to perform the scaling request * Check if the HW is able to perform the scaling request
* The firmware scaling limitation is "CEIL(1/Zy) <= FLOOR(LFW)" where: * The firmware scaling limitation is "CEIL(1/Zy) <= FLOOR(LFW)" where:
...@@ -498,23 +496,23 @@ static void sti_hqvdp_update_hvsrc(enum sti_hvsrc_orient orient, int scale, ...@@ -498,23 +496,23 @@ static void sti_hqvdp_update_hvsrc(enum sti_hvsrc_orient orient, int scale,
* RETURNS: * RETURNS:
* True if the HW can scale. * True if the HW can scale.
*/ */
static bool sti_hqvdp_check_hw_scaling(struct sti_layer *layer) static bool sti_hqvdp_check_hw_scaling(struct sti_plane *plane)
{ {
struct sti_hqvdp *hqvdp = to_sti_hqvdp(layer); struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane);
unsigned long lfw; unsigned long lfw;
unsigned int inv_zy; unsigned int inv_zy;
lfw = layer->mode->htotal * (clk_get_rate(hqvdp->clk) / 1000000); lfw = plane->mode->htotal * (clk_get_rate(hqvdp->clk) / 1000000);
lfw /= max(layer->src_w, layer->dst_w) * layer->mode->clock / 1000; lfw /= max(plane->src_w, plane->dst_w) * plane->mode->clock / 1000;
inv_zy = DIV_ROUND_UP(layer->src_h, layer->dst_h); inv_zy = DIV_ROUND_UP(plane->src_h, plane->dst_h);
return (inv_zy <= lfw) ? true : false; return (inv_zy <= lfw) ? true : false;
} }
/** /**
* sti_hqvdp_prepare_layer * sti_hqvdp_prepare
* @layer: hqvdp layer * @plane: hqvdp plane
* @first_prepare: true if it is the first time this function is called * @first_prepare: true if it is the first time this function is called
* *
* Prepares a command for the firmware * Prepares a command for the firmware
...@@ -522,22 +520,14 @@ static bool sti_hqvdp_check_hw_scaling(struct sti_layer *layer) ...@@ -522,22 +520,14 @@ static bool sti_hqvdp_check_hw_scaling(struct sti_layer *layer)
* RETURNS: * RETURNS:
* 0 on success. * 0 on success.
*/ */
static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare) static int sti_hqvdp_prepare(struct sti_plane *plane, bool first_prepare)
{ {
struct sti_hqvdp *hqvdp = to_sti_hqvdp(layer); struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane);
struct sti_hqvdp_cmd *cmd; struct sti_hqvdp_cmd *cmd;
int scale_h, scale_v; int scale_h, scale_v;
int cmd_offset; int cmd_offset;
dev_dbg(hqvdp->dev, "%s %s\n", __func__, sti_layer_to_str(layer)); dev_dbg(hqvdp->dev, "%s %s\n", __func__, sti_plane_to_str(plane));
/* prepare and commit VID plane */
hqvdp->vid_plane->funcs->update_plane(hqvdp->vid_plane,
layer->crtc, layer->fb,
layer->dst_x, layer->dst_y,
layer->dst_w, layer->dst_h,
layer->src_x, layer->src_y,
layer->src_w, layer->src_h);
cmd_offset = sti_hqvdp_get_free_cmd(hqvdp); cmd_offset = sti_hqvdp_get_free_cmd(hqvdp);
if (cmd_offset == -1) { if (cmd_offset == -1) {
...@@ -546,7 +536,7 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -546,7 +536,7 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
} }
cmd = hqvdp->hqvdp_cmd + cmd_offset; cmd = hqvdp->hqvdp_cmd + cmd_offset;
if (!sti_hqvdp_check_hw_scaling(layer)) { if (!sti_hqvdp_check_hw_scaling(plane)) {
DRM_ERROR("Scaling beyond HW capabilities\n"); DRM_ERROR("Scaling beyond HW capabilities\n");
return -EINVAL; return -EINVAL;
} }
...@@ -565,42 +555,42 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -565,42 +555,42 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
cmd->iqi.pxf_conf = IQI_PXF_CONF_DFLT; cmd->iqi.pxf_conf = IQI_PXF_CONF_DFLT;
/* Buffer planes address */ /* Buffer planes address */
cmd->top.current_luma = (u32) layer->paddr + layer->offsets[0]; cmd->top.current_luma = (u32)plane->paddr + plane->offsets[0];
cmd->top.current_chroma = (u32) layer->paddr + layer->offsets[1]; cmd->top.current_chroma = (u32)plane->paddr + plane->offsets[1];
/* Pitches */ /* Pitches */
cmd->top.luma_processed_pitch = cmd->top.luma_src_pitch = cmd->top.luma_processed_pitch = cmd->top.luma_src_pitch =
layer->pitches[0]; plane->pitches[0];
cmd->top.chroma_processed_pitch = cmd->top.chroma_src_pitch = cmd->top.chroma_processed_pitch = cmd->top.chroma_src_pitch =
layer->pitches[1]; plane->pitches[1];
/* Input / output size /* Input / output size
* Align to upper even value */ * Align to upper even value */
layer->dst_w = ALIGN(layer->dst_w, 2); plane->dst_w = ALIGN(plane->dst_w, 2);
layer->dst_h = ALIGN(layer->dst_h, 2); plane->dst_h = ALIGN(plane->dst_h, 2);
if ((layer->src_w > MAX_WIDTH) || (layer->src_w < MIN_WIDTH) || if ((plane->src_w > MAX_WIDTH) || (plane->src_w < MIN_WIDTH) ||
(layer->src_h > MAX_HEIGHT) || (layer->src_h < MIN_HEIGHT) || (plane->src_h > MAX_HEIGHT) || (plane->src_h < MIN_HEIGHT) ||
(layer->dst_w > MAX_WIDTH) || (layer->dst_w < MIN_WIDTH) || (plane->dst_w > MAX_WIDTH) || (plane->dst_w < MIN_WIDTH) ||
(layer->dst_h > MAX_HEIGHT) || (layer->dst_h < MIN_HEIGHT)) { (plane->dst_h > MAX_HEIGHT) || (plane->dst_h < MIN_HEIGHT)) {
DRM_ERROR("Invalid in/out size %dx%d -> %dx%d\n", DRM_ERROR("Invalid in/out size %dx%d -> %dx%d\n",
layer->src_w, layer->src_h, plane->src_w, plane->src_h,
layer->dst_w, layer->dst_h); plane->dst_w, plane->dst_h);
return -EINVAL; return -EINVAL;
} }
cmd->top.input_viewport_size = cmd->top.input_frame_size = cmd->top.input_viewport_size = cmd->top.input_frame_size =
layer->src_h << 16 | layer->src_w; plane->src_h << 16 | plane->src_w;
cmd->hvsrc.output_picture_size = layer->dst_h << 16 | layer->dst_w; cmd->hvsrc.output_picture_size = plane->dst_h << 16 | plane->dst_w;
cmd->top.input_viewport_ori = layer->src_y << 16 | layer->src_x; cmd->top.input_viewport_ori = plane->src_y << 16 | plane->src_x;
/* Handle interlaced */ /* Handle interlaced */
if (layer->fb->flags & DRM_MODE_FB_INTERLACED) { if (plane->fb->flags & DRM_MODE_FB_INTERLACED) {
/* Top field to display */ /* Top field to display */
cmd->top.config = TOP_CONFIG_INTER_TOP; cmd->top.config = TOP_CONFIG_INTER_TOP;
/* Update pitches and vert size */ /* Update pitches and vert size */
cmd->top.input_frame_size = (layer->src_h / 2) << 16 | cmd->top.input_frame_size = (plane->src_h / 2) << 16 |
layer->src_w; plane->src_w;
cmd->top.luma_processed_pitch *= 2; cmd->top.luma_processed_pitch *= 2;
cmd->top.luma_src_pitch *= 2; cmd->top.luma_src_pitch *= 2;
cmd->top.chroma_processed_pitch *= 2; cmd->top.chroma_processed_pitch *= 2;
...@@ -613,10 +603,10 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -613,10 +603,10 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
} }
/* Update hvsrc lut coef */ /* Update hvsrc lut coef */
scale_h = SCALE_FACTOR * layer->dst_w / layer->src_w; scale_h = SCALE_FACTOR * plane->dst_w / plane->src_w;
sti_hqvdp_update_hvsrc(HVSRC_HORI, scale_h, &cmd->hvsrc); sti_hqvdp_update_hvsrc(HVSRC_HORI, scale_h, &cmd->hvsrc);
scale_v = SCALE_FACTOR * layer->dst_h / layer->src_h; scale_v = SCALE_FACTOR * plane->dst_h / plane->src_h;
sti_hqvdp_update_hvsrc(HVSRC_VERT, scale_v, &cmd->hvsrc); sti_hqvdp_update_hvsrc(HVSRC_VERT, scale_v, &cmd->hvsrc);
if (first_prepare) { if (first_prepare) {
...@@ -627,9 +617,9 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -627,9 +617,9 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
} }
/* Register VTG Vsync callback to handle bottom fields */ /* Register VTG Vsync callback to handle bottom fields */
if ((layer->fb->flags & DRM_MODE_FB_INTERLACED) && if ((plane->fb->flags & DRM_MODE_FB_INTERLACED) &&
sti_vtg_register_client(hqvdp->vtg, sti_vtg_register_client(hqvdp->vtg, &hqvdp->vtg_nb,
&hqvdp->vtg_nb, layer->mixer_id)) { plane->mixer_id)) {
DRM_ERROR("Cannot register VTG notifier\n"); DRM_ERROR("Cannot register VTG notifier\n");
return -ENXIO; return -ENXIO;
} }
...@@ -638,12 +628,21 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare) ...@@ -638,12 +628,21 @@ static int sti_hqvdp_prepare_layer(struct sti_layer *layer, bool first_prepare)
return 0; return 0;
} }
static int sti_hqvdp_commit_layer(struct sti_layer *layer) /**
* sti_hqvdp_commit
* @plane: hqvdp plane
*
* Enables the HQVDP plane
*
* RETURNS:
* 0 on success.
*/
static int sti_hqvdp_commit(struct sti_plane *plane)
{ {
struct sti_hqvdp *hqvdp = to_sti_hqvdp(layer); struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane);
int cmd_offset; int cmd_offset;
dev_dbg(hqvdp->dev, "%s %s\n", __func__, sti_layer_to_str(layer)); dev_dbg(hqvdp->dev, "%s %s\n", __func__, sti_plane_to_str(plane));
cmd_offset = sti_hqvdp_get_free_cmd(hqvdp); cmd_offset = sti_hqvdp_get_free_cmd(hqvdp);
if (cmd_offset == -1) { if (cmd_offset == -1) {
...@@ -657,7 +656,7 @@ static int sti_hqvdp_commit_layer(struct sti_layer *layer) ...@@ -657,7 +656,7 @@ static int sti_hqvdp_commit_layer(struct sti_layer *layer)
hqvdp->curr_field_count++; hqvdp->curr_field_count++;
/* Interlaced : get ready to display the bottom field at next Vsync */ /* Interlaced : get ready to display the bottom field at next Vsync */
if (layer->fb->flags & DRM_MODE_FB_INTERLACED) if (plane->fb->flags & DRM_MODE_FB_INTERLACED)
hqvdp->btm_field_pending = true; hqvdp->btm_field_pending = true;
dev_dbg(hqvdp->dev, "%s Posted command:0x%x\n", dev_dbg(hqvdp->dev, "%s Posted command:0x%x\n",
...@@ -666,16 +665,25 @@ static int sti_hqvdp_commit_layer(struct sti_layer *layer) ...@@ -666,16 +665,25 @@ static int sti_hqvdp_commit_layer(struct sti_layer *layer)
return 0; return 0;
} }
static int sti_hqvdp_disable_layer(struct sti_layer *layer) /**
* sti_hqvdp_disable
* @plane: hqvdp plane
*
* Disables the HQVDP plane
*
* RETURNS:
* 0 on success.
*/
static int sti_hqvdp_disable(struct sti_plane *plane)
{ {
struct sti_hqvdp *hqvdp = to_sti_hqvdp(layer); struct sti_hqvdp *hqvdp = to_sti_hqvdp(plane);
int i; int i;
DRM_DEBUG_DRIVER("%s\n", sti_layer_to_str(layer)); DRM_DEBUG_DRIVER("%s\n", sti_plane_to_str(plane));
/* Unregister VTG Vsync callback */ /* Unregister VTG Vsync callback */
if ((layer->fb->flags & DRM_MODE_FB_INTERLACED) && if ((plane->fb->flags & DRM_MODE_FB_INTERLACED) &&
sti_vtg_unregister_client(hqvdp->vtg, &hqvdp->vtg_nb)) sti_vtg_unregister_client(hqvdp->vtg, &hqvdp->vtg_nb))
DRM_DEBUG_DRIVER("Warning: cannot unregister VTG notifier\n"); DRM_DEBUG_DRIVER("Warning: cannot unregister VTG notifier\n");
/* Set next cmd to NULL */ /* Set next cmd to NULL */
...@@ -696,9 +704,6 @@ static int sti_hqvdp_disable_layer(struct sti_layer *layer) ...@@ -696,9 +704,6 @@ static int sti_hqvdp_disable_layer(struct sti_layer *layer)
return -ENXIO; return -ENXIO;
} }
/* disable VID plane */
hqvdp->vid_plane->funcs->disable_plane(hqvdp->vid_plane);
return 0; return 0;
} }
...@@ -758,32 +763,10 @@ int sti_hqvdp_vtg_cb(struct notifier_block *nb, unsigned long evt, void *data) ...@@ -758,32 +763,10 @@ int sti_hqvdp_vtg_cb(struct notifier_block *nb, unsigned long evt, void *data)
return 0; return 0;
} }
static struct drm_plane *sti_hqvdp_find_vid(struct drm_device *dev, int id) static void sti_hqvdp_init(struct sti_hqvdp *hqvdp)
{
struct drm_plane *plane;
list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
struct sti_layer *layer = to_sti_layer(plane);
if (layer->desc == id)
return plane;
}
return NULL;
}
static void sti_hqvd_init(struct sti_layer *layer)
{ {
struct sti_hqvdp *hqvdp = to_sti_hqvdp(layer);
int size; int size;
/* find the plane macthing with vid 0 */
hqvdp->vid_plane = sti_hqvdp_find_vid(hqvdp->drm_dev, STI_VID_0);
if (!hqvdp->vid_plane) {
DRM_ERROR("Cannot find Main video layer\n");
return;
}
hqvdp->vtg_nb.notifier_call = sti_hqvdp_vtg_cb; hqvdp->vtg_nb.notifier_call = sti_hqvdp_vtg_cb;
/* Allocate memory for the VDP commands */ /* Allocate memory for the VDP commands */
...@@ -799,24 +782,25 @@ static void sti_hqvd_init(struct sti_layer *layer) ...@@ -799,24 +782,25 @@ static void sti_hqvd_init(struct sti_layer *layer)
memset(hqvdp->hqvdp_cmd, 0, size); memset(hqvdp->hqvdp_cmd, 0, size);
} }
static const struct sti_layer_funcs hqvdp_ops = { static const struct sti_plane_funcs hqvdp_plane_ops = {
.get_formats = sti_hqvdp_get_formats, .get_formats = sti_hqvdp_get_formats,
.get_nb_formats = sti_hqvdp_get_nb_formats, .get_nb_formats = sti_hqvdp_get_nb_formats,
.init = sti_hqvd_init, .prepare = sti_hqvdp_prepare,
.prepare = sti_hqvdp_prepare_layer, .commit = sti_hqvdp_commit,
.commit = sti_hqvdp_commit_layer, .disable = sti_hqvdp_disable,
.disable = sti_hqvdp_disable_layer,
}; };
struct sti_layer *sti_hqvdp_create(struct device *dev) struct sti_plane *sti_hqvdp_create(struct device *dev, int desc)
{ {
struct sti_hqvdp *hqvdp = dev_get_drvdata(dev); struct sti_hqvdp *hqvdp = dev_get_drvdata(dev);
hqvdp->layer.ops = &hqvdp_ops; hqvdp->plane.desc = desc;
hqvdp->plane.ops = &hqvdp_plane_ops;
return &hqvdp->layer; sti_hqvdp_init(hqvdp);
return &hqvdp->plane;
} }
EXPORT_SYMBOL(sti_hqvdp_create);
static void sti_hqvdp_init_plugs(struct sti_hqvdp *hqvdp) static void sti_hqvdp_init_plugs(struct sti_hqvdp *hqvdp)
{ {
...@@ -859,6 +843,12 @@ static void sti_hqvdp_start_xp70(const struct firmware *firmware, void *ctxt) ...@@ -859,6 +843,12 @@ static void sti_hqvdp_start_xp70(const struct firmware *firmware, void *ctxt)
} *header; } *header;
DRM_DEBUG_DRIVER("\n"); DRM_DEBUG_DRIVER("\n");
if (hqvdp->xp70_initialized) {
DRM_INFO("HQVDP XP70 already initialized\n");
return;
}
/* Check firmware parts */ /* Check firmware parts */
if (!firmware) { if (!firmware) {
DRM_ERROR("Firmware not available\n"); DRM_ERROR("Firmware not available\n");
...@@ -946,7 +936,10 @@ static void sti_hqvdp_start_xp70(const struct firmware *firmware, void *ctxt) ...@@ -946,7 +936,10 @@ static void sti_hqvdp_start_xp70(const struct firmware *firmware, void *ctxt)
/* Launch Vsync */ /* Launch Vsync */
writel(SOFT_VSYNC_HW, hqvdp->regs + HQVDP_MBX_SOFT_VSYNC); writel(SOFT_VSYNC_HW, hqvdp->regs + HQVDP_MBX_SOFT_VSYNC);
DRM_INFO("HQVDP XP70 started\n"); DRM_INFO("HQVDP XP70 initialized\n");
hqvdp->xp70_initialized = true;
out: out:
release_firmware(firmware); release_firmware(firmware);
} }
...@@ -955,7 +948,7 @@ int sti_hqvdp_bind(struct device *dev, struct device *master, void *data) ...@@ -955,7 +948,7 @@ int sti_hqvdp_bind(struct device *dev, struct device *master, void *data)
{ {
struct sti_hqvdp *hqvdp = dev_get_drvdata(dev); struct sti_hqvdp *hqvdp = dev_get_drvdata(dev);
struct drm_device *drm_dev = data; struct drm_device *drm_dev = data;
struct sti_layer *layer; struct sti_plane *plane;
int err; int err;
DRM_DEBUG_DRIVER("\n"); DRM_DEBUG_DRIVER("\n");
...@@ -971,13 +964,13 @@ int sti_hqvdp_bind(struct device *dev, struct device *master, void *data) ...@@ -971,13 +964,13 @@ int sti_hqvdp_bind(struct device *dev, struct device *master, void *data)
return err; return err;
} }
layer = sti_layer_create(hqvdp->dev, STI_HQVDP_0, hqvdp->regs); /* Create HQVDP plane once xp70 is initialized */
if (!layer) { plane = sti_hqvdp_create(hqvdp->dev, STI_HQVDP_0);
if (plane)
sti_drm_plane_init(hqvdp->drm_dev, plane, 1,
DRM_PLANE_TYPE_OVERLAY);
else
DRM_ERROR("Can't create HQVDP plane\n"); DRM_ERROR("Can't create HQVDP plane\n");
return -ENOMEM;
}
sti_drm_plane_init(drm_dev, layer, 1, DRM_PLANE_TYPE_OVERLAY);
return 0; return 0;
} }
......
/*
* Copyright (C) STMicroelectronics SA 2014
* Authors: Fabien Dessenne <fabien.dessenne@st.com> for STMicroelectronics.
* License terms: GNU General Public License (GPL), version 2
*/
#ifndef _STI_HQVDP_H_
#define _STI_HQVDP_H_
struct sti_layer *sti_hqvdp_create(struct device *dev);
#endif
/*
* Copyright (C) STMicroelectronics SA 2014
* Authors: Benjamin Gaignard <benjamin.gaignard@st.com>
* Fabien Dessenne <fabien.dessenne@st.com>
* for STMicroelectronics.
* License terms: GNU General Public License (GPL), version 2
*/
#include <drm/drmP.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_fb_cma_helper.h>
#include "sti_compositor.h"
#include "sti_cursor.h"
#include "sti_gdp.h"
#include "sti_hqvdp.h"
#include "sti_layer.h"
#include "sti_vid.h"
const char *sti_layer_to_str(struct sti_layer *layer)
{
switch (layer->desc) {
case STI_GDP_0:
return "GDP0";
case STI_GDP_1:
return "GDP1";
case STI_GDP_2:
return "GDP2";
case STI_GDP_3:
return "GDP3";
case STI_VID_0:
return "VID0";
case STI_VID_1:
return "VID1";
case STI_CURSOR:
return "CURSOR";
case STI_HQVDP_0:
return "HQVDP0";
default:
return "<UNKNOWN LAYER>";
}
}
EXPORT_SYMBOL(sti_layer_to_str);
struct sti_layer *sti_layer_create(struct device *dev, int desc,
void __iomem *baseaddr)
{
struct sti_layer *layer = NULL;
switch (desc & STI_LAYER_TYPE_MASK) {
case STI_GDP:
layer = sti_gdp_create(dev, desc);
break;
case STI_VID:
layer = sti_vid_create(dev);
break;
case STI_CUR:
layer = sti_cursor_create(dev);
break;
case STI_VDP:
layer = sti_hqvdp_create(dev);
break;
}
if (!layer) {
DRM_ERROR("Failed to create layer\n");
return NULL;
}
layer->desc = desc;
layer->dev = dev;
layer->regs = baseaddr;
layer->ops->init(layer);
DRM_DEBUG_DRIVER("%s created\n", sti_layer_to_str(layer));
return layer;
}
EXPORT_SYMBOL(sti_layer_create);
int sti_layer_prepare(struct sti_layer *layer,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
struct drm_display_mode *mode, int mixer_id,
int dest_x, int dest_y, int dest_w, int dest_h,
int src_x, int src_y, int src_w, int src_h)
{
int ret;
unsigned int i;
struct drm_gem_cma_object *cma_obj;
if (!layer || !fb || !mode) {
DRM_ERROR("Null fb, layer or mode\n");
return 1;
}
cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
if (!cma_obj) {
DRM_ERROR("Can't get CMA GEM object for fb\n");
return 1;
}
layer->crtc = crtc;
layer->fb = fb;
layer->mode = mode;
layer->mixer_id = mixer_id;
layer->dst_x = dest_x;
layer->dst_y = dest_y;
layer->dst_w = clamp_val(dest_w, 0, mode->crtc_hdisplay - dest_x);
layer->dst_h = clamp_val(dest_h, 0, mode->crtc_vdisplay - dest_y);
layer->src_x = src_x;
layer->src_y = src_y;
layer->src_w = src_w;
layer->src_h = src_h;
layer->format = fb->pixel_format;
layer->vaddr = cma_obj->vaddr;
layer->paddr = cma_obj->paddr;
for (i = 0; i < 4; i++) {
layer->pitches[i] = fb->pitches[i];
layer->offsets[i] = fb->offsets[i];
}
DRM_DEBUG_DRIVER("%s is associated with mixer_id %d\n",
sti_layer_to_str(layer),
layer->mixer_id);
DRM_DEBUG_DRIVER("%s dst=(%dx%d)@(%d,%d) - src=(%dx%d)@(%d,%d)\n",
sti_layer_to_str(layer),
layer->dst_w, layer->dst_h, layer->dst_x, layer->dst_y,
layer->src_w, layer->src_h, layer->src_x,
layer->src_y);
DRM_DEBUG_DRIVER("drm FB:%d format:%.4s phys@:0x%lx\n", fb->base.id,
(char *)&layer->format, (unsigned long)layer->paddr);
if (!layer->ops->prepare)
goto err_no_prepare;
ret = layer->ops->prepare(layer, !layer->enabled);
if (!ret)
layer->enabled = true;
return ret;
err_no_prepare:
DRM_ERROR("Cannot prepare\n");
return 1;
}
int sti_layer_commit(struct sti_layer *layer)
{
if (!layer)
return 1;
if (!layer->ops->commit)
goto err_no_commit;
return layer->ops->commit(layer);
err_no_commit:
DRM_ERROR("Cannot commit\n");
return 1;
}
int sti_layer_disable(struct sti_layer *layer)
{
int ret;
DRM_DEBUG_DRIVER("%s\n", sti_layer_to_str(layer));
if (!layer)
return 1;
if (!layer->enabled)
return 0;
if (!layer->ops->disable)
goto err_no_disable;
ret = layer->ops->disable(layer);
if (!ret)
layer->enabled = false;
else
DRM_ERROR("Disable failed\n");
return ret;
err_no_disable:
DRM_ERROR("Cannot disable\n");
return 1;
}
const uint32_t *sti_layer_get_formats(struct sti_layer *layer)
{
if (!layer)
return NULL;
if (!layer->ops->get_formats)
return NULL;
return layer->ops->get_formats(layer);
}
unsigned int sti_layer_get_nb_formats(struct sti_layer *layer)
{
if (!layer)
return 0;
if (!layer->ops->get_nb_formats)
return 0;
return layer->ops->get_nb_formats(layer);
}
/*
* Copyright (C) STMicroelectronics SA 2014
* Authors: Benjamin Gaignard <benjamin.gaignard@st.com>
* Fabien Dessenne <fabien.dessenne@st.com>
* for STMicroelectronics.
* License terms: GNU General Public License (GPL), version 2
*/
#ifndef _STI_LAYER_H_
#define _STI_LAYER_H_
#include <drm/drmP.h>
#define to_sti_layer(x) container_of(x, struct sti_layer, plane)
#define STI_LAYER_TYPE_SHIFT 8
#define STI_LAYER_TYPE_MASK (~((1<<STI_LAYER_TYPE_SHIFT)-1))
struct sti_layer;
enum sti_layer_type {
STI_GDP = 1 << STI_LAYER_TYPE_SHIFT,
STI_VID = 2 << STI_LAYER_TYPE_SHIFT,
STI_CUR = 3 << STI_LAYER_TYPE_SHIFT,
STI_BCK = 4 << STI_LAYER_TYPE_SHIFT,
STI_VDP = 5 << STI_LAYER_TYPE_SHIFT
};
enum sti_layer_id_of_type {
STI_ID_0 = 0,
STI_ID_1 = 1,
STI_ID_2 = 2,
STI_ID_3 = 3
};
enum sti_layer_desc {
STI_GDP_0 = STI_GDP | STI_ID_0,
STI_GDP_1 = STI_GDP | STI_ID_1,
STI_GDP_2 = STI_GDP | STI_ID_2,
STI_GDP_3 = STI_GDP | STI_ID_3,
STI_VID_0 = STI_VID | STI_ID_0,
STI_VID_1 = STI_VID | STI_ID_1,
STI_HQVDP_0 = STI_VDP | STI_ID_0,
STI_CURSOR = STI_CUR,
STI_BACK = STI_BCK
};
/**
* STI layer functions structure
*
* @get_formats: get layer supported formats
* @get_nb_formats: get number of format supported
* @init: initialize the layer
* @prepare: prepare layer before rendering
* @commit: set layer for rendering
* @disable: disable layer
*/
struct sti_layer_funcs {
const uint32_t* (*get_formats)(struct sti_layer *layer);
unsigned int (*get_nb_formats)(struct sti_layer *layer);
void (*init)(struct sti_layer *layer);
int (*prepare)(struct sti_layer *layer, bool first_prepare);
int (*commit)(struct sti_layer *layer);
int (*disable)(struct sti_layer *layer);
};
/**
* STI layer structure
*
* @plane: drm plane it is bound to (if any)
* @fb: drm fb it is bound to
* @crtc: crtc it is bound to
* @mode: display mode
* @desc: layer type & id
* @device: driver device
* @regs: layer registers
* @ops: layer functions
* @zorder: layer z-order
* @mixer_id: id of the mixer used to display the layer
* @enabled: to know if the layer is active or not
* @src_x src_y: coordinates of the input (fb) area
* @src_w src_h: size of the input (fb) area
* @dst_x dst_y: coordinates of the output (crtc) area
* @dst_w dst_h: size of the output (crtc) area
* @format: format
* @pitches: pitch of 'planes' (eg: Y, U, V)
* @offsets: offset of 'planes'
* @vaddr: virtual address of the input buffer
* @paddr: physical address of the input buffer
*/
struct sti_layer {
struct drm_plane plane;
struct drm_framebuffer *fb;
struct drm_crtc *crtc;
struct drm_display_mode *mode;
enum sti_layer_desc desc;
struct device *dev;
void __iomem *regs;
const struct sti_layer_funcs *ops;
int zorder;
int mixer_id;
bool enabled;
int src_x, src_y;
int src_w, src_h;
int dst_x, dst_y;
int dst_w, dst_h;
uint32_t format;
unsigned int pitches[4];
unsigned int offsets[4];
void *vaddr;
dma_addr_t paddr;
};
struct sti_layer *sti_layer_create(struct device *dev, int desc,
void __iomem *baseaddr);
int sti_layer_prepare(struct sti_layer *layer,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
struct drm_display_mode *mode,
int mixer_id,
int dest_x, int dest_y,
int dest_w, int dest_h,
int src_x, int src_y,
int src_w, int src_h);
int sti_layer_commit(struct sti_layer *layer);
int sti_layer_disable(struct sti_layer *layer);
const uint32_t *sti_layer_get_formats(struct sti_layer *layer);
unsigned int sti_layer_get_nb_formats(struct sti_layer *layer);
const char *sti_layer_to_str(struct sti_layer *layer);
#endif
...@@ -101,61 +101,57 @@ static void sti_mixer_set_background_area(struct sti_mixer *mixer, ...@@ -101,61 +101,57 @@ static void sti_mixer_set_background_area(struct sti_mixer *mixer,
sti_mixer_reg_write(mixer, GAM_MIXER_BCS, yds << 16 | xds); sti_mixer_reg_write(mixer, GAM_MIXER_BCS, yds << 16 | xds);
} }
int sti_mixer_set_layer_depth(struct sti_mixer *mixer, struct sti_layer *layer) int sti_mixer_set_plane_depth(struct sti_mixer *mixer, struct sti_plane *plane)
{ {
int layer_id, depth = layer->zorder; int plane_id, depth = plane->zorder;
unsigned int i; unsigned int i;
u32 mask, val; u32 mask, val;
if ((depth < 1) || (depth > GAM_MIXER_NB_DEPTH_LEVEL)) if ((depth < 1) || (depth > GAM_MIXER_NB_DEPTH_LEVEL))
return 1; return 1;
switch (layer->desc) { switch (plane->desc) {
case STI_GDP_0: case STI_GDP_0:
layer_id = GAM_DEPTH_GDP0_ID; plane_id = GAM_DEPTH_GDP0_ID;
break; break;
case STI_GDP_1: case STI_GDP_1:
layer_id = GAM_DEPTH_GDP1_ID; plane_id = GAM_DEPTH_GDP1_ID;
break; break;
case STI_GDP_2: case STI_GDP_2:
layer_id = GAM_DEPTH_GDP2_ID; plane_id = GAM_DEPTH_GDP2_ID;
break; break;
case STI_GDP_3: case STI_GDP_3:
layer_id = GAM_DEPTH_GDP3_ID; plane_id = GAM_DEPTH_GDP3_ID;
break; break;
case STI_VID_0:
case STI_HQVDP_0: case STI_HQVDP_0:
layer_id = GAM_DEPTH_VID0_ID; plane_id = GAM_DEPTH_VID0_ID;
break;
case STI_VID_1:
layer_id = GAM_DEPTH_VID1_ID;
break; break;
case STI_CURSOR: case STI_CURSOR:
/* no need to set depth for cursor */ /* no need to set depth for cursor */
return 0; return 0;
default: default:
DRM_ERROR("Unknown layer %d\n", layer->desc); DRM_ERROR("Unknown plane %d\n", plane->desc);
return 1; return 1;
} }
/* Search if a previous depth was already assigned to the layer */ /* Search if a previous depth was already assigned to the plane */
val = sti_mixer_reg_read(mixer, GAM_MIXER_CRB); val = sti_mixer_reg_read(mixer, GAM_MIXER_CRB);
for (i = 0; i < GAM_MIXER_NB_DEPTH_LEVEL; i++) { for (i = 0; i < GAM_MIXER_NB_DEPTH_LEVEL; i++) {
mask = GAM_DEPTH_MASK_ID << (3 * i); mask = GAM_DEPTH_MASK_ID << (3 * i);
if ((val & mask) == layer_id << (3 * i)) if ((val & mask) == plane_id << (3 * i))
break; break;
} }
mask |= GAM_DEPTH_MASK_ID << (3 * (depth - 1)); mask |= GAM_DEPTH_MASK_ID << (3 * (depth - 1));
layer_id = layer_id << (3 * (depth - 1)); plane_id = plane_id << (3 * (depth - 1));
DRM_DEBUG_DRIVER("%s %s depth=%d\n", sti_mixer_to_str(mixer), DRM_DEBUG_DRIVER("%s %s depth=%d\n", sti_mixer_to_str(mixer),
sti_layer_to_str(layer), depth); sti_plane_to_str(plane), depth);
dev_dbg(mixer->dev, "GAM_MIXER_CRB val 0x%x mask 0x%x\n", dev_dbg(mixer->dev, "GAM_MIXER_CRB val 0x%x mask 0x%x\n",
layer_id, mask); plane_id, mask);
val &= ~mask; val &= ~mask;
val |= layer_id; val |= plane_id;
sti_mixer_reg_write(mixer, GAM_MIXER_CRB, val); sti_mixer_reg_write(mixer, GAM_MIXER_CRB, val);
dev_dbg(mixer->dev, "Read GAM_MIXER_CRB 0x%x\n", dev_dbg(mixer->dev, "Read GAM_MIXER_CRB 0x%x\n",
...@@ -185,9 +181,9 @@ int sti_mixer_active_video_area(struct sti_mixer *mixer, ...@@ -185,9 +181,9 @@ int sti_mixer_active_video_area(struct sti_mixer *mixer,
return 0; return 0;
} }
static u32 sti_mixer_get_layer_mask(struct sti_layer *layer) static u32 sti_mixer_get_plane_mask(struct sti_plane *plane)
{ {
switch (layer->desc) { switch (plane->desc) {
case STI_BACK: case STI_BACK:
return GAM_CTL_BACK_MASK; return GAM_CTL_BACK_MASK;
case STI_GDP_0: case STI_GDP_0:
...@@ -198,11 +194,8 @@ static u32 sti_mixer_get_layer_mask(struct sti_layer *layer) ...@@ -198,11 +194,8 @@ static u32 sti_mixer_get_layer_mask(struct sti_layer *layer)
return GAM_CTL_GDP2_MASK; return GAM_CTL_GDP2_MASK;
case STI_GDP_3: case STI_GDP_3:
return GAM_CTL_GDP3_MASK; return GAM_CTL_GDP3_MASK;
case STI_VID_0:
case STI_HQVDP_0: case STI_HQVDP_0:
return GAM_CTL_VID0_MASK; return GAM_CTL_VID0_MASK;
case STI_VID_1:
return GAM_CTL_VID1_MASK;
case STI_CURSOR: case STI_CURSOR:
return GAM_CTL_CURSOR_MASK; return GAM_CTL_CURSOR_MASK;
default: default:
...@@ -210,17 +203,17 @@ static u32 sti_mixer_get_layer_mask(struct sti_layer *layer) ...@@ -210,17 +203,17 @@ static u32 sti_mixer_get_layer_mask(struct sti_layer *layer)
} }
} }
int sti_mixer_set_layer_status(struct sti_mixer *mixer, int sti_mixer_set_plane_status(struct sti_mixer *mixer,
struct sti_layer *layer, bool status) struct sti_plane *plane, bool status)
{ {
u32 mask, val; u32 mask, val;
DRM_DEBUG_DRIVER("%s %s %s\n", status ? "enable" : "disable", DRM_DEBUG_DRIVER("%s %s %s\n", status ? "enable" : "disable",
sti_mixer_to_str(mixer), sti_layer_to_str(layer)); sti_mixer_to_str(mixer), sti_plane_to_str(plane));
mask = sti_mixer_get_layer_mask(layer); mask = sti_mixer_get_plane_mask(plane);
if (!mask) { if (!mask) {
DRM_ERROR("Can not find layer mask\n"); DRM_ERROR("Can't find layer mask\n");
return -EINVAL; return -EINVAL;
} }
...@@ -232,11 +225,11 @@ int sti_mixer_set_layer_status(struct sti_mixer *mixer, ...@@ -232,11 +225,11 @@ int sti_mixer_set_layer_status(struct sti_mixer *mixer,
return 0; return 0;
} }
void sti_mixer_clear_all_layers(struct sti_mixer *mixer) void sti_mixer_clear_all_planes(struct sti_mixer *mixer)
{ {
u32 val; u32 val;
DRM_DEBUG_DRIVER("%s clear all layer\n", sti_mixer_to_str(mixer)); DRM_DEBUG_DRIVER("%s clear all planes\n", sti_mixer_to_str(mixer));
val = sti_mixer_reg_read(mixer, GAM_MIXER_CTL) & 0xFFFF0000; val = sti_mixer_reg_read(mixer, GAM_MIXER_CTL) & 0xFFFF0000;
sti_mixer_reg_write(mixer, GAM_MIXER_CTL, val); sti_mixer_reg_write(mixer, GAM_MIXER_CTL, val);
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include "sti_layer.h" #include "sti_drm_plane.h"
#define to_sti_mixer(x) container_of(x, struct sti_mixer, drm_crtc) #define to_sti_mixer(x) container_of(x, struct sti_mixer, drm_crtc)
...@@ -29,7 +29,7 @@ struct sti_mixer { ...@@ -29,7 +29,7 @@ struct sti_mixer {
struct device *dev; struct device *dev;
void __iomem *regs; void __iomem *regs;
int id; int id;
struct drm_crtc drm_crtc; struct drm_crtc drm_crtc;
struct drm_pending_vblank_event *pending_event; struct drm_pending_vblank_event *pending_event;
bool enabled; bool enabled;
}; };
...@@ -37,14 +37,14 @@ struct sti_mixer { ...@@ -37,14 +37,14 @@ struct sti_mixer {
const char *sti_mixer_to_str(struct sti_mixer *mixer); const char *sti_mixer_to_str(struct sti_mixer *mixer);
struct sti_mixer *sti_mixer_create(struct device *dev, int id, struct sti_mixer *sti_mixer_create(struct device *dev, int id,
void __iomem *baseaddr); void __iomem *baseaddr);
int sti_mixer_set_layer_status(struct sti_mixer *mixer, int sti_mixer_set_plane_status(struct sti_mixer *mixer,
struct sti_layer *layer, bool status); struct sti_plane *plane, bool status);
void sti_mixer_clear_all_layers(struct sti_mixer *mixer); void sti_mixer_clear_all_planes(struct sti_mixer *mixer);
int sti_mixer_set_layer_depth(struct sti_mixer *mixer, struct sti_layer *layer); int sti_mixer_set_plane_depth(struct sti_mixer *mixer, struct sti_plane *plane);
int sti_mixer_active_video_area(struct sti_mixer *mixer, int sti_mixer_active_video_area(struct sti_mixer *mixer,
struct drm_display_mode *mode); struct drm_display_mode *mode);
void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable); void sti_mixer_set_background_status(struct sti_mixer *mixer, bool enable);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <drm/drmP.h> #include <drm/drmP.h>
#include "sti_layer.h" #include "sti_drm_plane.h"
#include "sti_vid.h" #include "sti_vid.h"
#include "sti_vtg.h" #include "sti_vtg.h"
...@@ -43,27 +43,20 @@ ...@@ -43,27 +43,20 @@
#define VID_MPR2_BT709 0x07150545 #define VID_MPR2_BT709 0x07150545
#define VID_MPR3_BT709 0x00000AE8 #define VID_MPR3_BT709 0x00000AE8
static int sti_vid_prepare_layer(struct sti_layer *vid, bool first_prepare) int sti_vid_commit(struct sti_vid *vid, struct sti_plane *plane)
{ {
u32 val; struct drm_display_mode *mode = plane->mode;
u32 val, ydo, xdo, yds, xds;
/* Unmask */ /* Unmask */
val = readl(vid->regs + VID_CTL); val = readl(vid->regs + VID_CTL);
val &= ~VID_CTL_IGNORE; val &= ~VID_CTL_IGNORE;
writel(val, vid->regs + VID_CTL); writel(val, vid->regs + VID_CTL);
return 0; ydo = sti_vtg_get_line_number(*mode, plane->dst_y);
} yds = sti_vtg_get_line_number(*mode, plane->dst_y + plane->dst_h - 1);
xdo = sti_vtg_get_pixel_number(*mode, plane->dst_x);
static int sti_vid_commit_layer(struct sti_layer *vid) xds = sti_vtg_get_pixel_number(*mode, plane->dst_x + plane->dst_w - 1);
{
struct drm_display_mode *mode = vid->mode;
u32 ydo, xdo, yds, xds;
ydo = sti_vtg_get_line_number(*mode, vid->dst_y);
yds = sti_vtg_get_line_number(*mode, vid->dst_y + vid->dst_h - 1);
xdo = sti_vtg_get_pixel_number(*mode, vid->dst_x);
xds = sti_vtg_get_pixel_number(*mode, vid->dst_x + vid->dst_w - 1);
writel((ydo << 16) | xdo, vid->regs + VID_VPO); writel((ydo << 16) | xdo, vid->regs + VID_VPO);
writel((yds << 16) | xds, vid->regs + VID_VPS); writel((yds << 16) | xds, vid->regs + VID_VPS);
...@@ -71,7 +64,7 @@ static int sti_vid_commit_layer(struct sti_layer *vid) ...@@ -71,7 +64,7 @@ static int sti_vid_commit_layer(struct sti_layer *vid)
return 0; return 0;
} }
static int sti_vid_disable_layer(struct sti_layer *vid) int sti_vid_disable(struct sti_vid *vid)
{ {
u32 val; u32 val;
...@@ -83,17 +76,7 @@ static int sti_vid_disable_layer(struct sti_layer *vid) ...@@ -83,17 +76,7 @@ static int sti_vid_disable_layer(struct sti_layer *vid)
return 0; return 0;
} }
static const uint32_t *sti_vid_get_formats(struct sti_layer *layer) static void sti_vid_init(struct sti_vid *vid)
{
return NULL;
}
static unsigned int sti_vid_get_nb_formats(struct sti_layer *layer)
{
return 0;
}
static void sti_vid_init(struct sti_layer *vid)
{ {
/* Enable PSI, Mask layer */ /* Enable PSI, Mask layer */
writel(VID_CTL_PSI_ENABLE | VID_CTL_IGNORE, vid->regs + VID_CTL); writel(VID_CTL_PSI_ENABLE | VID_CTL_IGNORE, vid->regs + VID_CTL);
...@@ -113,18 +96,10 @@ static void sti_vid_init(struct sti_layer *vid) ...@@ -113,18 +96,10 @@ static void sti_vid_init(struct sti_layer *vid)
writel(VID_CSAT_DFLT, vid->regs + VID_CSAT); writel(VID_CSAT_DFLT, vid->regs + VID_CSAT);
} }
static const struct sti_layer_funcs vid_ops = { struct sti_vid *sti_vid_create(struct device *dev, int id,
.get_formats = sti_vid_get_formats, void __iomem *baseaddr)
.get_nb_formats = sti_vid_get_nb_formats,
.init = sti_vid_init,
.prepare = sti_vid_prepare_layer,
.commit = sti_vid_commit_layer,
.disable = sti_vid_disable_layer,
};
struct sti_layer *sti_vid_create(struct device *dev)
{ {
struct sti_layer *vid; struct sti_vid *vid;
vid = devm_kzalloc(dev, sizeof(*vid), GFP_KERNEL); vid = devm_kzalloc(dev, sizeof(*vid), GFP_KERNEL);
if (!vid) { if (!vid) {
...@@ -132,7 +107,11 @@ struct sti_layer *sti_vid_create(struct device *dev) ...@@ -132,7 +107,11 @@ struct sti_layer *sti_vid_create(struct device *dev)
return NULL; return NULL;
} }
vid->ops = &vid_ops; vid->dev = dev;
vid->regs = baseaddr;
vid->id = id;
sti_vid_init(vid);
return vid; return vid;
} }
...@@ -7,6 +7,22 @@ ...@@ -7,6 +7,22 @@
#ifndef _STI_VID_H_ #ifndef _STI_VID_H_
#define _STI_VID_H_ #define _STI_VID_H_
struct sti_layer *sti_vid_create(struct device *dev); /**
* STI VID structure
*
* @dev: driver device
* @regs: vid registers
* @id: id of the vid
*/
struct sti_vid {
struct device *dev;
void __iomem *regs;
int id;
};
int sti_vid_commit(struct sti_vid *vid, struct sti_plane *plane);
int sti_vid_disable(struct sti_vid *vid);
struct sti_vid *sti_vid_create(struct device *dev, int id,
void __iomem *baseaddr);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment