2014-12-11 15:34:42 +03:00
|
|
|
/*
|
|
|
|
* Copyright (C) STMicroelectronics SA 2014
|
|
|
|
* Authors: Vincent Abriou <vincent.abriou@st.com>
|
|
|
|
* Fabien Dessenne <fabien.dessenne@st.com>
|
|
|
|
* for STMicroelectronics.
|
|
|
|
* License terms: GNU General Public License (GPL), version 2
|
|
|
|
*/
|
|
|
|
|
2016-05-10 00:51:28 +03:00
|
|
|
#include <linux/seq_file.h>
|
|
|
|
|
2016-02-10 12:48:20 +03:00
|
|
|
#include <drm/drm_atomic.h>
|
2015-08-03 15:22:16 +03:00
|
|
|
#include <drm/drm_fb_cma_helper.h>
|
|
|
|
#include <drm/drm_gem_cma_helper.h>
|
|
|
|
|
|
|
|
#include "sti_compositor.h"
|
2014-12-11 15:34:42 +03:00
|
|
|
#include "sti_cursor.h"
|
2015-07-31 12:32:34 +03:00
|
|
|
#include "sti_plane.h"
|
2014-12-11 15:34:42 +03:00
|
|
|
#include "sti_vtg.h"
|
|
|
|
|
|
|
|
/* Registers */
|
|
|
|
#define CUR_CTL 0x00
|
|
|
|
#define CUR_VPO 0x0C
|
|
|
|
#define CUR_PML 0x14
|
|
|
|
#define CUR_PMP 0x18
|
|
|
|
#define CUR_SIZE 0x1C
|
|
|
|
#define CUR_CML 0x20
|
|
|
|
#define CUR_AWS 0x28
|
|
|
|
#define CUR_AWE 0x2C
|
|
|
|
|
|
|
|
#define CUR_CTL_CLUT_UPDATE BIT(1)
|
|
|
|
|
|
|
|
#define STI_CURS_MIN_SIZE 1
|
|
|
|
#define STI_CURS_MAX_SIZE 128
|
|
|
|
|
|
|
|
/*
|
|
|
|
* pixmap dma buffer stucture
|
|
|
|
*
|
|
|
|
* @paddr: physical address
|
|
|
|
* @size: buffer size
|
|
|
|
* @base: virtual address
|
|
|
|
*/
|
|
|
|
struct dma_pixmap {
|
|
|
|
dma_addr_t paddr;
|
|
|
|
size_t size;
|
|
|
|
void *base;
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* STI Cursor structure
|
|
|
|
*
|
2015-08-03 15:22:16 +03:00
|
|
|
* @sti_plane: sti_plane structure
|
|
|
|
* @dev: driver device
|
|
|
|
* @regs: cursor registers
|
|
|
|
* @width: cursor width
|
|
|
|
* @height: cursor height
|
|
|
|
* @clut: color look up table
|
|
|
|
* @clut_paddr: color look up table physical address
|
|
|
|
* @pixmap: pixmap dma buffer (clut8-format cursor)
|
2014-12-11 15:34:42 +03:00
|
|
|
*/
|
|
|
|
struct sti_cursor {
|
2015-07-31 12:32:13 +03:00
|
|
|
struct sti_plane plane;
|
|
|
|
struct device *dev;
|
|
|
|
void __iomem *regs;
|
2014-12-11 15:34:42 +03:00
|
|
|
unsigned int width;
|
|
|
|
unsigned int height;
|
|
|
|
unsigned short *clut;
|
|
|
|
dma_addr_t clut_paddr;
|
|
|
|
struct dma_pixmap pixmap;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const uint32_t cursor_supported_formats[] = {
|
|
|
|
DRM_FORMAT_ARGB8888,
|
|
|
|
};
|
|
|
|
|
2015-07-31 12:32:13 +03:00
|
|
|
#define to_sti_cursor(x) container_of(x, struct sti_cursor, plane)
|
2014-12-11 15:34:42 +03:00
|
|
|
|
2016-02-04 18:35:45 +03:00
|
|
|
#define DBGFS_DUMP(reg) seq_printf(s, "\n %-25s 0x%08X", #reg, \
|
|
|
|
readl(cursor->regs + reg))
|
|
|
|
|
|
|
|
static void cursor_dbg_vpo(struct seq_file *s, u32 val)
|
|
|
|
{
|
|
|
|
seq_printf(s, "\txdo:%4d\tydo:%4d", val & 0x0FFF, (val >> 16) & 0x0FFF);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cursor_dbg_size(struct seq_file *s, u32 val)
|
|
|
|
{
|
|
|
|
seq_printf(s, "\t%d x %d", val & 0x07FF, (val >> 16) & 0x07FF);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cursor_dbg_pml(struct seq_file *s,
|
|
|
|
struct sti_cursor *cursor, u32 val)
|
|
|
|
{
|
|
|
|
if (cursor->pixmap.paddr == val)
|
|
|
|
seq_printf(s, "\tVirt @: %p", cursor->pixmap.base);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cursor_dbg_cml(struct seq_file *s,
|
|
|
|
struct sti_cursor *cursor, u32 val)
|
|
|
|
{
|
|
|
|
if (cursor->clut_paddr == val)
|
|
|
|
seq_printf(s, "\tVirt @: %p", cursor->clut);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cursor_dbg_show(struct seq_file *s, void *data)
|
|
|
|
{
|
|
|
|
struct drm_info_node *node = s->private;
|
|
|
|
struct sti_cursor *cursor = (struct sti_cursor *)node->info_ent->data;
|
|
|
|
|
|
|
|
seq_printf(s, "%s: (vaddr = 0x%p)",
|
|
|
|
sti_plane_to_str(&cursor->plane), cursor->regs);
|
|
|
|
|
|
|
|
DBGFS_DUMP(CUR_CTL);
|
|
|
|
DBGFS_DUMP(CUR_VPO);
|
|
|
|
cursor_dbg_vpo(s, readl(cursor->regs + CUR_VPO));
|
|
|
|
DBGFS_DUMP(CUR_PML);
|
|
|
|
cursor_dbg_pml(s, cursor, readl(cursor->regs + CUR_PML));
|
|
|
|
DBGFS_DUMP(CUR_PMP);
|
|
|
|
DBGFS_DUMP(CUR_SIZE);
|
|
|
|
cursor_dbg_size(s, readl(cursor->regs + CUR_SIZE));
|
|
|
|
DBGFS_DUMP(CUR_CML);
|
|
|
|
cursor_dbg_cml(s, cursor, readl(cursor->regs + CUR_CML));
|
|
|
|
DBGFS_DUMP(CUR_AWS);
|
|
|
|
DBGFS_DUMP(CUR_AWE);
|
|
|
|
seq_puts(s, "\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct drm_info_list cursor_debugfs_files[] = {
|
|
|
|
{ "cursor", cursor_dbg_show, 0, NULL },
|
|
|
|
};
|
|
|
|
|
|
|
|
static int cursor_debugfs_init(struct sti_cursor *cursor,
|
|
|
|
struct drm_minor *minor)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(cursor_debugfs_files); i++)
|
|
|
|
cursor_debugfs_files[i].data = cursor;
|
|
|
|
|
|
|
|
return drm_debugfs_create_files(cursor_debugfs_files,
|
|
|
|
ARRAY_SIZE(cursor_debugfs_files),
|
|
|
|
minor->debugfs_root, minor);
|
|
|
|
}
|
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
static void sti_cursor_argb8888_to_clut8(struct sti_cursor *cursor, u32 *src)
|
2014-12-11 15:34:42 +03:00
|
|
|
{
|
|
|
|
u8 *dst = cursor->pixmap.base;
|
|
|
|
unsigned int i, j;
|
|
|
|
u32 a, r, g, b;
|
|
|
|
|
|
|
|
for (i = 0; i < cursor->height; i++) {
|
|
|
|
for (j = 0; j < cursor->width; j++) {
|
|
|
|
/* Pick the 2 higher bits of each component */
|
|
|
|
a = (*src >> 30) & 3;
|
|
|
|
r = (*src >> 22) & 3;
|
|
|
|
g = (*src >> 14) & 3;
|
|
|
|
b = (*src >> 6) & 3;
|
|
|
|
*dst = a << 6 | r << 4 | g << 2 | b;
|
|
|
|
src++;
|
|
|
|
dst++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
static void sti_cursor_init(struct sti_cursor *cursor)
|
|
|
|
{
|
|
|
|
unsigned short *base = cursor->clut;
|
|
|
|
unsigned int a, r, g, b;
|
|
|
|
|
|
|
|
/* Assign CLUT values, ARGB444 format */
|
|
|
|
for (a = 0; a < 4; a++)
|
|
|
|
for (r = 0; r < 4; r++)
|
|
|
|
for (g = 0; g < 4; g++)
|
|
|
|
for (b = 0; b < 4; b++)
|
|
|
|
*base++ = (a * 5) << 12 |
|
|
|
|
(r * 5) << 8 |
|
|
|
|
(g * 5) << 4 |
|
|
|
|
(b * 5);
|
|
|
|
}
|
|
|
|
|
2016-02-10 12:48:20 +03:00
|
|
|
static int sti_cursor_atomic_check(struct drm_plane *drm_plane,
|
|
|
|
struct drm_plane_state *state)
|
2014-12-11 15:34:42 +03:00
|
|
|
{
|
2015-08-03 15:22:16 +03:00
|
|
|
struct sti_plane *plane = to_sti_plane(drm_plane);
|
2015-07-31 12:32:13 +03:00
|
|
|
struct sti_cursor *cursor = to_sti_cursor(plane);
|
2015-08-03 15:22:16 +03:00
|
|
|
struct drm_crtc *crtc = state->crtc;
|
|
|
|
struct drm_framebuffer *fb = state->fb;
|
2016-02-10 12:48:20 +03:00
|
|
|
struct drm_crtc_state *crtc_state;
|
|
|
|
struct drm_display_mode *mode;
|
|
|
|
int dst_x, dst_y, dst_w, dst_h;
|
|
|
|
int src_w, src_h;
|
|
|
|
|
|
|
|
/* no need for further checks if the plane is being disabled */
|
|
|
|
if (!crtc || !fb)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
crtc_state = drm_atomic_get_crtc_state(state->state, crtc);
|
|
|
|
mode = &crtc_state->mode;
|
|
|
|
dst_x = state->crtc_x;
|
|
|
|
dst_y = state->crtc_y;
|
|
|
|
dst_w = clamp_val(state->crtc_w, 0, mode->crtc_hdisplay - dst_x);
|
|
|
|
dst_h = clamp_val(state->crtc_h, 0, mode->crtc_vdisplay - dst_y);
|
2015-08-03 15:22:16 +03:00
|
|
|
/* src_x are in 16.16 format */
|
2016-02-10 12:48:20 +03:00
|
|
|
src_w = state->src_w >> 16;
|
|
|
|
src_h = state->src_h >> 16;
|
2014-12-11 15:34:42 +03:00
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
if (src_w < STI_CURS_MIN_SIZE ||
|
|
|
|
src_h < STI_CURS_MIN_SIZE ||
|
|
|
|
src_w > STI_CURS_MAX_SIZE ||
|
|
|
|
src_h > STI_CURS_MAX_SIZE) {
|
2014-12-11 15:34:42 +03:00
|
|
|
DRM_ERROR("Invalid cursor size (%dx%d)\n",
|
2015-08-03 15:22:16 +03:00
|
|
|
src_w, src_h);
|
2016-02-10 12:48:20 +03:00
|
|
|
return -EINVAL;
|
2014-12-11 15:34:42 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If the cursor size has changed, re-allocated the pixmap */
|
|
|
|
if (!cursor->pixmap.base ||
|
2015-08-03 15:22:16 +03:00
|
|
|
(cursor->width != src_w) ||
|
|
|
|
(cursor->height != src_h)) {
|
|
|
|
cursor->width = src_w;
|
|
|
|
cursor->height = src_h;
|
2014-12-11 15:34:42 +03:00
|
|
|
|
|
|
|
if (cursor->pixmap.base)
|
dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()
Rename dma_*_writecombine() to dma_*_wc(), so that the naming
is coherent across the various write-combining APIs. Keep the
old names for compatibility for a while, these can be removed
at a later time. A guard is left to enable backporting of the
rename, and later remove of the old mapping defines seemlessly.
Build tested successfully with allmodconfig.
The following Coccinelle SmPL patch was used for this simple
transformation:
@ rename_dma_alloc_writecombine @
expression dev, size, dma_addr, gfp;
@@
-dma_alloc_writecombine(dev, size, dma_addr, gfp)
+dma_alloc_wc(dev, size, dma_addr, gfp)
@ rename_dma_free_writecombine @
expression dev, size, cpu_addr, dma_addr;
@@
-dma_free_writecombine(dev, size, cpu_addr, dma_addr)
+dma_free_wc(dev, size, cpu_addr, dma_addr)
@ rename_dma_mmap_writecombine @
expression dev, vma, cpu_addr, dma_addr, size;
@@
-dma_mmap_writecombine(dev, vma, cpu_addr, dma_addr, size)
+dma_mmap_wc(dev, vma, cpu_addr, dma_addr, size)
We also keep the old names as compatibility helpers, and
guard against their definition to make backporting easier.
Generated-by: Coccinelle SmPL
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: akpm@linux-foundation.org
Cc: benh@kernel.crashing.org
Cc: bhelgaas@google.com
Cc: bp@suse.de
Cc: dan.j.williams@intel.com
Cc: daniel.vetter@ffwll.ch
Cc: dhowells@redhat.com
Cc: julia.lawall@lip6.fr
Cc: konrad.wilk@oracle.com
Cc: linux-fbdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: luto@amacapital.net
Cc: mst@redhat.com
Cc: tomi.valkeinen@ti.com
Cc: toshi.kani@hp.com
Cc: vinod.koul@intel.com
Cc: xen-devel@lists.xensource.com
Link: http://lkml.kernel.org/r/1453516462-4844-1-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-01-23 05:34:22 +03:00
|
|
|
dma_free_wc(cursor->dev, cursor->pixmap.size,
|
|
|
|
cursor->pixmap.base, cursor->pixmap.paddr);
|
2014-12-11 15:34:42 +03:00
|
|
|
|
|
|
|
cursor->pixmap.size = cursor->width * cursor->height;
|
|
|
|
|
dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()
Rename dma_*_writecombine() to dma_*_wc(), so that the naming
is coherent across the various write-combining APIs. Keep the
old names for compatibility for a while, these can be removed
at a later time. A guard is left to enable backporting of the
rename, and later remove of the old mapping defines seemlessly.
Build tested successfully with allmodconfig.
The following Coccinelle SmPL patch was used for this simple
transformation:
@ rename_dma_alloc_writecombine @
expression dev, size, dma_addr, gfp;
@@
-dma_alloc_writecombine(dev, size, dma_addr, gfp)
+dma_alloc_wc(dev, size, dma_addr, gfp)
@ rename_dma_free_writecombine @
expression dev, size, cpu_addr, dma_addr;
@@
-dma_free_writecombine(dev, size, cpu_addr, dma_addr)
+dma_free_wc(dev, size, cpu_addr, dma_addr)
@ rename_dma_mmap_writecombine @
expression dev, vma, cpu_addr, dma_addr, size;
@@
-dma_mmap_writecombine(dev, vma, cpu_addr, dma_addr, size)
+dma_mmap_wc(dev, vma, cpu_addr, dma_addr, size)
We also keep the old names as compatibility helpers, and
guard against their definition to make backporting easier.
Generated-by: Coccinelle SmPL
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: akpm@linux-foundation.org
Cc: benh@kernel.crashing.org
Cc: bhelgaas@google.com
Cc: bp@suse.de
Cc: dan.j.williams@intel.com
Cc: daniel.vetter@ffwll.ch
Cc: dhowells@redhat.com
Cc: julia.lawall@lip6.fr
Cc: konrad.wilk@oracle.com
Cc: linux-fbdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: luto@amacapital.net
Cc: mst@redhat.com
Cc: tomi.valkeinen@ti.com
Cc: toshi.kani@hp.com
Cc: vinod.koul@intel.com
Cc: xen-devel@lists.xensource.com
Link: http://lkml.kernel.org/r/1453516462-4844-1-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-01-23 05:34:22 +03:00
|
|
|
cursor->pixmap.base = dma_alloc_wc(cursor->dev,
|
|
|
|
cursor->pixmap.size,
|
|
|
|
&cursor->pixmap.paddr,
|
|
|
|
GFP_KERNEL | GFP_DMA);
|
2014-12-11 15:34:42 +03:00
|
|
|
if (!cursor->pixmap.base) {
|
|
|
|
DRM_ERROR("Failed to allocate memory for pixmap\n");
|
2016-02-10 12:48:20 +03:00
|
|
|
return -EINVAL;
|
2014-12-11 15:34:42 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-10 12:48:20 +03:00
|
|
|
if (!drm_fb_cma_get_gem_obj(fb, 0)) {
|
2015-08-03 15:22:16 +03:00
|
|
|
DRM_ERROR("Can't get CMA GEM object for fb\n");
|
2016-02-10 12:48:20 +03:00
|
|
|
return -EINVAL;
|
2015-08-03 15:22:16 +03:00
|
|
|
}
|
|
|
|
|
2016-02-10 12:48:20 +03:00
|
|
|
DRM_DEBUG_KMS("CRTC:%d (%s) drm plane:%d (%s)\n",
|
|
|
|
crtc->base.id, sti_mixer_to_str(to_sti_mixer(crtc)),
|
|
|
|
drm_plane->base.id, sti_plane_to_str(plane));
|
|
|
|
DRM_DEBUG_KMS("(%dx%d)@(%d,%d)\n", dst_w, dst_h, dst_x, dst_y);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sti_cursor_atomic_update(struct drm_plane *drm_plane,
|
|
|
|
struct drm_plane_state *oldstate)
|
|
|
|
{
|
|
|
|
struct drm_plane_state *state = drm_plane->state;
|
|
|
|
struct sti_plane *plane = to_sti_plane(drm_plane);
|
|
|
|
struct sti_cursor *cursor = to_sti_cursor(plane);
|
|
|
|
struct drm_crtc *crtc = state->crtc;
|
|
|
|
struct drm_framebuffer *fb = state->fb;
|
|
|
|
struct drm_display_mode *mode;
|
|
|
|
int dst_x, dst_y;
|
|
|
|
struct drm_gem_cma_object *cma_obj;
|
|
|
|
u32 y, x;
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
if (!crtc || !fb)
|
|
|
|
return;
|
|
|
|
|
|
|
|
mode = &crtc->mode;
|
|
|
|
dst_x = state->crtc_x;
|
|
|
|
dst_y = state->crtc_y;
|
|
|
|
|
|
|
|
cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
|
|
|
|
|
2014-12-11 15:34:42 +03:00
|
|
|
/* Convert ARGB8888 to CLUT8 */
|
2015-08-03 15:22:16 +03:00
|
|
|
sti_cursor_argb8888_to_clut8(cursor, (u32 *)cma_obj->vaddr);
|
2014-12-11 15:34:42 +03:00
|
|
|
|
|
|
|
/* AWS and AWE depend on the mode */
|
|
|
|
y = sti_vtg_get_line_number(*mode, 0);
|
|
|
|
x = sti_vtg_get_pixel_number(*mode, 0);
|
|
|
|
val = y << 16 | x;
|
2015-07-31 12:32:13 +03:00
|
|
|
writel(val, cursor->regs + CUR_AWS);
|
2014-12-11 15:34:42 +03:00
|
|
|
y = sti_vtg_get_line_number(*mode, mode->vdisplay - 1);
|
|
|
|
x = sti_vtg_get_pixel_number(*mode, mode->hdisplay - 1);
|
|
|
|
val = y << 16 | x;
|
2015-07-31 12:32:13 +03:00
|
|
|
writel(val, cursor->regs + CUR_AWE);
|
2014-12-11 15:34:42 +03:00
|
|
|
|
|
|
|
/* Set memory location, size, and position */
|
2015-07-31 12:32:13 +03:00
|
|
|
writel(cursor->pixmap.paddr, cursor->regs + CUR_PML);
|
|
|
|
writel(cursor->width, cursor->regs + CUR_PMP);
|
|
|
|
writel(cursor->height << 16 | cursor->width, cursor->regs + CUR_SIZE);
|
2014-12-11 15:34:42 +03:00
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
y = sti_vtg_get_line_number(*mode, dst_y);
|
2016-01-07 16:51:06 +03:00
|
|
|
x = sti_vtg_get_pixel_number(*mode, dst_x);
|
2015-08-03 15:22:16 +03:00
|
|
|
writel((y << 16) | x, cursor->regs + CUR_VPO);
|
2014-12-11 15:34:42 +03:00
|
|
|
|
2016-01-25 19:58:48 +03:00
|
|
|
/* Set and fetch CLUT */
|
|
|
|
writel(cursor->clut_paddr, cursor->regs + CUR_CML);
|
|
|
|
writel(CUR_CTL_CLUT_UPDATE, cursor->regs + CUR_CTL);
|
|
|
|
|
2016-02-08 13:34:31 +03:00
|
|
|
sti_plane_update_fps(plane, true, false);
|
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
plane->status = STI_PLANE_UPDATED;
|
2014-12-11 15:34:42 +03:00
|
|
|
}
|
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
static void sti_cursor_atomic_disable(struct drm_plane *drm_plane,
|
|
|
|
struct drm_plane_state *oldstate)
|
2014-12-11 15:34:42 +03:00
|
|
|
{
|
2015-08-03 15:22:16 +03:00
|
|
|
struct sti_plane *plane = to_sti_plane(drm_plane);
|
2014-12-11 15:34:42 +03:00
|
|
|
|
2016-09-06 10:41:48 +03:00
|
|
|
if (!oldstate->crtc) {
|
2015-08-03 15:22:16 +03:00
|
|
|
DRM_DEBUG_DRIVER("drm plane:%d not enabled\n",
|
|
|
|
drm_plane->base.id);
|
|
|
|
return;
|
|
|
|
}
|
2014-12-11 15:34:42 +03:00
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
DRM_DEBUG_DRIVER("CRTC:%d (%s) drm plane:%d (%s)\n",
|
2016-09-06 10:41:48 +03:00
|
|
|
oldstate->crtc->base.id,
|
|
|
|
sti_mixer_to_str(to_sti_mixer(oldstate->crtc)),
|
2015-08-03 15:22:16 +03:00
|
|
|
drm_plane->base.id, sti_plane_to_str(plane));
|
|
|
|
|
|
|
|
plane->status = STI_PLANE_DISABLING;
|
2014-12-11 15:34:42 +03:00
|
|
|
}
|
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
static const struct drm_plane_helper_funcs sti_cursor_helpers_funcs = {
|
2016-02-10 12:48:20 +03:00
|
|
|
.atomic_check = sti_cursor_atomic_check,
|
2015-08-03 15:22:16 +03:00
|
|
|
.atomic_update = sti_cursor_atomic_update,
|
|
|
|
.atomic_disable = sti_cursor_atomic_disable,
|
2014-12-11 15:34:42 +03:00
|
|
|
};
|
|
|
|
|
2016-06-21 16:09:39 +03:00
|
|
|
static void sti_cursor_destroy(struct drm_plane *drm_plane)
|
|
|
|
{
|
|
|
|
DRM_DEBUG_DRIVER("\n");
|
|
|
|
|
|
|
|
drm_plane_helper_disable(drm_plane);
|
|
|
|
drm_plane_cleanup(drm_plane);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sti_cursor_late_register(struct drm_plane *drm_plane)
|
|
|
|
{
|
|
|
|
struct sti_plane *plane = to_sti_plane(drm_plane);
|
|
|
|
struct sti_cursor *cursor = to_sti_cursor(plane);
|
|
|
|
|
|
|
|
return cursor_debugfs_init(cursor, drm_plane->dev->primary);
|
|
|
|
}
|
|
|
|
|
2016-09-19 16:33:53 +03:00
|
|
|
static const struct drm_plane_funcs sti_cursor_plane_helpers_funcs = {
|
2016-06-21 16:09:39 +03:00
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
|
|
|
.destroy = sti_cursor_destroy,
|
2016-03-24 19:18:20 +03:00
|
|
|
.set_property = drm_atomic_helper_plane_set_property,
|
|
|
|
.reset = sti_plane_reset,
|
2016-06-21 16:09:39 +03:00
|
|
|
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
|
|
|
|
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
|
|
|
|
.late_register = sti_cursor_late_register,
|
|
|
|
};
|
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
struct drm_plane *sti_cursor_create(struct drm_device *drm_dev,
|
|
|
|
struct device *dev, int desc,
|
|
|
|
void __iomem *baseaddr,
|
|
|
|
unsigned int possible_crtcs)
|
2014-12-11 15:34:42 +03:00
|
|
|
{
|
|
|
|
struct sti_cursor *cursor;
|
2015-08-03 15:22:16 +03:00
|
|
|
size_t size;
|
|
|
|
int res;
|
2014-12-11 15:34:42 +03:00
|
|
|
|
|
|
|
cursor = devm_kzalloc(dev, sizeof(*cursor), GFP_KERNEL);
|
|
|
|
if (!cursor) {
|
|
|
|
DRM_ERROR("Failed to allocate memory for cursor\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate clut buffer */
|
2015-08-03 15:22:16 +03:00
|
|
|
size = 0x100 * sizeof(unsigned short);
|
dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()
Rename dma_*_writecombine() to dma_*_wc(), so that the naming
is coherent across the various write-combining APIs. Keep the
old names for compatibility for a while, these can be removed
at a later time. A guard is left to enable backporting of the
rename, and later remove of the old mapping defines seemlessly.
Build tested successfully with allmodconfig.
The following Coccinelle SmPL patch was used for this simple
transformation:
@ rename_dma_alloc_writecombine @
expression dev, size, dma_addr, gfp;
@@
-dma_alloc_writecombine(dev, size, dma_addr, gfp)
+dma_alloc_wc(dev, size, dma_addr, gfp)
@ rename_dma_free_writecombine @
expression dev, size, cpu_addr, dma_addr;
@@
-dma_free_writecombine(dev, size, cpu_addr, dma_addr)
+dma_free_wc(dev, size, cpu_addr, dma_addr)
@ rename_dma_mmap_writecombine @
expression dev, vma, cpu_addr, dma_addr, size;
@@
-dma_mmap_writecombine(dev, vma, cpu_addr, dma_addr, size)
+dma_mmap_wc(dev, vma, cpu_addr, dma_addr, size)
We also keep the old names as compatibility helpers, and
guard against their definition to make backporting easier.
Generated-by: Coccinelle SmPL
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: akpm@linux-foundation.org
Cc: benh@kernel.crashing.org
Cc: bhelgaas@google.com
Cc: bp@suse.de
Cc: dan.j.williams@intel.com
Cc: daniel.vetter@ffwll.ch
Cc: dhowells@redhat.com
Cc: julia.lawall@lip6.fr
Cc: konrad.wilk@oracle.com
Cc: linux-fbdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: luto@amacapital.net
Cc: mst@redhat.com
Cc: tomi.valkeinen@ti.com
Cc: toshi.kani@hp.com
Cc: vinod.koul@intel.com
Cc: xen-devel@lists.xensource.com
Link: http://lkml.kernel.org/r/1453516462-4844-1-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-01-23 05:34:22 +03:00
|
|
|
cursor->clut = dma_alloc_wc(dev, size, &cursor->clut_paddr,
|
|
|
|
GFP_KERNEL | GFP_DMA);
|
2014-12-11 15:34:42 +03:00
|
|
|
|
|
|
|
if (!cursor->clut) {
|
|
|
|
DRM_ERROR("Failed to allocate memory for cursor clut\n");
|
2015-08-03 15:22:16 +03:00
|
|
|
goto err_clut;
|
2014-12-11 15:34:42 +03:00
|
|
|
}
|
|
|
|
|
2015-07-31 12:32:13 +03:00
|
|
|
cursor->dev = dev;
|
|
|
|
cursor->regs = baseaddr;
|
|
|
|
cursor->plane.desc = desc;
|
2015-08-03 15:22:16 +03:00
|
|
|
cursor->plane.status = STI_PLANE_DISABLED;
|
2014-12-11 15:34:42 +03:00
|
|
|
|
2015-07-31 12:32:13 +03:00
|
|
|
sti_cursor_init(cursor);
|
|
|
|
|
2015-08-03 15:22:16 +03:00
|
|
|
res = drm_universal_plane_init(drm_dev, &cursor->plane.drm_plane,
|
|
|
|
possible_crtcs,
|
2016-06-21 16:09:39 +03:00
|
|
|
&sti_cursor_plane_helpers_funcs,
|
2015-08-03 15:22:16 +03:00
|
|
|
cursor_supported_formats,
|
|
|
|
ARRAY_SIZE(cursor_supported_formats),
|
drm: Pass 'name' to drm_universal_plane_init()
Done with coccinelle for the most part. It choked on
msm/mdp/mdp5/mdp5_plane.c like so:
"BAD:!!!!! enum drm_plane_type type;"
No idea how to deal with that, so I just fixed that up
by hand.
Also it thinks '...' is part of the semantic patch, so I put an
'int DOTDOTDOT' placeholder in its place and got rid of it with
sed afterwards.
I didn't convert drm_plane_init() since passing the varargs through
would mean either cpp macros or va_list, and I figured we don't
care about these legacy functions enough to warrant the extra pain.
@@
typedef uint32_t;
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
int drm_universal_plane_init(struct drm_device *dev,
struct drm_plane *plane,
unsigned long possible_crtcs,
const struct drm_plane_funcs *funcs,
const uint32_t *formats,
unsigned int format_count,
enum drm_plane_type type
+ ,const char *name, int DOTDOTDOT
)
{ ... }
@@
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
int drm_universal_plane_init(struct drm_device *dev,
struct drm_plane *plane,
unsigned long possible_crtcs,
const struct drm_plane_funcs *funcs,
const uint32_t *formats,
unsigned int format_count,
enum drm_plane_type type
+ ,const char *name, int DOTDOTDOT
);
@@
expression E1, E2, E3, E4, E5, E6, E7;
@@
drm_universal_plane_init(E1, E2, E3, E4, E5, E6, E7
+ ,NULL
)
v2: Split crtc and plane changes apart
Pass NUL for no-name instead of ""
Leave drm_plane_init() alone
v3: Add ', or NULL...' to @name kernel doc (Jani)
Annotate the function with __printf() attribute (Jani)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670795-2853-1-git-send-email-ville.syrjala@linux.intel.com
2015-12-09 17:19:55 +03:00
|
|
|
DRM_PLANE_TYPE_CURSOR, NULL);
|
2015-08-03 15:22:16 +03:00
|
|
|
if (res) {
|
|
|
|
DRM_ERROR("Failed to initialize universal plane\n");
|
|
|
|
goto err_plane;
|
|
|
|
}
|
|
|
|
|
|
|
|
drm_plane_helper_add(&cursor->plane.drm_plane,
|
|
|
|
&sti_cursor_helpers_funcs);
|
|
|
|
|
|
|
|
sti_plane_init_property(&cursor->plane, DRM_PLANE_TYPE_CURSOR);
|
|
|
|
|
|
|
|
return &cursor->plane.drm_plane;
|
|
|
|
|
|
|
|
err_plane:
|
dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()
Rename dma_*_writecombine() to dma_*_wc(), so that the naming
is coherent across the various write-combining APIs. Keep the
old names for compatibility for a while, these can be removed
at a later time. A guard is left to enable backporting of the
rename, and later remove of the old mapping defines seemlessly.
Build tested successfully with allmodconfig.
The following Coccinelle SmPL patch was used for this simple
transformation:
@ rename_dma_alloc_writecombine @
expression dev, size, dma_addr, gfp;
@@
-dma_alloc_writecombine(dev, size, dma_addr, gfp)
+dma_alloc_wc(dev, size, dma_addr, gfp)
@ rename_dma_free_writecombine @
expression dev, size, cpu_addr, dma_addr;
@@
-dma_free_writecombine(dev, size, cpu_addr, dma_addr)
+dma_free_wc(dev, size, cpu_addr, dma_addr)
@ rename_dma_mmap_writecombine @
expression dev, vma, cpu_addr, dma_addr, size;
@@
-dma_mmap_writecombine(dev, vma, cpu_addr, dma_addr, size)
+dma_mmap_wc(dev, vma, cpu_addr, dma_addr, size)
We also keep the old names as compatibility helpers, and
guard against their definition to make backporting easier.
Generated-by: Coccinelle SmPL
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: akpm@linux-foundation.org
Cc: benh@kernel.crashing.org
Cc: bhelgaas@google.com
Cc: bp@suse.de
Cc: dan.j.williams@intel.com
Cc: daniel.vetter@ffwll.ch
Cc: dhowells@redhat.com
Cc: julia.lawall@lip6.fr
Cc: konrad.wilk@oracle.com
Cc: linux-fbdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: luto@amacapital.net
Cc: mst@redhat.com
Cc: tomi.valkeinen@ti.com
Cc: toshi.kani@hp.com
Cc: vinod.koul@intel.com
Cc: xen-devel@lists.xensource.com
Link: http://lkml.kernel.org/r/1453516462-4844-1-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-01-23 05:34:22 +03:00
|
|
|
dma_free_wc(dev, size, cursor->clut, cursor->clut_paddr);
|
2015-08-03 15:22:16 +03:00
|
|
|
err_clut:
|
|
|
|
devm_kfree(dev, cursor);
|
|
|
|
return NULL;
|
2014-12-11 15:34:42 +03:00
|
|
|
}
|