2013-06-19 19:54:11 +08:00
|
|
|
/*
|
|
|
|
* rcar_du_plane.c -- R-Car Display Unit Planes
|
|
|
|
*
|
2015-09-07 22:34:26 +08:00
|
|
|
* Copyright (C) 2013-2015 Renesas Electronics Corporation
|
2013-06-19 19:54:11 +08:00
|
|
|
*
|
|
|
|
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <drm/drmP.h>
|
2015-07-27 20:34:18 +08:00
|
|
|
#include <drm/drm_atomic.h>
|
2015-02-20 17:30:59 +08:00
|
|
|
#include <drm/drm_atomic_helper.h>
|
2013-06-19 19:54:11 +08:00
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
#include <drm/drm_crtc_helper.h>
|
|
|
|
#include <drm/drm_fb_cma_helper.h>
|
|
|
|
#include <drm/drm_gem_cma_helper.h>
|
2015-02-18 18:18:05 +08:00
|
|
|
#include <drm/drm_plane_helper.h>
|
2013-06-19 19:54:11 +08:00
|
|
|
|
|
|
|
#include "rcar_du_drv.h"
|
2013-06-21 23:54:50 +08:00
|
|
|
#include "rcar_du_group.h"
|
2013-06-19 19:54:11 +08:00
|
|
|
#include "rcar_du_kms.h"
|
|
|
|
#include "rcar_du_plane.h"
|
|
|
|
#include "rcar_du_regs.h"
|
|
|
|
|
2015-07-27 20:34:18 +08:00
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
* Atomic hardware plane allocator
|
|
|
|
*
|
|
|
|
* The hardware plane allocator is solely based on the atomic plane states
|
|
|
|
* without keeping any external state to avoid races between .atomic_check()
|
|
|
|
* and .atomic_commit().
|
|
|
|
*
|
|
|
|
* The core idea is to avoid using a free planes bitmask that would need to be
|
|
|
|
* shared between check and commit handlers with a collective knowledge based on
|
|
|
|
* the allocated hardware plane(s) for each KMS plane. The allocator then loops
|
|
|
|
* over all plane states to compute the free planes bitmask, allocates hardware
|
|
|
|
* planes based on that bitmask, and stores the result back in the plane states.
|
|
|
|
*
|
|
|
|
* For this to work we need to access the current state of planes not touched by
|
|
|
|
* the atomic update. To ensure that it won't be modified, we need to lock all
|
|
|
|
* planes using drm_atomic_get_plane_state(). This effectively serializes atomic
|
|
|
|
* updates from .atomic_check() up to completion (when swapping the states if
|
|
|
|
* the check step has succeeded) or rollback (when freeing the states if the
|
|
|
|
* check step has failed).
|
|
|
|
*
|
|
|
|
* Allocation is performed in the .atomic_check() handler and applied
|
|
|
|
* automatically when the core swaps the old and new states.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static bool rcar_du_plane_needs_realloc(struct rcar_du_plane *plane,
|
|
|
|
struct rcar_du_plane_state *new_state)
|
|
|
|
{
|
|
|
|
struct rcar_du_plane_state *cur_state;
|
|
|
|
|
|
|
|
cur_state = to_rcar_plane_state(plane->plane.state);
|
|
|
|
|
|
|
|
/* Lowering the number of planes doesn't strictly require reallocation
|
|
|
|
* as the extra hardware plane will be freed when committing, but doing
|
|
|
|
* so could lead to more fragmentation.
|
|
|
|
*/
|
|
|
|
if (!cur_state->format ||
|
|
|
|
cur_state->format->planes != new_state->format->planes)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Reallocate hardware planes if the source has changed. */
|
|
|
|
if (cur_state->source != new_state->source)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int rcar_du_plane_hwmask(struct rcar_du_plane_state *state)
|
|
|
|
{
|
|
|
|
unsigned int mask;
|
|
|
|
|
|
|
|
if (state->hwindex == -1)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
mask = 1 << state->hwindex;
|
|
|
|
if (state->format->planes == 2)
|
|
|
|
mask |= 1 << ((state->hwindex + 1) % 8);
|
|
|
|
|
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The R8A7790 DU can source frames directly from the VSP1 devices VSPD0 and
|
|
|
|
* VSPD1. VSPD0 feeds DU0/1 plane 0, and VSPD1 feeds either DU2 plane 0 or
|
|
|
|
* DU0/1 plane 1.
|
|
|
|
*
|
|
|
|
* Allocate the correct fixed plane when sourcing frames from VSPD0 or VSPD1,
|
|
|
|
* and allocate planes in reverse index order otherwise to ensure maximum
|
|
|
|
* availability of planes 0 and 1.
|
|
|
|
*
|
|
|
|
* The caller is responsible for ensuring that the requested source is
|
|
|
|
* compatible with the DU revision.
|
|
|
|
*/
|
|
|
|
static int rcar_du_plane_hwalloc(struct rcar_du_plane *plane,
|
|
|
|
struct rcar_du_plane_state *state,
|
|
|
|
unsigned int free)
|
|
|
|
{
|
|
|
|
unsigned int num_planes = state->format->planes;
|
|
|
|
int fixed = -1;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (state->source == RCAR_DU_PLANE_VSPD0) {
|
|
|
|
/* VSPD0 feeds plane 0 on DU0/1. */
|
|
|
|
if (plane->group->index != 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
fixed = 0;
|
|
|
|
} else if (state->source == RCAR_DU_PLANE_VSPD1) {
|
|
|
|
/* VSPD1 feeds plane 1 on DU0/1 or plane 0 on DU2. */
|
|
|
|
fixed = plane->group->index == 0 ? 1 : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fixed >= 0)
|
|
|
|
return free & (1 << fixed) ? fixed : -EBUSY;
|
|
|
|
|
|
|
|
for (i = RCAR_DU_NUM_HW_PLANES - 1; i >= 0; --i) {
|
|
|
|
if (!(free & (1 << i)))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (num_planes == 1 || free & (1 << ((i + 1) % 8)))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return i < 0 ? -EBUSY : i;
|
|
|
|
}
|
|
|
|
|
|
|
|
int rcar_du_atomic_check_planes(struct drm_device *dev,
|
|
|
|
struct drm_atomic_state *state)
|
|
|
|
{
|
|
|
|
struct rcar_du_device *rcdu = dev->dev_private;
|
|
|
|
unsigned int group_freed_planes[RCAR_DU_MAX_GROUPS] = { 0, };
|
|
|
|
unsigned int group_free_planes[RCAR_DU_MAX_GROUPS] = { 0, };
|
|
|
|
bool needs_realloc = false;
|
|
|
|
unsigned int groups = 0;
|
|
|
|
unsigned int i;
|
2016-06-02 06:06:27 +08:00
|
|
|
struct drm_plane *drm_plane;
|
|
|
|
struct drm_plane_state *drm_plane_state;
|
2015-07-27 20:34:18 +08:00
|
|
|
|
|
|
|
/* Check if hardware planes need to be reallocated. */
|
2016-06-02 06:06:27 +08:00
|
|
|
for_each_plane_in_state(state, drm_plane, drm_plane_state, i) {
|
2015-07-27 20:34:18 +08:00
|
|
|
struct rcar_du_plane_state *plane_state;
|
|
|
|
struct rcar_du_plane *plane;
|
|
|
|
unsigned int index;
|
|
|
|
|
2016-06-02 06:06:27 +08:00
|
|
|
plane = to_rcar_plane(drm_plane);
|
|
|
|
plane_state = to_rcar_plane_state(drm_plane_state);
|
2015-07-27 20:34:18 +08:00
|
|
|
|
2015-08-26 08:37:08 +08:00
|
|
|
dev_dbg(rcdu->dev, "%s: checking plane (%u,%tu)\n", __func__,
|
2015-07-27 20:34:18 +08:00
|
|
|
plane->group->index, plane - plane->group->planes);
|
|
|
|
|
|
|
|
/* If the plane is being disabled we don't need to go through
|
|
|
|
* the full reallocation procedure. Just mark the hardware
|
|
|
|
* plane(s) as freed.
|
|
|
|
*/
|
|
|
|
if (!plane_state->format) {
|
|
|
|
dev_dbg(rcdu->dev, "%s: plane is being disabled\n",
|
|
|
|
__func__);
|
|
|
|
index = plane - plane->group->planes;
|
|
|
|
group_freed_planes[plane->group->index] |= 1 << index;
|
|
|
|
plane_state->hwindex = -1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the plane needs to be reallocated mark it as such, and
|
|
|
|
* mark the hardware plane(s) as free.
|
|
|
|
*/
|
|
|
|
if (rcar_du_plane_needs_realloc(plane, plane_state)) {
|
|
|
|
dev_dbg(rcdu->dev, "%s: plane needs reallocation\n",
|
|
|
|
__func__);
|
|
|
|
groups |= 1 << plane->group->index;
|
|
|
|
needs_realloc = true;
|
|
|
|
|
|
|
|
index = plane - plane->group->planes;
|
|
|
|
group_freed_planes[plane->group->index] |= 1 << index;
|
|
|
|
plane_state->hwindex = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!needs_realloc)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Grab all plane states for the groups that need reallocation to ensure
|
|
|
|
* locking and avoid racy updates. This serializes the update operation,
|
|
|
|
* but there's not much we can do about it as that's the hardware
|
|
|
|
* design.
|
|
|
|
*
|
|
|
|
* Compute the used planes mask for each group at the same time to avoid
|
|
|
|
* looping over the planes separately later.
|
|
|
|
*/
|
|
|
|
while (groups) {
|
|
|
|
unsigned int index = ffs(groups) - 1;
|
|
|
|
struct rcar_du_group *group = &rcdu->groups[index];
|
|
|
|
unsigned int used_planes = 0;
|
|
|
|
|
|
|
|
dev_dbg(rcdu->dev, "%s: finding free planes for group %u\n",
|
|
|
|
__func__, index);
|
|
|
|
|
|
|
|
for (i = 0; i < group->num_planes; ++i) {
|
|
|
|
struct rcar_du_plane *plane = &group->planes[i];
|
|
|
|
struct rcar_du_plane_state *plane_state;
|
|
|
|
struct drm_plane_state *s;
|
|
|
|
|
|
|
|
s = drm_atomic_get_plane_state(state, &plane->plane);
|
|
|
|
if (IS_ERR(s))
|
|
|
|
return PTR_ERR(s);
|
|
|
|
|
|
|
|
/* If the plane has been freed in the above loop its
|
|
|
|
* hardware planes must not be added to the used planes
|
|
|
|
* bitmask. However, the current state doesn't reflect
|
|
|
|
* the free state yet, as we've modified the new state
|
|
|
|
* above. Use the local freed planes list to check for
|
|
|
|
* that condition instead.
|
|
|
|
*/
|
|
|
|
if (group_freed_planes[index] & (1 << i)) {
|
|
|
|
dev_dbg(rcdu->dev,
|
2015-08-26 08:37:08 +08:00
|
|
|
"%s: plane (%u,%tu) has been freed, skipping\n",
|
2015-07-27 20:34:18 +08:00
|
|
|
__func__, plane->group->index,
|
|
|
|
plane - plane->group->planes);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
plane_state = to_rcar_plane_state(plane->plane.state);
|
|
|
|
used_planes |= rcar_du_plane_hwmask(plane_state);
|
|
|
|
|
|
|
|
dev_dbg(rcdu->dev,
|
2015-08-26 08:37:08 +08:00
|
|
|
"%s: plane (%u,%tu) uses %u hwplanes (index %d)\n",
|
2015-07-27 20:34:18 +08:00
|
|
|
__func__, plane->group->index,
|
|
|
|
plane - plane->group->planes,
|
|
|
|
plane_state->format ?
|
|
|
|
plane_state->format->planes : 0,
|
|
|
|
plane_state->hwindex);
|
|
|
|
}
|
|
|
|
|
|
|
|
group_free_planes[index] = 0xff & ~used_planes;
|
|
|
|
groups &= ~(1 << index);
|
|
|
|
|
|
|
|
dev_dbg(rcdu->dev, "%s: group %u free planes mask 0x%02x\n",
|
|
|
|
__func__, index, group_free_planes[index]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Reallocate hardware planes for each plane that needs it. */
|
2016-06-02 06:06:27 +08:00
|
|
|
for_each_plane_in_state(state, drm_plane, drm_plane_state, i) {
|
2015-07-27 20:34:18 +08:00
|
|
|
struct rcar_du_plane_state *plane_state;
|
|
|
|
struct rcar_du_plane *plane;
|
|
|
|
unsigned int crtc_planes;
|
|
|
|
unsigned int free;
|
|
|
|
int idx;
|
|
|
|
|
2016-06-02 06:06:27 +08:00
|
|
|
plane = to_rcar_plane(drm_plane);
|
|
|
|
plane_state = to_rcar_plane_state(drm_plane_state);
|
2015-07-27 20:34:18 +08:00
|
|
|
|
2015-08-26 08:37:08 +08:00
|
|
|
dev_dbg(rcdu->dev, "%s: allocating plane (%u,%tu)\n", __func__,
|
2015-07-27 20:34:18 +08:00
|
|
|
plane->group->index, plane - plane->group->planes);
|
|
|
|
|
|
|
|
/* Skip planes that are being disabled or don't need to be
|
|
|
|
* reallocated.
|
|
|
|
*/
|
|
|
|
if (!plane_state->format ||
|
|
|
|
!rcar_du_plane_needs_realloc(plane, plane_state))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Try to allocate the plane from the free planes currently
|
|
|
|
* associated with the target CRTC to avoid restarting the CRTC
|
|
|
|
* group and thus minimize flicker. If it fails fall back to
|
|
|
|
* allocating from all free planes.
|
|
|
|
*/
|
|
|
|
crtc_planes = to_rcar_crtc(plane_state->state.crtc)->index % 2
|
|
|
|
? plane->group->dptsr_planes
|
|
|
|
: ~plane->group->dptsr_planes;
|
|
|
|
free = group_free_planes[plane->group->index];
|
|
|
|
|
|
|
|
idx = rcar_du_plane_hwalloc(plane, plane_state,
|
|
|
|
free & crtc_planes);
|
|
|
|
if (idx < 0)
|
|
|
|
idx = rcar_du_plane_hwalloc(plane, plane_state,
|
|
|
|
free);
|
|
|
|
if (idx < 0) {
|
|
|
|
dev_dbg(rcdu->dev, "%s: no available hardware plane\n",
|
|
|
|
__func__);
|
|
|
|
return idx;
|
|
|
|
}
|
|
|
|
|
|
|
|
dev_dbg(rcdu->dev, "%s: allocated %u hwplanes (index %u)\n",
|
|
|
|
__func__, plane_state->format->planes, idx);
|
|
|
|
|
|
|
|
plane_state->hwindex = idx;
|
|
|
|
|
|
|
|
group_free_planes[plane->group->index] &=
|
|
|
|
~rcar_du_plane_hwmask(plane_state);
|
|
|
|
|
|
|
|
dev_dbg(rcdu->dev, "%s: group %u free planes mask 0x%02x\n",
|
|
|
|
__func__, plane->group->index,
|
|
|
|
group_free_planes[plane->group->index]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
|
|
* Plane Setup
|
|
|
|
*/
|
|
|
|
|
2013-06-19 19:54:11 +08:00
|
|
|
#define RCAR_DU_COLORKEY_NONE (0 << 24)
|
|
|
|
#define RCAR_DU_COLORKEY_SOURCE (1 << 24)
|
|
|
|
#define RCAR_DU_COLORKEY_MASK (1 << 24)
|
|
|
|
|
2013-06-17 03:01:02 +08:00
|
|
|
static void rcar_du_plane_write(struct rcar_du_group *rgrp,
|
2013-06-19 19:54:11 +08:00
|
|
|
unsigned int index, u32 reg, u32 data)
|
|
|
|
{
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_write(rgrp->dev, rgrp->mmio_offset + index * PLANE_OFF + reg,
|
|
|
|
data);
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
static void rcar_du_plane_setup_scanout(struct rcar_du_group *rgrp,
|
|
|
|
const struct rcar_du_plane_state *state)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
2015-02-23 08:59:35 +08:00
|
|
|
unsigned int src_x = state->state.src_x >> 16;
|
|
|
|
unsigned int src_y = state->state.src_y >> 16;
|
2015-02-26 00:27:19 +08:00
|
|
|
unsigned int index = state->hwindex;
|
2015-07-27 18:43:09 +08:00
|
|
|
unsigned int pitch;
|
2014-12-10 01:11:18 +08:00
|
|
|
bool interlaced;
|
2015-07-27 18:43:09 +08:00
|
|
|
u32 dma[2];
|
2013-11-13 21:26:01 +08:00
|
|
|
|
2015-02-23 08:59:35 +08:00
|
|
|
interlaced = state->state.crtc->state->adjusted_mode.flags
|
2015-02-23 01:24:59 +08:00
|
|
|
& DRM_MODE_FLAG_INTERLACE;
|
2014-12-10 01:11:18 +08:00
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
if (state->source == RCAR_DU_PLANE_MEMORY) {
|
|
|
|
struct drm_framebuffer *fb = state->state.fb;
|
|
|
|
struct drm_gem_cma_object *gem;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (state->format->planes == 2)
|
|
|
|
pitch = fb->pitches[0];
|
|
|
|
else
|
|
|
|
pitch = fb->pitches[0] * 8 / state->format->bpp;
|
2013-11-13 21:26:01 +08:00
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
for (i = 0; i < state->format->planes; ++i) {
|
|
|
|
gem = drm_fb_cma_get_gem_obj(fb, i);
|
|
|
|
dma[i] = gem->paddr + fb->offsets[i];
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
pitch = state->state.src_w >> 16;
|
|
|
|
dma[0] = 0;
|
|
|
|
dma[1] = 0;
|
2015-07-27 18:43:09 +08:00
|
|
|
}
|
2014-12-10 01:11:18 +08:00
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
/* Memory pitch (expressed in pixels). Must be doubled for interlaced
|
|
|
|
* operation with 32bpp formats.
|
|
|
|
*/
|
2015-07-27 18:43:09 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnMWR,
|
|
|
|
(interlaced && state->format->bpp == 32) ?
|
|
|
|
pitch * 2 : pitch);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2013-06-15 02:54:16 +08:00
|
|
|
/* The Y position is expressed in raster line units and must be doubled
|
|
|
|
* for 32bpp formats, according to the R8A7790 datasheet. No mention of
|
|
|
|
* doubling the Y position is found in the R8A7779 datasheet, but the
|
|
|
|
* rule seems to apply there as well.
|
|
|
|
*
|
2014-12-10 01:11:18 +08:00
|
|
|
* Despite not being documented, doubling seem not to be needed when
|
|
|
|
* operating in interlaced mode.
|
|
|
|
*
|
2013-06-15 02:54:16 +08:00
|
|
|
* Similarly, for the second plane, NV12 and NV21 formats seem to
|
2014-12-10 01:11:18 +08:00
|
|
|
* require a halved Y position value, in both progressive and interlaced
|
|
|
|
* modes.
|
2013-06-19 19:54:11 +08:00
|
|
|
*/
|
2015-02-20 21:58:38 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnSPXR, src_x);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnSPYR, src_y *
|
2015-02-23 08:59:35 +08:00
|
|
|
(!interlaced && state->format->bpp == 32 ? 2 : 1));
|
2015-02-23 07:25:19 +08:00
|
|
|
|
2015-07-27 18:43:09 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnDSA0R, dma[0]);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-23 08:59:35 +08:00
|
|
|
if (state->format->planes == 2) {
|
2013-06-19 19:54:11 +08:00
|
|
|
index = (index + 1) % 8;
|
|
|
|
|
2015-07-27 18:43:09 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnMWR, pitch);
|
2014-12-10 04:45:11 +08:00
|
|
|
|
2015-02-20 21:58:38 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnSPXR, src_x);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnSPYR, src_y *
|
2015-02-23 08:59:35 +08:00
|
|
|
(state->format->bpp == 16 ? 2 : 1) / 2);
|
2013-11-13 21:26:01 +08:00
|
|
|
|
2015-07-27 18:43:09 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnDSA0R, dma[1]);
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
static void rcar_du_plane_setup_mode(struct rcar_du_group *rgrp,
|
|
|
|
unsigned int index,
|
|
|
|
const struct rcar_du_plane_state *state)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
|
|
|
u32 colorkey;
|
|
|
|
u32 pnmr;
|
|
|
|
|
|
|
|
/* The PnALPHAR register controls alpha-blending in 16bpp formats
|
|
|
|
* (ARGB1555 and XRGB1555).
|
|
|
|
*
|
|
|
|
* For ARGB, set the alpha value to 0, and enable alpha-blending when
|
|
|
|
* the A bit is 0. This maps A=0 to alpha=0 and A=1 to alpha=255.
|
|
|
|
*
|
|
|
|
* For XRGB, set the alpha value to the plane-wide alpha value and
|
|
|
|
* enable alpha-blending regardless of the X bit value.
|
|
|
|
*/
|
2015-02-23 08:59:35 +08:00
|
|
|
if (state->format->fourcc != DRM_FORMAT_XRGB1555)
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnALPHAR, PnALPHAR_ABIT_0);
|
2013-06-19 19:54:11 +08:00
|
|
|
else
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnALPHAR,
|
2015-02-23 08:36:31 +08:00
|
|
|
PnALPHAR_ABIT_X | state->alpha);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-23 08:59:35 +08:00
|
|
|
pnmr = PnMR_BM_MD | state->format->pnmr;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
|
|
|
/* Disable color keying when requested. YUV formats have the
|
|
|
|
* PnMR_SPIM_TP_OFF bit set in their pnmr field, disabling color keying
|
|
|
|
* automatically.
|
|
|
|
*/
|
2015-02-23 08:36:31 +08:00
|
|
|
if ((state->colorkey & RCAR_DU_COLORKEY_MASK) == RCAR_DU_COLORKEY_NONE)
|
2013-06-19 19:54:11 +08:00
|
|
|
pnmr |= PnMR_SPIM_TP_OFF;
|
|
|
|
|
|
|
|
/* For packed YUV formats we need to select the U/V order. */
|
2015-02-23 08:59:35 +08:00
|
|
|
if (state->format->fourcc == DRM_FORMAT_YUYV)
|
2013-06-19 19:54:11 +08:00
|
|
|
pnmr |= PnMR_YCDF_YUYV;
|
|
|
|
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnMR, pnmr);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-23 08:59:35 +08:00
|
|
|
switch (state->format->fourcc) {
|
2013-06-19 19:54:11 +08:00
|
|
|
case DRM_FORMAT_RGB565:
|
2015-02-23 08:36:31 +08:00
|
|
|
colorkey = ((state->colorkey & 0xf80000) >> 8)
|
|
|
|
| ((state->colorkey & 0x00fc00) >> 5)
|
|
|
|
| ((state->colorkey & 0x0000f8) >> 3);
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnTC2R, colorkey);
|
2013-06-19 19:54:11 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DRM_FORMAT_ARGB1555:
|
|
|
|
case DRM_FORMAT_XRGB1555:
|
2015-02-23 08:36:31 +08:00
|
|
|
colorkey = ((state->colorkey & 0xf80000) >> 9)
|
|
|
|
| ((state->colorkey & 0x00f800) >> 6)
|
|
|
|
| ((state->colorkey & 0x0000f8) >> 3);
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnTC2R, colorkey);
|
2013-06-19 19:54:11 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
case DRM_FORMAT_ARGB8888:
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnTC3R,
|
2015-02-23 08:36:31 +08:00
|
|
|
PnTC3R_CODE | (state->colorkey & 0xffffff));
|
2013-06-19 19:54:11 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-07 22:34:26 +08:00
|
|
|
static void rcar_du_plane_setup_format_gen2(struct rcar_du_group *rgrp,
|
|
|
|
unsigned int index,
|
|
|
|
const struct rcar_du_plane_state *state)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
|
|
|
u32 ddcr2 = PnDDCR2_CODE;
|
|
|
|
u32 ddcr4;
|
|
|
|
|
|
|
|
/* Data format
|
|
|
|
*
|
|
|
|
* The data format is selected by the DDDF field in PnMR and the EDF
|
|
|
|
* field in DDCR4.
|
|
|
|
*/
|
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
rcar_du_plane_setup_mode(rgrp, index, state);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-23 08:59:35 +08:00
|
|
|
if (state->format->planes == 2) {
|
2015-02-26 00:27:19 +08:00
|
|
|
if (state->hwindex != index) {
|
2015-02-23 08:59:35 +08:00
|
|
|
if (state->format->fourcc == DRM_FORMAT_NV12 ||
|
|
|
|
state->format->fourcc == DRM_FORMAT_NV21)
|
2013-06-19 19:54:11 +08:00
|
|
|
ddcr2 |= PnDDCR2_Y420;
|
|
|
|
|
2015-02-23 08:59:35 +08:00
|
|
|
if (state->format->fourcc == DRM_FORMAT_NV21)
|
2013-06-19 19:54:11 +08:00
|
|
|
ddcr2 |= PnDDCR2_NV21;
|
|
|
|
|
|
|
|
ddcr2 |= PnDDCR2_DIVU;
|
|
|
|
} else {
|
|
|
|
ddcr2 |= PnDDCR2_DIVY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnDDCR2, ddcr2);
|
2015-07-27 17:46:44 +08:00
|
|
|
|
|
|
|
ddcr4 = state->format->edf | PnDDCR4_CODE;
|
2013-06-21 23:54:50 +08:00
|
|
|
if (state->source != RCAR_DU_PLANE_MEMORY)
|
|
|
|
ddcr4 |= PnDDCR4_VSPS;
|
2015-07-27 17:46:44 +08:00
|
|
|
|
2013-06-17 03:01:02 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnDDCR4, ddcr4);
|
2015-09-07 22:34:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void rcar_du_plane_setup_format_gen3(struct rcar_du_group *rgrp,
|
|
|
|
unsigned int index,
|
|
|
|
const struct rcar_du_plane_state *state)
|
|
|
|
{
|
|
|
|
rcar_du_plane_write(rgrp, index, PnMR,
|
|
|
|
PnMR_SPIM_TP_OFF | state->format->pnmr);
|
|
|
|
|
|
|
|
rcar_du_plane_write(rgrp, index, PnDDCR4,
|
|
|
|
state->format->edf | PnDDCR4_CODE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rcar_du_plane_setup_format(struct rcar_du_group *rgrp,
|
|
|
|
unsigned int index,
|
|
|
|
const struct rcar_du_plane_state *state)
|
|
|
|
{
|
|
|
|
struct rcar_du_device *rcdu = rgrp->dev;
|
|
|
|
|
|
|
|
if (rcdu->info->gen < 3)
|
|
|
|
rcar_du_plane_setup_format_gen2(rgrp, index, state);
|
|
|
|
else
|
|
|
|
rcar_du_plane_setup_format_gen3(rgrp, index, state);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
|
|
|
/* Destination position and size */
|
2013-06-21 23:54:50 +08:00
|
|
|
rcar_du_plane_write(rgrp, index, PnDSXR, state->state.crtc_w);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnDSYR, state->state.crtc_h);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnDPXR, state->state.crtc_x);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnDPYR, state->state.crtc_y);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-09-07 22:34:26 +08:00
|
|
|
if (rcdu->info->gen < 3) {
|
|
|
|
/* Wrap-around and blinking, disabled */
|
|
|
|
rcar_du_plane_write(rgrp, index, PnWASPR, 0);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnWAMWR, 4095);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnBTR, 0);
|
|
|
|
rcar_du_plane_write(rgrp, index, PnMLR, 0);
|
|
|
|
}
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
|
2015-09-07 22:14:58 +08:00
|
|
|
void __rcar_du_plane_setup(struct rcar_du_group *rgrp,
|
|
|
|
const struct rcar_du_plane_state *state)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
2015-09-07 22:34:26 +08:00
|
|
|
struct rcar_du_device *rcdu = rgrp->dev;
|
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
rcar_du_plane_setup_format(rgrp, state->hwindex, state);
|
2015-02-23 08:59:35 +08:00
|
|
|
if (state->format->planes == 2)
|
2013-06-21 23:54:50 +08:00
|
|
|
rcar_du_plane_setup_format(rgrp, (state->hwindex + 1) % 8,
|
|
|
|
state);
|
|
|
|
|
2015-09-07 22:34:26 +08:00
|
|
|
if (rcdu->info->gen < 3)
|
|
|
|
rcar_du_plane_setup_scanout(rgrp, state);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2013-06-21 23:54:50 +08:00
|
|
|
if (state->source == RCAR_DU_PLANE_VSPD1) {
|
|
|
|
unsigned int vspd1_sink = rgrp->index ? 2 : 0;
|
|
|
|
|
|
|
|
if (rcdu->vspd1_sink != vspd1_sink) {
|
|
|
|
rcdu->vspd1_sink = vspd1_sink;
|
|
|
|
rcar_du_set_dpad0_vsp1_routing(rcdu);
|
|
|
|
}
|
|
|
|
}
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
|
2015-02-18 18:18:05 +08:00
|
|
|
static int rcar_du_plane_atomic_check(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
2015-04-29 05:48:17 +08:00
|
|
|
struct rcar_du_plane_state *rstate = to_rcar_plane_state(state);
|
2013-06-19 19:54:11 +08:00
|
|
|
struct rcar_du_plane *rplane = to_rcar_plane(plane);
|
2013-06-17 03:01:02 +08:00
|
|
|
struct rcar_du_device *rcdu = rplane->group->dev;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-26 00:27:19 +08:00
|
|
|
if (!state->fb || !state->crtc) {
|
|
|
|
rstate->format = NULL;
|
2015-02-18 18:18:05 +08:00
|
|
|
return 0;
|
2015-02-26 00:27:19 +08:00
|
|
|
}
|
2015-02-18 00:34:17 +08:00
|
|
|
|
2015-02-18 18:18:05 +08:00
|
|
|
if (state->src_w >> 16 != state->crtc_w ||
|
|
|
|
state->src_h >> 16 != state->crtc_h) {
|
|
|
|
dev_dbg(rcdu->dev, "%s: scaling not supported\n", __func__);
|
2013-06-19 19:54:11 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2016-12-15 05:32:55 +08:00
|
|
|
rstate->format = rcar_du_format_info(state->fb->format->format);
|
2015-02-26 00:27:19 +08:00
|
|
|
if (rstate->format == NULL) {
|
2015-02-18 18:18:05 +08:00
|
|
|
dev_dbg(rcdu->dev, "%s: unsupported format %08x\n", __func__,
|
2016-12-15 05:32:55 +08:00
|
|
|
state->fb->format->format);
|
2013-06-19 19:54:11 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-02-18 18:18:05 +08:00
|
|
|
static void rcar_du_plane_atomic_update(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *old_state)
|
|
|
|
{
|
|
|
|
struct rcar_du_plane *rplane = to_rcar_plane(plane);
|
2013-08-24 08:17:03 +08:00
|
|
|
struct rcar_du_plane_state *old_rstate;
|
|
|
|
struct rcar_du_plane_state *new_rstate;
|
2015-02-23 08:59:35 +08:00
|
|
|
|
2013-08-24 08:17:03 +08:00
|
|
|
if (!plane->state->crtc)
|
|
|
|
return;
|
|
|
|
|
|
|
|
rcar_du_plane_setup(rplane);
|
|
|
|
|
|
|
|
/* Check whether the source has changed from memory to live source or
|
|
|
|
* from live source to memory. The source has been configured by the
|
|
|
|
* VSPS bit in the PnDDCR4 register. Although the datasheet states that
|
|
|
|
* the bit is updated during vertical blanking, it seems that updates
|
|
|
|
* only occur when the DU group is held in reset through the DSYSR.DRES
|
|
|
|
* bit. We thus need to restart the group if the source changes.
|
|
|
|
*/
|
|
|
|
old_rstate = to_rcar_plane_state(old_state);
|
|
|
|
new_rstate = to_rcar_plane_state(plane->state);
|
|
|
|
|
|
|
|
if ((old_rstate->source == RCAR_DU_PLANE_MEMORY) !=
|
|
|
|
(new_rstate->source == RCAR_DU_PLANE_MEMORY))
|
|
|
|
rplane->group->need_restart = true;
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
|
2015-02-18 18:18:05 +08:00
|
|
|
static const struct drm_plane_helper_funcs rcar_du_plane_helper_funcs = {
|
|
|
|
.atomic_check = rcar_du_plane_atomic_check,
|
|
|
|
.atomic_update = rcar_du_plane_atomic_update,
|
|
|
|
};
|
|
|
|
|
2015-02-23 08:36:31 +08:00
|
|
|
static struct drm_plane_state *
|
|
|
|
rcar_du_plane_atomic_duplicate_state(struct drm_plane *plane)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
2015-02-23 08:36:31 +08:00
|
|
|
struct rcar_du_plane_state *state;
|
|
|
|
struct rcar_du_plane_state *copy;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-05-27 21:36:29 +08:00
|
|
|
if (WARN_ON(!plane->state))
|
|
|
|
return NULL;
|
|
|
|
|
2015-04-29 05:48:17 +08:00
|
|
|
state = to_rcar_plane_state(plane->state);
|
2015-02-23 08:36:31 +08:00
|
|
|
copy = kmemdup(state, sizeof(*state), GFP_KERNEL);
|
|
|
|
if (copy == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2015-05-27 21:36:29 +08:00
|
|
|
__drm_atomic_helper_plane_duplicate_state(plane, ©->state);
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-23 08:36:31 +08:00
|
|
|
return ©->state;
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
|
2015-02-23 08:36:31 +08:00
|
|
|
static void rcar_du_plane_atomic_destroy_state(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
2016-05-09 22:34:10 +08:00
|
|
|
__drm_atomic_helper_plane_destroy_state(state);
|
2015-04-29 05:48:17 +08:00
|
|
|
kfree(to_rcar_plane_state(state));
|
2015-02-23 08:36:31 +08:00
|
|
|
}
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-07-27 16:42:54 +08:00
|
|
|
static void rcar_du_plane_reset(struct drm_plane *plane)
|
|
|
|
{
|
|
|
|
struct rcar_du_plane_state *state;
|
|
|
|
|
|
|
|
if (plane->state) {
|
|
|
|
rcar_du_plane_atomic_destroy_state(plane, plane->state);
|
|
|
|
plane->state = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
state = kzalloc(sizeof(*state), GFP_KERNEL);
|
|
|
|
if (state == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
state->hwindex = -1;
|
2013-06-21 23:36:15 +08:00
|
|
|
state->source = RCAR_DU_PLANE_MEMORY;
|
2015-07-27 16:42:54 +08:00
|
|
|
state->alpha = 255;
|
|
|
|
state->colorkey = RCAR_DU_COLORKEY_NONE;
|
2016-07-22 20:28:27 +08:00
|
|
|
state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;
|
2015-07-27 16:42:54 +08:00
|
|
|
|
|
|
|
plane->state = &state->state;
|
|
|
|
plane->state->plane = plane;
|
|
|
|
}
|
|
|
|
|
2015-02-23 08:36:31 +08:00
|
|
|
static int rcar_du_plane_atomic_set_property(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state,
|
|
|
|
struct drm_property *property,
|
|
|
|
uint64_t val)
|
|
|
|
{
|
2015-04-29 05:48:17 +08:00
|
|
|
struct rcar_du_plane_state *rstate = to_rcar_plane_state(state);
|
2015-04-29 04:59:29 +08:00
|
|
|
struct rcar_du_device *rcdu = to_rcar_plane(plane)->group->dev;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-04-29 04:59:29 +08:00
|
|
|
if (property == rcdu->props.alpha)
|
2015-02-23 08:36:31 +08:00
|
|
|
rstate->alpha = val;
|
2015-04-29 04:59:29 +08:00
|
|
|
else if (property == rcdu->props.colorkey)
|
2015-02-23 08:36:31 +08:00
|
|
|
rstate->colorkey = val;
|
|
|
|
else
|
|
|
|
return -EINVAL;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-23 08:36:31 +08:00
|
|
|
return 0;
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
|
2015-02-23 08:36:31 +08:00
|
|
|
static int rcar_du_plane_atomic_get_property(struct drm_plane *plane,
|
|
|
|
const struct drm_plane_state *state, struct drm_property *property,
|
|
|
|
uint64_t *val)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
2015-02-23 08:36:31 +08:00
|
|
|
const struct rcar_du_plane_state *rstate =
|
|
|
|
container_of(state, const struct rcar_du_plane_state, state);
|
2015-04-29 04:59:29 +08:00
|
|
|
struct rcar_du_device *rcdu = to_rcar_plane(plane)->group->dev;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-04-29 04:59:29 +08:00
|
|
|
if (property == rcdu->props.alpha)
|
2015-02-23 08:36:31 +08:00
|
|
|
*val = rstate->alpha;
|
2015-04-29 04:59:29 +08:00
|
|
|
else if (property == rcdu->props.colorkey)
|
2015-02-23 08:36:31 +08:00
|
|
|
*val = rstate->colorkey;
|
2013-06-19 19:54:11 +08:00
|
|
|
else
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct drm_plane_funcs rcar_du_plane_funcs = {
|
2015-02-20 19:18:56 +08:00
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
2015-02-23 08:36:31 +08:00
|
|
|
.reset = rcar_du_plane_reset,
|
|
|
|
.set_property = drm_atomic_helper_plane_set_property,
|
2013-06-19 19:54:11 +08:00
|
|
|
.destroy = drm_plane_cleanup,
|
2015-02-23 08:36:31 +08:00
|
|
|
.atomic_duplicate_state = rcar_du_plane_atomic_duplicate_state,
|
|
|
|
.atomic_destroy_state = rcar_du_plane_atomic_destroy_state,
|
|
|
|
.atomic_set_property = rcar_du_plane_atomic_set_property,
|
|
|
|
.atomic_get_property = rcar_du_plane_atomic_get_property,
|
2013-06-19 19:54:11 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static const uint32_t formats[] = {
|
|
|
|
DRM_FORMAT_RGB565,
|
|
|
|
DRM_FORMAT_ARGB1555,
|
|
|
|
DRM_FORMAT_XRGB1555,
|
|
|
|
DRM_FORMAT_XRGB8888,
|
|
|
|
DRM_FORMAT_ARGB8888,
|
|
|
|
DRM_FORMAT_UYVY,
|
|
|
|
DRM_FORMAT_YUYV,
|
|
|
|
DRM_FORMAT_NV12,
|
|
|
|
DRM_FORMAT_NV21,
|
|
|
|
DRM_FORMAT_NV16,
|
|
|
|
};
|
|
|
|
|
2013-06-17 03:01:02 +08:00
|
|
|
int rcar_du_planes_init(struct rcar_du_group *rgrp)
|
2013-06-19 19:54:11 +08:00
|
|
|
{
|
2013-06-17 03:01:02 +08:00
|
|
|
struct rcar_du_device *rcdu = rgrp->dev;
|
2015-02-18 00:34:17 +08:00
|
|
|
unsigned int crtcs;
|
2013-06-19 19:54:11 +08:00
|
|
|
unsigned int i;
|
2015-02-18 00:34:17 +08:00
|
|
|
int ret;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-04-29 04:59:29 +08:00
|
|
|
/* Create one primary plane per CRTC in this group and seven overlay
|
2015-02-18 00:34:17 +08:00
|
|
|
* planes.
|
|
|
|
*/
|
2015-05-25 21:32:45 +08:00
|
|
|
rgrp->num_planes = rgrp->num_crtcs + 7;
|
2015-02-18 00:34:17 +08:00
|
|
|
|
|
|
|
crtcs = ((1 << rcdu->num_crtcs) - 1) & (3 << (2 * rgrp->index));
|
|
|
|
|
2015-05-25 21:32:45 +08:00
|
|
|
for (i = 0; i < rgrp->num_planes; ++i) {
|
2015-04-28 22:36:33 +08:00
|
|
|
enum drm_plane_type type = i < rgrp->num_crtcs
|
2015-02-18 00:34:17 +08:00
|
|
|
? DRM_PLANE_TYPE_PRIMARY
|
|
|
|
: DRM_PLANE_TYPE_OVERLAY;
|
2015-04-29 05:05:56 +08:00
|
|
|
struct rcar_du_plane *plane = &rgrp->planes[i];
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2013-06-17 03:01:02 +08:00
|
|
|
plane->group = rgrp;
|
2013-06-19 19:54:11 +08:00
|
|
|
|
2015-02-18 00:34:17 +08:00
|
|
|
ret = drm_universal_plane_init(rcdu->ddev, &plane->plane, crtcs,
|
|
|
|
&rcar_du_plane_funcs, 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 22:19:55 +08:00
|
|
|
ARRAY_SIZE(formats), type,
|
|
|
|
NULL);
|
2013-06-19 19:54:11 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
2015-02-18 18:18:05 +08:00
|
|
|
drm_plane_helper_add(&plane->plane,
|
|
|
|
&rcar_du_plane_helper_funcs);
|
|
|
|
|
2015-02-18 00:34:17 +08:00
|
|
|
if (type == DRM_PLANE_TYPE_PRIMARY)
|
|
|
|
continue;
|
|
|
|
|
2013-06-19 19:54:11 +08:00
|
|
|
drm_object_attach_property(&plane->plane.base,
|
2015-04-29 04:59:29 +08:00
|
|
|
rcdu->props.alpha, 255);
|
2013-06-19 19:54:11 +08:00
|
|
|
drm_object_attach_property(&plane->plane.base,
|
2015-04-29 04:59:29 +08:00
|
|
|
rcdu->props.colorkey,
|
2013-06-19 19:54:11 +08:00
|
|
|
RCAR_DU_COLORKEY_NONE);
|
2016-07-22 20:28:27 +08:00
|
|
|
drm_plane_create_zpos_property(&plane->plane, 1, 1, 7);
|
2013-06-19 19:54:11 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|