Skip to content

FKMS - correct possible_crtcs flags, and increase the number of planes #3740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 13, 2020
Merged

FKMS - correct possible_crtcs flags, and increase the number of planes #3740

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30e8328
drm/vc4: Increase the number of planes per crtc in FKMS.
6by9 Jul 20, 2020
f748865
drm/vc4: Set the possible crtcs mask correctly for planes with FKMS
6by9 Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 26 additions & 34 deletions drivers/gpu/drm/vc4/vc4_firmware_kms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct vc4_fkms {
bool bcm2711;
};

#define PLANES_PER_CRTC 3
#define PLANES_PER_CRTC 8

struct set_plane {
u8 display;
Expand Down Expand Up @@ -816,7 +816,7 @@ static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev,
formats[num_formats++] = vc_image_formats[i].drm;

plane = &vc4_plane->base;
ret = drm_universal_plane_init(dev, plane, 0xff,
ret = drm_universal_plane_init(dev, plane, 0,
&vc4_plane_funcs,
formats, num_formats, modifiers,
type, NULL);
Expand Down Expand Up @@ -1742,15 +1742,15 @@ static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm,
struct vc4_crtc *vc4_crtc;
struct vc4_fkms_encoder *vc4_encoder;
struct drm_crtc *crtc;
struct drm_plane *primary_plane, *overlay_plane, *cursor_plane;
struct drm_plane *destroy_plane, *temp;
struct mailbox_blank_display blank = {
.tag1 = {RPI_FIRMWARE_FRAMEBUFFER_SET_DISPLAY_NUM, 4, 0, },
.display = display_idx,
.tag2 = { RPI_FIRMWARE_FRAMEBUFFER_BLANK, 4, 0, },
.blank = 1,
};
int ret;
struct drm_plane *planes[PLANES_PER_CRTC];
int ret, i;

vc4_crtc = devm_kzalloc(dev, sizeof(*vc4_crtc), GFP_KERNEL);
if (!vc4_crtc)
Expand All @@ -1763,40 +1763,32 @@ static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm,
/* Blank the firmware provided framebuffer */
rpi_firmware_property_list(vc4->firmware, &blank, sizeof(blank));

primary_plane = vc4_fkms_plane_init(drm, DRM_PLANE_TYPE_PRIMARY,
display_ref,
0 + (display_idx * PLANES_PER_CRTC)
);
if (IS_ERR(primary_plane)) {
dev_err(dev, "failed to construct primary plane\n");
ret = PTR_ERR(primary_plane);
goto err;
}

overlay_plane = vc4_fkms_plane_init(drm, DRM_PLANE_TYPE_OVERLAY,
display_ref,
1 + (display_idx * PLANES_PER_CRTC)
);
if (IS_ERR(overlay_plane)) {
dev_err(dev, "failed to construct overlay plane\n");
ret = PTR_ERR(overlay_plane);
goto err;
}

cursor_plane = vc4_fkms_plane_init(drm, DRM_PLANE_TYPE_CURSOR,
display_ref,
2 + (display_idx * PLANES_PER_CRTC)
);
if (IS_ERR(cursor_plane)) {
dev_err(dev, "failed to construct cursor plane\n");
ret = PTR_ERR(cursor_plane);
goto err;
for (i = 0; i < PLANES_PER_CRTC; i++) {
planes[i] = vc4_fkms_plane_init(drm,
(i == 0) ?
DRM_PLANE_TYPE_PRIMARY :
(i == PLANES_PER_CRTC - 1) ?
DRM_PLANE_TYPE_CURSOR :
DRM_PLANE_TYPE_OVERLAY,
display_ref,
i + (display_idx * PLANES_PER_CRTC)
);
if (IS_ERR(planes[i])) {
dev_err(dev, "failed to construct plane %u\n", i);
ret = PTR_ERR(planes[i]);
goto err;
}
}

drm_crtc_init_with_planes(drm, crtc, primary_plane, cursor_plane,
&vc4_crtc_funcs, NULL);
drm_crtc_init_with_planes(drm, crtc, planes[0],
planes[PLANES_PER_CRTC - 1], &vc4_crtc_funcs,
NULL);
drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);

/* Update the possible_crtcs mask for the overlay plane(s) */
for (i = 1; i < (PLANES_PER_CRTC - 1); i++)
planes[i]->possible_crtcs = drm_crtc_mask(crtc);

vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL);
if (!vc4_encoder)
return -ENOMEM;
Expand Down