bcm27xx: update 6.1 patches to latest version
[openwrt/staging/dangole.git] / target / linux / bcm27xx / patches-6.1 / 950-0962-drm-vc4-drv-Support-BCM2712.patch
1 From 847ec495822ad512dd9f1a58a85dabea01534855 Mon Sep 17 00:00:00 2001
2 From: Maxime Ripard <maxime@cerno.tech>
3 Date: Fri, 17 Feb 2023 15:29:52 +0100
4 Subject: [PATCH] drm/vc4: drv: Support BCM2712
5
6 The BCM2712 has an improved display pipeline, most notably with a
7 different HVS and only HDMI and writeback outputs.
8
9 Let's introduce it as a new VideoCore generation and compatible.
10
11 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
12 ---
13 drivers/gpu/drm/vc4/vc4_drv.c | 5 ++++-
14 drivers/gpu/drm/vc4/vc4_drv.h | 1 +
15 2 files changed, 5 insertions(+), 1 deletion(-)
16
17 --- a/drivers/gpu/drm/vc4/vc4_drv.c
18 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
19 @@ -310,7 +310,9 @@ static int vc4_drm_bind(struct device *d
20
21 dev->coherent_dma_mask = DMA_BIT_MASK(32);
22
23 - if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
24 + if (of_device_is_compatible(dev->of_node, "brcm,bcm2712-vc6"))
25 + gen = VC4_GEN_6;
26 + else if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
27 gen = VC4_GEN_5;
28 else
29 gen = VC4_GEN_4;
30 @@ -475,6 +477,7 @@ static int vc4_platform_drm_remove(struc
31
32 static const struct of_device_id vc4_of_match[] = {
33 { .compatible = "brcm,bcm2711-vc5", },
34 + { .compatible = "brcm,bcm2712-vc6", },
35 { .compatible = "brcm,bcm2835-vc4", },
36 { .compatible = "brcm,cygnus-vc4", },
37 {},
38 --- a/drivers/gpu/drm/vc4/vc4_drv.h
39 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
40 @@ -84,6 +84,7 @@ struct vc4_perfmon {
41 enum vc4_gen {
42 VC4_GEN_4,
43 VC4_GEN_5,
44 + VC4_GEN_6,
45 };
46
47 struct vc4_dev {