From e12390ba579e3f6680fd7514f7d2d04732de02cb Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 19 Oct 2023 10:34:58 +0100 Subject: [PATCH 1/4] drm/connector: Change DRM card alias from underscore to hyphen Apparently aliases are only allowed lower case and hyphens, so swap the use of underscore to hyphen. Fixes: 3aa1f2477545 ("drm: Look for an alias for the displays to use as the DRM device name") Signed-off-by: Dave Stevenson --- drivers/gpu/drm/drm_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 4694f4e598c8c5..53e11ed63f0d8a 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -112,7 +112,7 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] = { }; #define MAX_DT_NODE_NAME_LEN 20 -#define DT_DRM_NODE_PREFIX "drm_" +#define DT_DRM_NODE_PREFIX "drm-" static void drm_connector_get_of_name(int type, char *node_name, int length) { From d5a4a77a774e9a0653c61662cb0b52d0c27c551f Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 19 Oct 2023 10:28:43 +0100 Subject: [PATCH 2/4] dt: Alter alias names from _ to - for drm_dsiN Fixes: 7ec42740a45b ("dt: Add DSI1 and DSI2 aliases to 2712") Signed-off-by: Dave Stevenson --- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts index 2b176a8327eba4..db228baa8b0443 100644 --- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts +++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts @@ -787,8 +787,8 @@ spi10_cs_pins: &spi10_cs_gpio1 {}; gpio4 = &pinctrl_aon; usb0 = &rp1_usb0; usb1 = &rp1_usb1; - drm_dsi1 = &dsi0; - drm_dsi2 = &dsi1; + drm-dsi1 = &dsi0; + drm-dsi2 = &dsi1; }; __overrides__ { From 79b9f4fca64cd0b20cd7f2821fa96f55a587222d Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 19 Oct 2023 10:32:04 +0100 Subject: [PATCH 3/4] drm/fb_helper: Change query for FB designation from drm_fb to drm-fb Fixes: 1216ea56c2e3 ("drm/fb-helper: Look up preferred fbdev node number from DT") Signed-off-by: Dave Stevenson --- drivers/gpu/drm/drm_fb_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index c53de4b69184bb..148b07fd6923e1 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1967,11 +1967,11 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper, * register the fbdev emulation instance in kernel_fb_helper_list. */ mutex_unlock(&fb_helper->lock); - id = of_alias_get_highest_id("drm_fb"); + id = of_alias_get_highest_id("drm-fb"); if (id >= 0) fb_set_lowest_dynamic_fb(id + 1); - id = of_alias_get_id(dev->dev->of_node, "drm_fb"); + id = of_alias_get_id(dev->dev->of_node, "drm-fb"); if (id >= 0) { info->node = id; info->custom_fb_num = true; From e60fe382f0612096c6e2352af8ff8392fc626aff Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Thu, 19 Oct 2023 10:29:20 +0100 Subject: [PATCH 4/4] dt: Alter alias names from _ to - for drm_fbN_* overrides Fixes: 61b138adaead ("dt: Add overrides for drm framebuffer allocations on Pi5") Signed-off-by: Dave Stevenson --- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts index db228baa8b0443..a93eba44ae2624 100644 --- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts +++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts @@ -824,17 +824,17 @@ spi10_cs_pins: &spi10_cs_gpio1 {}; act_led_trigger = <&act_led>, "linux,default-trigger"; pwr_led_activelow = <&pwr_led>, "gpios:8"; pwr_led_trigger = <&pwr_led>, "linux,default-trigger"; - drm_fb0_rp1_dsi0 = <&aliases>, "drm_fb0=",&dsi0; - drm_fb0_rp1_dsi1 = <&aliases>, "drm_fb0=",&dsi1; - drm_fb0_rp1_dpi = <&aliases>, "drm_fb0=",&dpi; - drm_fb0_vc4 = <&aliases>, "drm_fb0=",&vc4; - drm_fb1_rp1_dsi0 = <&aliases>, "drm_fb1=",&dsi0; - drm_fb1_rp1_dsi1 = <&aliases>, "drm_fb1=",&dsi1; - drm_fb1_rp1_dpi = <&aliases>, "drm_fb1=",&dpi; - drm_fb1_vc4 = <&aliases>, "drm_fb1=",&vc4; - drm_fb2_rp1_dsi0 = <&aliases>, "drm_fb2=",&dsi0; - drm_fb2_rp1_dsi1 = <&aliases>, "drm_fb2=",&dsi1; - drm_fb2_rp1_dpi = <&aliases>, "drm_fb2=",&dpi; - drm_fb2_vc4 = <&aliases>, "drm_fb2=",&vc4; + drm_fb0_rp1_dsi0 = <&aliases>, "drm-fb0=",&dsi0; + drm_fb0_rp1_dsi1 = <&aliases>, "drm-fb0=",&dsi1; + drm_fb0_rp1_dpi = <&aliases>, "drm-fb0=",&dpi; + drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4; + drm_fb1_rp1_dsi0 = <&aliases>, "drm-fb1=",&dsi0; + drm_fb1_rp1_dsi1 = <&aliases>, "drm-fb1=",&dsi1; + drm_fb1_rp1_dpi = <&aliases>, "drm-fb1=",&dpi; + drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4; + drm_fb2_rp1_dsi0 = <&aliases>, "drm-fb2=",&dsi0; + drm_fb2_rp1_dsi1 = <&aliases>, "drm-fb2=",&dsi1; + drm_fb2_rp1_dpi = <&aliases>, "drm-fb2=",&dpi; + drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4; }; };