Skip to content

Commit

Permalink
drm: vc4: Select display to blank during initialisation
Browse files Browse the repository at this point in the history
Otherwise the rainbow splash screen remained in the display list

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  • Loading branch information
6by9 authored and Phil Elwell committed Jun 26, 2019
1 parent a2e6591 commit c916475
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions drivers/gpu/drm/vc4/vc4_firmware_kms.c
Expand Up @@ -88,6 +88,13 @@ struct fb_alloc_tags {
u32 layer;
};

struct mailbox_blank_display {
struct rpi_firmware_property_tag_header tag1;
u32 display;
struct rpi_firmware_property_tag_header tag2;
u32 blank;
};

static const struct vc_image_format {
u32 drm; /* DRM_FORMAT_* */
u32 vc_image; /* VC_IMAGE_* */
Expand Down Expand Up @@ -854,7 +861,12 @@ static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm,
struct drm_crtc *crtc;
struct drm_plane *primary_plane, *overlay_plane, *cursor_plane;
struct drm_plane *destroy_plane, *temp;
u32 blank = 1;
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;

vc4_crtc = devm_kzalloc(dev, sizeof(*vc4_crtc), GFP_KERNEL);
Expand All @@ -865,9 +877,7 @@ static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm,
vc4_crtc->display_number = display_ref;

/* Blank the firmware provided framebuffer */
rpi_firmware_property(vc4->firmware,
RPI_FIRMWARE_FRAMEBUFFER_BLANK,
&blank, sizeof(blank));
rpi_firmware_property_list(vc4->firmware, &blank, sizeof(blank));

primary_plane = vc4_fkms_plane_init(drm, DRM_PLANE_TYPE_PRIMARY,
display_ref,
Expand Down

0 comments on commit c916475

Please sign in to comment.