raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

drm: vc4: handle the case where there are no available displays

Browse Source 
It's reasonable for the firmware to return zero as the number of
attached displays. Handle this case as otherwise drm thinks that
the DSI panel is attached, which is nonsense.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
This commit is contained in:
Jonathan Bell
2019-05-28 13:56:06 +01:00
committed by Phil Elwell
parent 7178bb91ea
commit dadd86d023
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/vc4/vc4_firmware_kms.c
View File

@@ -1308,13 +1308,13 @@ static int vc4_fkms_bind(struct device *dev, struct device *master, void *data)
RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS,
&num_displays, sizeof(u32));
/* If we fail to get the number of displays, or it returns 0, then
/* If we fail to get the number of displays, then
* assume old firmware that doesn't have the mailbox call, so just
* set one display
*/
if (ret || num_displays == 0) {
if (ret) {
num_displays = 1;
DRM_WARN("Unable to determine number of displays's. Assuming 1\n");
DRM_WARN("Unable to determine number of displays - assuming 1\n");
ret = 0;
}
@@ -1343,17 +1343,21 @@ static int vc4_fkms_bind(struct device *dev, struct device *master, void *data)
display_num);
}
/* Map the SMI interrupt reg */
crtc_list[0]->regs = vc4_ioremap_regs(pdev, 0);
if (IS_ERR(crtc_list[0]->regs))
DRM_ERROR("Oh dear, failed to map registers\n");
if (num_displays > 0) {
/* Map the SMI interrupt reg */
crtc_list[0]->regs = vc4_ioremap_regs(pdev, 0);
if (IS_ERR(crtc_list[0]->regs))
DRM_ERROR("Oh dear, failed to map registers\n");
writel(0, crtc_list[0]->regs + SMICS);
ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
vc4_crtc_irq_handler, 0, "vc4 firmware kms",
crtc_list);
if (ret)
DRM_ERROR("Oh dear, failed to register IRQ\n");
writel(0, crtc_list[0]->regs + SMICS);
ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
vc4_crtc_irq_handler, 0,
"vc4 firmware kms", crtc_list);
if (ret)
DRM_ERROR("Oh dear, failed to register IRQ\n");
} else {
DRM_WARN("No displays found. Consider forcing hotplug if HDMI is attached\n");
}
platform_set_drvdata(pdev, crtc_list);