2012-01-17 02:51:16 +08:00
|
|
|
/*
|
2013-02-12 01:43:09 +08:00
|
|
|
* drivers/gpu/drm/omapdrm/omap_plane.c
|
2012-01-17 02:51:16 +08:00
|
|
|
*
|
|
|
|
* Copyright (C) 2011 Texas Instruments
|
|
|
|
* Author: Rob Clark <rob.clark@linaro.org>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License version 2 as published by
|
|
|
|
* the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
|
|
* more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along with
|
|
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2015-06-16 19:54:51 +08:00
|
|
|
#include <drm/drm_atomic.h>
|
2015-03-06 03:38:16 +08:00
|
|
|
#include <drm/drm_atomic_helper.h>
|
2015-03-05 19:39:56 +08:00
|
|
|
#include <drm/drm_plane_helper.h>
|
2015-03-06 03:38:16 +08:00
|
|
|
|
2012-08-16 04:18:01 +08:00
|
|
|
#include "omap_dmm_tiler.h"
|
2015-03-06 03:31:37 +08:00
|
|
|
#include "omap_drv.h"
|
2012-01-17 02:51:16 +08:00
|
|
|
|
|
|
|
/* some hackery because omapdss has an 'enum omap_plane' (which would be
|
|
|
|
* better named omap_plane_id).. and compiler seems unhappy about having
|
|
|
|
* both a 'struct omap_plane' and 'enum omap_plane'
|
|
|
|
*/
|
|
|
|
#define omap_plane _omap_plane
|
|
|
|
|
|
|
|
/*
|
|
|
|
* plane funcs
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define to_omap_plane(x) container_of(x, struct omap_plane, base)
|
|
|
|
|
|
|
|
struct omap_plane {
|
|
|
|
struct drm_plane base;
|
2012-12-05 03:59:12 +08:00
|
|
|
int id; /* TODO rename omap_plane -> omap_plane_id in omapdss so I can use the enum */
|
|
|
|
const char *name;
|
2012-01-17 02:51:16 +08:00
|
|
|
|
2012-03-06 00:48:31 +08:00
|
|
|
uint32_t nformats;
|
|
|
|
uint32_t formats[32];
|
2012-03-06 00:48:35 +08:00
|
|
|
|
2012-12-05 03:59:12 +08:00
|
|
|
struct omap_drm_irq error_irq;
|
2012-03-06 00:48:31 +08:00
|
|
|
};
|
2012-01-17 02:51:16 +08:00
|
|
|
|
2015-03-07 00:35:16 +08:00
|
|
|
struct omap_plane_state {
|
|
|
|
struct drm_plane_state base;
|
|
|
|
|
|
|
|
unsigned int zorder;
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline struct omap_plane_state *
|
|
|
|
to_omap_plane_state(struct drm_plane_state *state)
|
2012-01-17 02:51:16 +08:00
|
|
|
{
|
2015-03-07 00:35:16 +08:00
|
|
|
return container_of(state, struct omap_plane_state, base);
|
|
|
|
}
|
|
|
|
|
2015-05-29 16:05:37 +08:00
|
|
|
static int omap_plane_prepare_fb(struct drm_plane *plane,
|
2016-08-19 02:00:16 +08:00
|
|
|
struct drm_plane_state *new_state)
|
2015-05-29 16:05:37 +08:00
|
|
|
{
|
2015-09-02 16:42:40 +08:00
|
|
|
if (!new_state->fb)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return omap_framebuffer_pin(new_state->fb);
|
2015-05-29 16:05:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void omap_plane_cleanup_fb(struct drm_plane *plane,
|
2016-08-19 02:00:16 +08:00
|
|
|
struct drm_plane_state *old_state)
|
2015-05-29 16:05:37 +08:00
|
|
|
{
|
2015-09-02 16:42:40 +08:00
|
|
|
if (old_state->fb)
|
|
|
|
omap_framebuffer_unpin(old_state->fb);
|
2015-05-29 16:05:37 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void omap_plane_atomic_update(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *old_state)
|
2015-03-07 00:35:16 +08:00
|
|
|
{
|
2015-03-07 01:18:56 +08:00
|
|
|
struct omap_plane *omap_plane = to_omap_plane(plane);
|
|
|
|
struct drm_plane_state *state = plane->state;
|
2015-03-07 00:35:16 +08:00
|
|
|
struct omap_plane_state *omap_state = to_omap_plane_state(state);
|
2015-03-07 01:00:18 +08:00
|
|
|
struct omap_overlay_info info;
|
|
|
|
struct omap_drm_window win;
|
2012-01-17 02:51:17 +08:00
|
|
|
int ret;
|
2012-01-17 02:51:16 +08:00
|
|
|
|
2015-03-07 01:18:56 +08:00
|
|
|
DBG("%s, crtc=%p fb=%p", omap_plane->name, state->crtc, state->fb);
|
2012-12-05 03:59:12 +08:00
|
|
|
|
2015-03-07 01:00:18 +08:00
|
|
|
memset(&info, 0, sizeof(info));
|
|
|
|
info.rotation_type = OMAP_DSS_ROT_DMA;
|
|
|
|
info.rotation = OMAP_DSS_ROT_0;
|
|
|
|
info.global_alpha = 0xff;
|
|
|
|
info.mirror = 0;
|
|
|
|
info.zorder = omap_state->zorder;
|
|
|
|
|
|
|
|
memset(&win, 0, sizeof(win));
|
|
|
|
win.rotation = state->rotation;
|
|
|
|
win.crtc_x = state->crtc_x;
|
|
|
|
win.crtc_y = state->crtc_y;
|
|
|
|
win.crtc_w = state->crtc_w;
|
|
|
|
win.crtc_h = state->crtc_h;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* src values are in Q16 fixed point, convert to integer.
|
|
|
|
* omap_framebuffer_update_scanout() takes adjusted src.
|
|
|
|
*/
|
|
|
|
win.src_x = state->src_x >> 16;
|
|
|
|
win.src_y = state->src_y >> 16;
|
|
|
|
|
2016-09-27 00:30:46 +08:00
|
|
|
if (drm_rotation_90_or_270(state->rotation)) {
|
2015-03-07 01:00:18 +08:00
|
|
|
win.src_w = state->src_h >> 16;
|
|
|
|
win.src_h = state->src_w >> 16;
|
2016-09-27 00:30:46 +08:00
|
|
|
} else {
|
2015-03-07 01:00:18 +08:00
|
|
|
win.src_w = state->src_w >> 16;
|
|
|
|
win.src_h = state->src_h >> 16;
|
|
|
|
}
|
2015-03-07 00:35:16 +08:00
|
|
|
|
2012-12-05 03:59:12 +08:00
|
|
|
/* update scanout: */
|
2015-03-07 01:00:18 +08:00
|
|
|
omap_framebuffer_update_scanout(state->fb, &win, &info);
|
2012-01-17 02:51:16 +08:00
|
|
|
|
2015-03-07 01:00:18 +08:00
|
|
|
DBG("%dx%d -> %dx%d (%d)", info.width, info.height,
|
|
|
|
info.out_width, info.out_height,
|
|
|
|
info.screen_width);
|
|
|
|
DBG("%d,%d %pad %pad", info.pos_x, info.pos_y,
|
|
|
|
&info.paddr, &info.p_uv_addr);
|
2012-12-05 03:59:12 +08:00
|
|
|
|
2015-01-18 01:09:26 +08:00
|
|
|
dispc_ovl_set_channel_out(omap_plane->id,
|
2015-03-07 00:35:16 +08:00
|
|
|
omap_crtc_channel(state->crtc));
|
2014-10-03 23:14:08 +08:00
|
|
|
|
2012-12-05 03:59:12 +08:00
|
|
|
/* and finally, update omapdss: */
|
2015-03-07 01:00:18 +08:00
|
|
|
ret = dispc_ovl_setup(omap_plane->id, &info, false,
|
2015-03-07 00:35:16 +08:00
|
|
|
omap_crtc_timings(state->crtc), false);
|
2015-05-29 16:06:07 +08:00
|
|
|
if (WARN_ON(ret)) {
|
|
|
|
dispc_ovl_enable(omap_plane->id, false);
|
2015-05-29 16:03:15 +08:00
|
|
|
return;
|
2015-05-29 16:06:07 +08:00
|
|
|
}
|
2012-12-05 03:59:12 +08:00
|
|
|
|
|
|
|
dispc_ovl_enable(omap_plane->id, true);
|
2015-03-05 19:39:56 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void omap_plane_atomic_disable(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *old_state)
|
2012-01-17 02:51:16 +08:00
|
|
|
{
|
2015-03-07 00:35:16 +08:00
|
|
|
struct omap_plane_state *omap_state = to_omap_plane_state(plane->state);
|
2012-08-16 04:18:01 +08:00
|
|
|
struct omap_plane *omap_plane = to_omap_plane(plane);
|
2015-01-13 04:38:16 +08:00
|
|
|
|
2016-07-29 13:50:05 +08:00
|
|
|
plane->state->rotation = DRM_ROTATE_0;
|
2015-03-07 00:35:16 +08:00
|
|
|
omap_state->zorder = plane->type == DRM_PLANE_TYPE_PRIMARY
|
|
|
|
? 0 : omap_plane->id;
|
2015-01-13 05:56:57 +08:00
|
|
|
|
2015-05-29 16:05:37 +08:00
|
|
|
dispc_ovl_enable(omap_plane->id, false);
|
2012-01-17 02:51:16 +08:00
|
|
|
}
|
|
|
|
|
2015-06-16 19:54:51 +08:00
|
|
|
static int omap_plane_atomic_check(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state)
|
|
|
|
{
|
|
|
|
struct drm_crtc_state *crtc_state;
|
|
|
|
|
|
|
|
if (!state->crtc)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
|
|
|
|
if (IS_ERR(crtc_state))
|
|
|
|
return PTR_ERR(crtc_state);
|
|
|
|
|
|
|
|
if (state->crtc_x < 0 || state->crtc_y < 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (state->crtc_x + state->crtc_w > crtc_state->adjusted_mode.hdisplay)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (state->crtc_y + state->crtc_h > crtc_state->adjusted_mode.vdisplay)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2015-08-27 18:09:22 +08:00
|
|
|
if (state->fb) {
|
2016-07-29 13:50:05 +08:00
|
|
|
if (state->rotation != DRM_ROTATE_0 &&
|
2015-08-27 18:09:22 +08:00
|
|
|
!omap_framebuffer_supports_rotation(state->fb))
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2015-06-16 19:54:51 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-03-05 19:39:56 +08:00
|
|
|
static const struct drm_plane_helper_funcs omap_plane_helper_funcs = {
|
|
|
|
.prepare_fb = omap_plane_prepare_fb,
|
|
|
|
.cleanup_fb = omap_plane_cleanup_fb,
|
2015-06-16 19:54:51 +08:00
|
|
|
.atomic_check = omap_plane_atomic_check,
|
2015-03-05 19:39:56 +08:00
|
|
|
.atomic_update = omap_plane_atomic_update,
|
|
|
|
.atomic_disable = omap_plane_atomic_disable,
|
|
|
|
};
|
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
static void omap_plane_destroy(struct drm_plane *plane)
|
|
|
|
{
|
|
|
|
struct omap_plane *omap_plane = to_omap_plane(plane);
|
2012-12-05 03:59:12 +08:00
|
|
|
|
|
|
|
DBG("%s", omap_plane->name);
|
|
|
|
|
|
|
|
omap_irq_unregister(plane->dev, &omap_plane->error_irq);
|
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
drm_plane_cleanup(plane);
|
2012-12-05 03:59:12 +08:00
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
kfree(omap_plane);
|
|
|
|
}
|
|
|
|
|
2012-08-16 04:18:01 +08:00
|
|
|
/* helper to install properties which are common to planes and crtcs */
|
|
|
|
void omap_plane_install_properties(struct drm_plane *plane,
|
|
|
|
struct drm_mode_object *obj)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = plane->dev;
|
|
|
|
struct omap_drm_private *priv = dev->dev_private;
|
|
|
|
|
2012-10-26 06:14:13 +08:00
|
|
|
if (priv->has_dmm) {
|
2015-03-06 23:16:43 +08:00
|
|
|
struct drm_property *prop = dev->mode_config.rotation_property;
|
|
|
|
|
2012-10-26 06:14:13 +08:00
|
|
|
drm_object_attach_property(obj, prop, 0);
|
2012-08-16 04:18:01 +08:00
|
|
|
}
|
2012-08-16 04:18:02 +08:00
|
|
|
|
2015-03-06 23:16:43 +08:00
|
|
|
drm_object_attach_property(obj, priv->zorder_prop, 0);
|
2012-08-16 04:18:01 +08:00
|
|
|
}
|
|
|
|
|
2015-03-07 00:35:16 +08:00
|
|
|
static struct drm_plane_state *
|
|
|
|
omap_plane_atomic_duplicate_state(struct drm_plane *plane)
|
|
|
|
{
|
|
|
|
struct omap_plane_state *state;
|
|
|
|
struct omap_plane_state *copy;
|
|
|
|
|
|
|
|
if (WARN_ON(!plane->state))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
state = to_omap_plane_state(plane->state);
|
|
|
|
copy = kmemdup(state, sizeof(*state), GFP_KERNEL);
|
|
|
|
if (copy == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
__drm_atomic_helper_plane_duplicate_state(plane, ©->base);
|
|
|
|
|
|
|
|
return ©->base;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void omap_plane_atomic_destroy_state(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state)
|
|
|
|
{
|
2016-05-09 22:34:10 +08:00
|
|
|
__drm_atomic_helper_plane_destroy_state(state);
|
2015-03-07 00:35:16 +08:00
|
|
|
kfree(to_omap_plane_state(state));
|
|
|
|
}
|
|
|
|
|
2015-12-15 17:33:23 +08:00
|
|
|
static void omap_plane_reset(struct drm_plane *plane)
|
|
|
|
{
|
|
|
|
struct omap_plane *omap_plane = to_omap_plane(plane);
|
|
|
|
struct omap_plane_state *omap_state;
|
|
|
|
|
2015-12-15 04:39:29 +08:00
|
|
|
if (plane->state) {
|
|
|
|
omap_plane_atomic_destroy_state(plane, plane->state);
|
|
|
|
plane->state = NULL;
|
|
|
|
}
|
2015-12-15 17:33:23 +08:00
|
|
|
|
|
|
|
omap_state = kzalloc(sizeof(*omap_state), GFP_KERNEL);
|
|
|
|
if (omap_state == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set defaults depending on whether we are a primary or overlay
|
|
|
|
* plane.
|
|
|
|
*/
|
|
|
|
omap_state->zorder = plane->type == DRM_PLANE_TYPE_PRIMARY
|
|
|
|
? 0 : omap_plane->id;
|
2016-07-29 13:50:05 +08:00
|
|
|
omap_state->base.rotation = DRM_ROTATE_0;
|
2015-12-15 17:33:23 +08:00
|
|
|
|
|
|
|
plane->state = &omap_state->base;
|
|
|
|
plane->state->plane = plane;
|
|
|
|
}
|
|
|
|
|
2015-03-07 00:35:16 +08:00
|
|
|
static int omap_plane_atomic_set_property(struct drm_plane *plane,
|
|
|
|
struct drm_plane_state *state,
|
|
|
|
struct drm_property *property,
|
|
|
|
uint64_t val)
|
2012-08-16 04:18:01 +08:00
|
|
|
{
|
|
|
|
struct omap_drm_private *priv = plane->dev->dev_private;
|
2015-03-07 00:35:16 +08:00
|
|
|
struct omap_plane_state *omap_state = to_omap_plane_state(state);
|
2012-08-16 04:18:01 +08:00
|
|
|
|
2015-03-07 00:35:16 +08:00
|
|
|
if (property == priv->zorder_prop)
|
|
|
|
omap_state->zorder = val;
|
|
|
|
else
|
2015-01-18 01:09:26 +08:00
|
|
|
return -EINVAL;
|
2012-08-16 04:18:01 +08:00
|
|
|
|
2015-03-07 00:35:16 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2015-01-18 01:09:26 +08:00
|
|
|
|
2015-03-07 00:35:16 +08:00
|
|
|
static int omap_plane_atomic_get_property(struct drm_plane *plane,
|
|
|
|
const struct drm_plane_state *state,
|
|
|
|
struct drm_property *property,
|
|
|
|
uint64_t *val)
|
|
|
|
{
|
|
|
|
struct omap_drm_private *priv = plane->dev->dev_private;
|
|
|
|
const struct omap_plane_state *omap_state =
|
|
|
|
container_of(state, const struct omap_plane_state, base);
|
|
|
|
|
|
|
|
if (property == priv->zorder_prop)
|
|
|
|
*val = omap_state->zorder;
|
|
|
|
else
|
|
|
|
return -EINVAL;
|
2015-01-18 01:09:26 +08:00
|
|
|
|
2015-03-07 00:35:16 +08:00
|
|
|
return 0;
|
2012-08-16 04:18:01 +08:00
|
|
|
}
|
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
static const struct drm_plane_funcs omap_plane_funcs = {
|
2015-03-06 03:50:00 +08:00
|
|
|
.update_plane = drm_atomic_helper_update_plane,
|
|
|
|
.disable_plane = drm_atomic_helper_disable_plane,
|
2015-03-07 00:35:16 +08:00
|
|
|
.reset = omap_plane_reset,
|
2015-01-11 06:02:07 +08:00
|
|
|
.destroy = omap_plane_destroy,
|
2015-03-07 00:35:16 +08:00
|
|
|
.set_property = drm_atomic_helper_plane_set_property,
|
|
|
|
.atomic_duplicate_state = omap_plane_atomic_duplicate_state,
|
|
|
|
.atomic_destroy_state = omap_plane_atomic_destroy_state,
|
|
|
|
.atomic_set_property = omap_plane_atomic_set_property,
|
|
|
|
.atomic_get_property = omap_plane_atomic_get_property,
|
2012-01-17 02:51:16 +08:00
|
|
|
};
|
|
|
|
|
2012-12-05 03:59:12 +08:00
|
|
|
static void omap_plane_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
|
|
|
|
{
|
|
|
|
struct omap_plane *omap_plane =
|
|
|
|
container_of(irq, struct omap_plane, error_irq);
|
2014-11-19 18:50:13 +08:00
|
|
|
DRM_ERROR_RATELIMITED("%s: errors: %08x\n", omap_plane->name,
|
|
|
|
irqstatus);
|
2012-12-05 03:59:12 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static const char *plane_names[] = {
|
2015-01-11 06:02:07 +08:00
|
|
|
[OMAP_DSS_GFX] = "gfx",
|
|
|
|
[OMAP_DSS_VIDEO1] = "vid1",
|
|
|
|
[OMAP_DSS_VIDEO2] = "vid2",
|
|
|
|
[OMAP_DSS_VIDEO3] = "vid3",
|
2012-12-05 03:59:12 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static const uint32_t error_irqs[] = {
|
2015-01-11 06:02:07 +08:00
|
|
|
[OMAP_DSS_GFX] = DISPC_IRQ_GFX_FIFO_UNDERFLOW,
|
|
|
|
[OMAP_DSS_VIDEO1] = DISPC_IRQ_VID1_FIFO_UNDERFLOW,
|
|
|
|
[OMAP_DSS_VIDEO2] = DISPC_IRQ_VID2_FIFO_UNDERFLOW,
|
|
|
|
[OMAP_DSS_VIDEO3] = DISPC_IRQ_VID3_FIFO_UNDERFLOW,
|
2012-12-05 03:59:12 +08:00
|
|
|
};
|
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
/* initialize plane */
|
|
|
|
struct drm_plane *omap_plane_init(struct drm_device *dev,
|
2015-01-11 06:11:18 +08:00
|
|
|
int id, enum drm_plane_type type)
|
2012-01-17 02:51:16 +08:00
|
|
|
{
|
2012-12-05 03:59:12 +08:00
|
|
|
struct omap_drm_private *priv = dev->dev_private;
|
2015-01-11 06:11:18 +08:00
|
|
|
struct drm_plane *plane;
|
2012-01-17 02:51:16 +08:00
|
|
|
struct omap_plane *omap_plane;
|
2015-01-11 06:11:18 +08:00
|
|
|
int ret;
|
2012-01-17 02:51:16 +08:00
|
|
|
|
2015-01-11 06:11:18 +08:00
|
|
|
DBG("%s: type=%d", plane_names[id], type);
|
2012-03-06 00:48:35 +08:00
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
omap_plane = kzalloc(sizeof(*omap_plane), GFP_KERNEL);
|
2013-02-12 01:41:29 +08:00
|
|
|
if (!omap_plane)
|
2015-01-11 22:30:44 +08:00
|
|
|
return ERR_PTR(-ENOMEM);
|
2012-01-17 02:51:16 +08:00
|
|
|
|
2012-03-06 00:48:31 +08:00
|
|
|
omap_plane->nformats = omap_framebuffer_get_formats(
|
|
|
|
omap_plane->formats, ARRAY_SIZE(omap_plane->formats),
|
2012-12-05 03:59:12 +08:00
|
|
|
dss_feat_get_supported_color_modes(id));
|
|
|
|
omap_plane->id = id;
|
|
|
|
omap_plane->name = plane_names[id];
|
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
plane = &omap_plane->base;
|
|
|
|
|
2012-12-05 03:59:12 +08:00
|
|
|
omap_plane->error_irq.irqmask = error_irqs[id];
|
|
|
|
omap_plane->error_irq.irq = omap_plane_error_irq;
|
|
|
|
omap_irq_register(dev, &omap_plane->error_irq);
|
|
|
|
|
2015-01-11 06:11:18 +08:00
|
|
|
ret = drm_universal_plane_init(dev, plane, (1 << priv->num_crtcs) - 1,
|
|
|
|
&omap_plane_funcs, omap_plane->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
|
|
|
omap_plane->nformats, type, NULL);
|
2015-01-11 06:11:18 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
2012-01-17 02:51:16 +08:00
|
|
|
|
2015-03-05 19:39:56 +08:00
|
|
|
drm_plane_helper_add(plane, &omap_plane_helper_funcs);
|
|
|
|
|
2012-08-16 04:18:01 +08:00
|
|
|
omap_plane_install_properties(plane, &plane->base);
|
|
|
|
|
2012-01-17 02:51:16 +08:00
|
|
|
return plane;
|
2015-01-11 06:11:18 +08:00
|
|
|
|
|
|
|
error:
|
|
|
|
omap_irq_unregister(plane->dev, &omap_plane->error_irq);
|
|
|
|
kfree(omap_plane);
|
|
|
|
return NULL;
|
2012-01-17 02:51:16 +08:00
|
|
|
}
|