korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 23:14:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm: rcar-du: Store the number of CRTCs per group in the group structure

Browse Source 
The number of CRTCs in a group is only used to implement plane
initialization for now, but is also needed to implement pre-association
of planes to CRTCs. Store it in the group structure instead of computing
it on demand.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2015-04-28 17:36:33 +03:00
parent c8af99b604
commit fe6fbe9a02
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ struct rcar_du_device;
* @dev: the DU device * @dev: the DU device
* @mmio_offset: registers offset in the device memory map * @mmio_offset: registers offset in the device memory map
* @index: group index * @index: group index
* @num_crtcs: number of CRTCs in this group (1 or 2)
* @use_count: number of users of the group (rcar_du_group_(get|put)) * @use_count: number of users of the group (rcar_du_group_(get|put))
* @used_crtcs: number of CRTCs currently in use * @used_crtcs: number of CRTCs currently in use
* @lock: protects the dptsr_planes field and the DPTSR register * @lock: protects the dptsr_planes field and the DPTSR register
@ -36,6 +37,7 @@ struct rcar_du_group {
unsigned int mmio_offset; unsigned int mmio_offset;
unsigned int index; unsigned int index;
unsigned int num_crtcs;
unsigned int use_count; unsigned int use_count;
unsigned int used_crtcs; unsigned int used_crtcs;

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

@ -763,6 +763,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
rgrp->dev = rcdu; rgrp->dev = rcdu;
rgrp->mmio_offset = mmio_offsets[i]; rgrp->mmio_offset = mmio_offsets[i];
rgrp->index = i; rgrp->index = i;
rgrp->num_crtcs = min(rcdu->num_crtcs - 2 * i, 2U);
/* Pre-associate all hardware planes with the first CRTC in the /* Pre-associate all hardware planes with the first CRTC in the
* group. * group.

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

@ -391,7 +391,6 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp)
{ {
struct rcar_du_device *rcdu = rgrp->dev; struct rcar_du_device *rcdu = rgrp->dev;
unsigned int num_planes; unsigned int num_planes;
unsigned int num_crtcs;
unsigned int crtcs; unsigned int crtcs;
unsigned int i; unsigned int i;
int ret; int ret;
@ -399,13 +398,12 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp)
/* Create one primary plane per CRTC in this group and seven overlay /* Create one primary plane per CRTC in this group and seven overlay
* planes. * planes.
*/ */
num_crtcs = min(rcdu->num_crtcs - 2 * rgrp->index, 2U); num_planes = rgrp->num_crtcs + 7;
num_planes = num_crtcs + 7;
crtcs = ((1 << rcdu->num_crtcs) - 1) & (3 << (2 * rgrp->index)); crtcs = ((1 << rcdu->num_crtcs) - 1) & (3 << (2 * rgrp->index));
for (i = 0; i < num_planes; ++i) { for (i = 0; i < num_planes; ++i) {
enum drm_plane_type type = i < num_crtcs enum drm_plane_type type = i < rgrp->num_crtcs
? DRM_PLANE_TYPE_PRIMARY ? DRM_PLANE_TYPE_PRIMARY
: DRM_PLANE_TYPE_OVERLAY; : DRM_PLANE_TYPE_OVERLAY;
struct rcar_du_plane *plane = &rgrp->planes[i]; struct rcar_du_plane *plane = &rgrp->planes[i];