Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm: rcar: use generic code for managing zpos plane property

Browse Source 
version 6:
rebased patch on top rcar-du changes for zpos

version 4:
fix null pointer issue while setting zpos in plane reset function

This patch replaces zpos property handling custom code in rcar DRM
driver with calls to generic DRM code.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
This commit is contained in:
Benjamin Gaignard 2016-07-22 14:28:27 +02:00
parent e47726a11e
commit 2fc4d838aa
6 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,7 @@ void rcar_du_crtc_route_output(struct drm_crtc *crtc,
static unsigned int plane_zpos(struct rcar_du_plane *plane) static unsigned int plane_zpos(struct rcar_du_plane *plane)
{ {
return to_rcar_plane_state(plane->plane.state)->zpos; return plane->plane.state->normalized_zpos;
} }
static const struct rcar_du_format_info * static const struct rcar_du_format_info *

1
drivers/gpu/drm/rcar-du/rcar_du_drv.h
View File

@ -92,7 +92,6 @@ struct rcar_du_device {
struct { struct {
struct drm_property *alpha; struct drm_property *alpha;
struct drm_property *colorkey; struct drm_property *colorkey;
struct drm_property *zpos;
} props; } props;
unsigned int dpad0_source; unsigned int dpad0_source;

5
drivers/gpu/drm/rcar-du/rcar_du_kms.c
View File

@ -527,11 +527,6 @@ static int rcar_du_properties_init(struct rcar_du_device *rcdu)
if (rcdu->props.colorkey == NULL) if (rcdu->props.colorkey == NULL)
return -ENOMEM; return -ENOMEM;
rcdu->props.zpos =
drm_property_create_range(rcdu->ddev, 0, "zpos", 1, 7);
if (rcdu->props.zpos == NULL)
return -ENOMEM;
return 0; return 0;
} }

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

@ -652,7 +652,7 @@ static void rcar_du_plane_reset(struct drm_plane *plane)
state->source = RCAR_DU_PLANE_MEMORY; state->source = RCAR_DU_PLANE_MEMORY;
state->alpha = 255; state->alpha = 255;
state->colorkey = RCAR_DU_COLORKEY_NONE; state->colorkey = RCAR_DU_COLORKEY_NONE;
state->zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;
plane->state = &state->state; plane->state = &state->state;
plane->state->plane = plane; plane->state->plane = plane;
@ -670,8 +670,6 @@ static int rcar_du_plane_atomic_set_property(struct drm_plane *plane,
rstate->alpha = val; rstate->alpha = val;
else if (property == rcdu->props.colorkey) else if (property == rcdu->props.colorkey)
rstate->colorkey = val; rstate->colorkey = val;
else if (property == rcdu->props.zpos)
rstate->zpos = val;
else else
return -EINVAL; return -EINVAL;
@ -690,8 +688,6 @@ static int rcar_du_plane_atomic_get_property(struct drm_plane *plane,
*val = rstate->alpha; *val = rstate->alpha;
else if (property == rcdu->props.colorkey) else if (property == rcdu->props.colorkey)
*val = rstate->colorkey; *val = rstate->colorkey;
else if (property == rcdu->props.zpos)
*val = rstate->zpos;
else else
return -EINVAL; return -EINVAL;
@ -763,8 +759,7 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp)
drm_object_attach_property(&plane->plane.base, drm_object_attach_property(&plane->plane.base,
rcdu->props.colorkey, rcdu->props.colorkey,
RCAR_DU_COLORKEY_NONE); RCAR_DU_COLORKEY_NONE);
drm_object_attach_property(&plane->plane.base, drm_plane_create_zpos_property(&plane->plane, 1, 1, 7);
rcdu->props.zpos, 1);
} }
return 0; return 0;

2
drivers/gpu/drm/rcar-du/rcar_du_plane.h
View File

@ -51,7 +51,6 @@ static inline struct rcar_du_plane *to_rcar_plane(struct drm_plane *plane)
* @hwindex: 0-based hardware plane index, -1 means unused * @hwindex: 0-based hardware plane index, -1 means unused
* @alpha: value of the plane alpha property * @alpha: value of the plane alpha property
* @colorkey: value of the plane colorkey property * @colorkey: value of the plane colorkey property
* @zpos: value of the plane zpos property
*/ */
struct rcar_du_plane_state { struct rcar_du_plane_state {
struct drm_plane_state state; struct drm_plane_state state;
@ -62,7 +61,6 @@ struct rcar_du_plane_state {
unsigned int alpha; unsigned int alpha;
unsigned int colorkey; unsigned int colorkey;
unsigned int zpos;
}; };
static inline struct rcar_du_plane_state * static inline struct rcar_du_plane_state *

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

@ -43,12 +43,12 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc)
.src_y = 0, .src_y = 0,
.src_w = mode->hdisplay << 16, .src_w = mode->hdisplay << 16,
.src_h = mode->vdisplay << 16, .src_h = mode->vdisplay << 16,
.zpos = 0,
}, },
.format = rcar_du_format_info(DRM_FORMAT_ARGB8888), .format = rcar_du_format_info(DRM_FORMAT_ARGB8888),
.source = RCAR_DU_PLANE_VSPD1, .source = RCAR_DU_PLANE_VSPD1,
.alpha = 255, .alpha = 255,
.colorkey = 0, .colorkey = 0,
.zpos = 0,
}; };
if (rcdu->info->gen >= 3) if (rcdu->info->gen >= 3)
@ -152,7 +152,7 @@ static void rcar_du_vsp_plane_setup(struct rcar_du_vsp_plane *plane)
.pixelformat = 0, .pixelformat = 0,
.pitch = fb->pitches[0], .pitch = fb->pitches[0],
.alpha = state->alpha, .alpha = state->alpha,
.zpos = state->zpos, .zpos = state->state.zpos,
}; };
unsigned int i; unsigned int i;
@ -267,7 +267,7 @@ static void rcar_du_vsp_plane_reset(struct drm_plane *plane)
return; return;
state->alpha = 255; state->alpha = 255;
state->zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1; state->state.zpos = plane->type == DRM_PLANE_TYPE_PRIMARY ? 0 : 1;
plane->state = &state->state; plane->state = &state->state;
plane->state->plane = plane; plane->state->plane = plane;
@ -282,8 +282,6 @@ static int rcar_du_vsp_plane_atomic_set_property(struct drm_plane *plane,
if (property == rcdu->props.alpha) if (property == rcdu->props.alpha)
rstate->alpha = val; rstate->alpha = val;
else if (property == rcdu->props.zpos)
rstate->zpos = val;
else else
return -EINVAL; return -EINVAL;
@ -300,8 +298,6 @@ static int rcar_du_vsp_plane_atomic_get_property(struct drm_plane *plane,
if (property == rcdu->props.alpha) if (property == rcdu->props.alpha)
*val = rstate->alpha; *val = rstate->alpha;
else if (property == rcdu->props.zpos)
*val = rstate->zpos;
else else
return -EINVAL; return -EINVAL;
@ -381,8 +377,8 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp)
drm_object_attach_property(&plane->plane.base, drm_object_attach_property(&plane->plane.base,
rcdu->props.alpha, 255); rcdu->props.alpha, 255);
drm_object_attach_property(&plane->plane.base, drm_plane_create_zpos_property(&plane->plane, 1, 1,
rcdu->props.zpos, 1); vsp->num_planes - 1);
} }
return 0; return 0;