mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From 847ec495822ad512dd9f1a58a85dabea01534855 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 17 Feb 2023 15:29:52 +0100
|
|
Subject: [PATCH 0962/1016] drm/vc4: drv: Support BCM2712
|
|
|
|
The BCM2712 has an improved display pipeline, most notably with a
|
|
different HVS and only HDMI and writeback outputs.
|
|
|
|
Let's introduce it as a new VideoCore generation and compatible.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 5 ++++-
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 1 +
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
index 0077b5853670..f11f7fcf9597 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
@@ -310,7 +310,9 @@ static int vc4_drm_bind(struct device *dev)
|
|
|
|
dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
|
|
|
- if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
|
|
+ if (of_device_is_compatible(dev->of_node, "brcm,bcm2712-vc6"))
|
|
+ gen = VC4_GEN_6;
|
|
+ else if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
|
|
gen = VC4_GEN_5;
|
|
else
|
|
gen = VC4_GEN_4;
|
|
@@ -475,6 +477,7 @@ static int vc4_platform_drm_remove(struct platform_device *pdev)
|
|
|
|
static const struct of_device_id vc4_of_match[] = {
|
|
{ .compatible = "brcm,bcm2711-vc5", },
|
|
+ { .compatible = "brcm,bcm2712-vc6", },
|
|
{ .compatible = "brcm,bcm2835-vc4", },
|
|
{ .compatible = "brcm,cygnus-vc4", },
|
|
{},
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
index c79f7ac0a94a..9a1e14d1c0b8 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -84,6 +84,7 @@ struct vc4_perfmon {
|
|
enum vc4_gen {
|
|
VC4_GEN_4,
|
|
VC4_GEN_5,
|
|
+ VC4_GEN_6,
|
|
};
|
|
|
|
struct vc4_dev {
|
|
--
|
|
2.42.0
|
|
|