mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
From 13723c680a129d79a7872ee131c0201374ba62ce Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Tue, 9 Apr 2019 12:37:28 +0100
|
|
Subject: [PATCH] drm: vc4: Query the display ID for each display in
|
|
FKMS
|
|
|
|
Replace the hard coded list of display IDs for a mailbox call
|
|
that returns the display ID for each display that has been
|
|
detected.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 16 +++++++++++++---
|
|
include/soc/bcm2835/raspberrypi-firmware.h | 1 +
|
|
2 files changed, 14 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
|
|
@@ -943,7 +943,7 @@ static int vc4_fkms_bind(struct device *
|
|
struct vc4_crtc **crtc_list;
|
|
u32 num_displays, display_num;
|
|
int ret;
|
|
- const u32 display_num_lookup[] = {2, 7, 1};
|
|
+ u32 display_id;
|
|
|
|
vc4->firmware_kms = true;
|
|
|
|
@@ -982,8 +982,18 @@ static int vc4_fkms_bind(struct device *
|
|
return -ENOMEM;
|
|
|
|
for (display_num = 0; display_num < num_displays; display_num++) {
|
|
- ret = vc4_fkms_create_screen(dev, drm, display_num,
|
|
- display_num_lookup[display_num],
|
|
+ display_id = display_num;
|
|
+ ret = rpi_firmware_property(vc4->firmware,
|
|
+ RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID,
|
|
+ &display_id, sizeof(display_id));
|
|
+ /* FIXME: Determine the correct error handling here.
|
|
+ * Should we fail to create the one "screen" but keep the
|
|
+ * others, or fail the whole thing?
|
|
+ */
|
|
+ if (ret)
|
|
+ DRM_ERROR("Failed to get display id %u\n", display_num);
|
|
+
|
|
+ ret = vc4_fkms_create_screen(dev, drm, display_num, display_id,
|
|
&crtc_list[display_num]);
|
|
if (ret)
|
|
DRM_ERROR("Oh dear, failed to create display %u\n",
|
|
--- a/include/soc/bcm2835/raspberrypi-firmware.h
|
|
+++ b/include/soc/bcm2835/raspberrypi-firmware.h
|
|
@@ -117,6 +117,7 @@ enum rpi_firmware_property_tag {
|
|
RPI_FIRMWARE_FRAMEBUFFER_GET_TOUCHBUF = 0x0004000f,
|
|
RPI_FIRMWARE_FRAMEBUFFER_GET_GPIOVIRTBUF = 0x00040010,
|
|
RPI_FIRMWARE_FRAMEBUFFER_RELEASE = 0x00048001,
|
|
+ RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID = 0x00040016,
|
|
RPI_FIRMWARE_FRAMEBUFFER_SET_DISPLAY_NUM = 0x00048013,
|
|
RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS = 0x00040013,
|
|
RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_SETTINGS = 0x00040014,
|