hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm: rcar-du: Clip planes to screen boundaries 

Unlike the KMS API, the hardware doesn't support planes exceeding the
screen boundaries or planes being located fully off-screen. We need to
clip plane coordinates to support the use case.

Fortunately the DRM core offers a drm_atomic_helper_check_plane_state()
helper that validates the scaling factor and clips the plane
coordinates. Use it to implement the plane atomic check and use the
clipped source and destination rectangles from the plane state instead
of the unclipped source and CRTC coordinates to configure the device.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2017-08-15 18:52:04 +03:00
parent 9c893a61b7
commit 401712e035
3 changed files with 62 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/rcar-du/rcar_du_crtc.c
View File

@ -319,7 +319,8 @@ static void rcar_du_crtc_update_planes(struct rcar_du_crtc *rcrtc)
struct rcar_du_plane *plane = &rcrtc->group->planes[i]; struct rcar_du_plane *plane = &rcrtc->group->planes[i];
unsigned int j; unsigned int j;
if (plane->plane.state->crtc != &rcrtc->crtc) if (plane->plane.state->crtc != &rcrtc->crtc ||
!plane->plane.state->visible)
continue; continue;
/* Insert the plane in the sorted planes array. */ /* Insert the plane in the sorted planes array. */

50
drivers/gpu/drm/rcar-du/rcar_du_plane.c
View File

@ -332,8 +332,8 @@ static void rcar_du_plane_write(struct rcar_du_group *rgrp,
static void rcar_du_plane_setup_scanout(struct rcar_du_group *rgrp, static void rcar_du_plane_setup_scanout(struct rcar_du_group *rgrp,
const struct rcar_du_plane_state *state) const struct rcar_du_plane_state *state)
{ {
unsigned int src_x = state->state.src_x >> 16; unsigned int src_x = state->state.src.x1 >> 16;
unsigned int src_y = state->state.src_y >> 16; unsigned int src_y = state->state.src.y1 >> 16;
unsigned int index = state->hwindex; unsigned int index = state->hwindex;
unsigned int pitch; unsigned int pitch;
bool interlaced; bool interlaced;
@ -357,7 +357,7 @@ static void rcar_du_plane_setup_scanout(struct rcar_du_group *rgrp,
dma[i] = gem->paddr + fb->offsets[i]; dma[i] = gem->paddr + fb->offsets[i];
} }
} else { } else {
pitch = state->state.src_w >> 16; pitch = drm_rect_width(&state->state.src) >> 16;
dma[0] = 0; dma[0] = 0;
dma[1] = 0; dma[1] = 0;
} }
@ -521,6 +521,7 @@ static void rcar_du_plane_setup_format(struct rcar_du_group *rgrp,
const struct rcar_du_plane_state *state) const struct rcar_du_plane_state *state)
{ {
struct rcar_du_device *rcdu = rgrp->dev; struct rcar_du_device *rcdu = rgrp->dev;
const struct drm_rect *dst = &state->state.dst;
if (rcdu->info->gen < 3) if (rcdu->info->gen < 3)
rcar_du_plane_setup_format_gen2(rgrp, index, state); rcar_du_plane_setup_format_gen2(rgrp, index, state);
@ -528,10 +529,10 @@ static void rcar_du_plane_setup_format(struct rcar_du_group *rgrp,
rcar_du_plane_setup_format_gen3(rgrp, index, state); rcar_du_plane_setup_format_gen3(rgrp, index, state);
/* Destination position and size */ /* Destination position and size */
rcar_du_plane_write(rgrp, index, PnDSXR, state->state.crtc_w); rcar_du_plane_write(rgrp, index, PnDSXR, drm_rect_width(dst));
rcar_du_plane_write(rgrp, index, PnDSYR, state->state.crtc_h); rcar_du_plane_write(rgrp, index, PnDSYR, drm_rect_height(dst));
rcar_du_plane_write(rgrp, index, PnDPXR, state->state.crtc_x); rcar_du_plane_write(rgrp, index, PnDPXR, dst->x1);
rcar_du_plane_write(rgrp, index, PnDPYR, state->state.crtc_y); rcar_du_plane_write(rgrp, index, PnDPYR, dst->y1);
if (rcdu->info->gen < 3) { if (rcdu->info->gen < 3) {
/* Wrap-around and blinking, disabled */ /* Wrap-around and blinking, disabled */
@ -570,16 +571,39 @@ int __rcar_du_plane_atomic_check(struct drm_plane *plane,
const struct rcar_du_format_info **format) const struct rcar_du_format_info **format)
{ {
struct drm_device *dev = plane->dev; struct drm_device *dev = plane->dev;
struct drm_crtc_state *crtc_state;
struct drm_rect clip;
int ret;
if (!state->fb || !state->crtc) { if (!state->crtc) {
/*
* The visible field is not reset by the DRM core but only
* updated by drm_plane_helper_check_state(), set it manually.
*/
state->visible = false;
*format = NULL; *format = NULL;
return 0; return 0;
} }
if (state->src_w >> 16 != state->crtc_w || crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
state->src_h >> 16 != state->crtc_h) { if (IS_ERR(crtc_state))
dev_dbg(dev->dev, "%s: scaling not supported\n", __func__); return PTR_ERR(crtc_state);
return -EINVAL;
clip.x1 = 0;
clip.y1 = 0;
clip.x2 = crtc_state->mode.hdisplay;
clip.y2 = crtc_state->mode.vdisplay;
ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
DRM_PLANE_HELPER_NO_SCALING,
DRM_PLANE_HELPER_NO_SCALING,
true, true);
if (ret < 0)
return ret;
if (!state->visible) {
*format = NULL;
return 0;
} }
*format = rcar_du_format_info(state->fb->format->format); *format = rcar_du_format_info(state->fb->format->format);
@ -607,7 +631,7 @@ static void rcar_du_plane_atomic_update(struct drm_plane *plane,
struct rcar_du_plane_state *old_rstate; struct rcar_du_plane_state *old_rstate;
struct rcar_du_plane_state *new_rstate; struct rcar_du_plane_state *new_rstate;
if (!plane->state->crtc) if (!plane->state->visible)
return; return;
rcar_du_plane_setup(rplane); rcar_du_plane_setup(rplane);

42
drivers/gpu/drm/rcar-du/rcar_du_vsp.c
View File

@ -55,14 +55,14 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc)
struct rcar_du_plane_state state = { struct rcar_du_plane_state state = {
.state = { .state = {
.crtc = &crtc->crtc, .crtc = &crtc->crtc,
.crtc_x = 0, .dst.x1 = 0,
.crtc_y = 0, .dst.y1 = 0,
.crtc_w = mode->hdisplay, .dst.x2 = mode->hdisplay,
.crtc_h = mode->vdisplay, .dst.y2 = mode->vdisplay,
.src_x = 0, .src.x1 = 0,
.src_y = 0, .src.y1 = 0,
.src_w = mode->hdisplay << 16, .src.x2 = mode->hdisplay << 16,
.src_h = mode->vdisplay << 16, .src.y2 = mode->vdisplay << 16,
.zpos = 0, .zpos = 0,
}, },
.format = rcar_du_format_info(DRM_FORMAT_ARGB8888), .format = rcar_du_format_info(DRM_FORMAT_ARGB8888),
@ -178,15 +178,15 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane)
}; };
unsigned int i; unsigned int i;
cfg.src.left = state->state.src_x >> 16; cfg.src.left = state->state.src.x1 >> 16;
cfg.src.top = state->state.src_y >> 16; cfg.src.top = state->state.src.y1 >> 16;
cfg.src.width = state->state.src_w >> 16; cfg.src.width = drm_rect_width(&state->state.src) >> 16;
cfg.src.height = state->state.src_h >> 16; cfg.src.height = drm_rect_height(&state->state.src) >> 16;
cfg.dst.left = state->state.crtc_x; cfg.dst.left = state->state.dst.x1;
cfg.dst.top = state->state.crtc_y; cfg.dst.top = state->state.dst.y1;
cfg.dst.width = state->state.crtc_w; cfg.dst.width = drm_rect_width(&state->state.dst);
cfg.dst.height = state->state.crtc_h; cfg.dst.height = drm_rect_height(&state->state.dst);
for (i = 0; i < state->format->planes; ++i) for (i = 0; i < state->format->planes; ++i)
cfg.mem[i] = sg_dma_address(state->sg_tables[i].sgl) cfg.mem[i] = sg_dma_address(state->sg_tables[i].sgl)
@ -212,7 +212,11 @@ static int rcar_du_vsp_plane_prepare_fb(struct drm_plane *plane,
unsigned int i; unsigned int i;
int ret; int ret;
if (!state->fb) /*
* There's no need to prepare (and unprepare) the framebuffer when the
* plane is not visible, as it will not be displayed.
*/
if (!state->visible)
return 0; return 0;
for (i = 0; i < rstate->format->planes; ++i) { for (i = 0; i < rstate->format->planes; ++i) {
@ -253,7 +257,7 @@ static void rcar_du_vsp_plane_cleanup_fb(struct drm_plane *plane,
struct rcar_du_vsp *vsp = to_rcar_vsp_plane(plane)->vsp; struct rcar_du_vsp *vsp = to_rcar_vsp_plane(plane)->vsp;
unsigned int i; unsigned int i;
if (!state->fb) if (!state->visible)
return; return;
for (i = 0; i < rstate->format->planes; ++i) { for (i = 0; i < rstate->format->planes; ++i) {
@ -278,7 +282,7 @@ static void rcar_du_vsp_plane_atomic_update(struct drm_plane *plane,
struct rcar_du_vsp_plane *rplane = to_rcar_vsp_plane(plane); struct rcar_du_vsp_plane *rplane = to_rcar_vsp_plane(plane);
struct rcar_du_crtc *crtc = to_rcar_crtc(old_state->crtc); struct rcar_du_crtc *crtc = to_rcar_crtc(old_state->crtc);
if (plane->state->crtc) if (plane->state->visible)
rcar_du_vsp_plane_setup(rplane); rcar_du_vsp_plane_setup(rplane);
else else
vsp1_du_atomic_update(rplane->vsp->vsp, crtc->vsp_pipe, vsp1_du_atomic_update(rplane->vsp->vsp, crtc->vsp_pipe,