8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
From 77a79fc0c3a3f9ec6e5dd8c1b323ff85499835e6 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <mripard@kernel.org>
|
|
Date: Fri, 25 Oct 2024 18:15:45 +0100
|
|
Subject: [PATCH] drm/vc4: txp: Rename TXP data structure
|
|
|
|
The TXP data structure has a name too generic for the multiple variants
|
|
we'll have to support. Let's rename it to mention the SoC it applies to.
|
|
|
|
Signed-off-by: Maxime Ripard <mripard@kernel.org>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20241025-drm-vc4-2712-support-v2-14-35efa83c8fc0@raspberrypi.com
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/tests/vc4_mock.c | 4 ++--
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 2 +-
|
|
drivers/gpu/drm/vc4/vc4_txp.c | 4 ++--
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
|
|
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
|
|
@@ -51,7 +51,7 @@ struct vc4_mock_desc {
|
|
|
|
static const struct vc4_mock_desc vc4_mock =
|
|
VC4_MOCK_DESC(
|
|
- VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
|
|
+ VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
|
|
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
|
|
DRM_MODE_ENCODER_VIRTUAL,
|
|
DRM_MODE_CONNECTOR_WRITEBACK)),
|
|
@@ -77,7 +77,7 @@ static const struct vc4_mock_desc vc4_mo
|
|
|
|
static const struct vc4_mock_desc vc5_mock =
|
|
VC4_MOCK_DESC(
|
|
- VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
|
|
+ VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
|
|
VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
|
|
DRM_MODE_ENCODER_VIRTUAL,
|
|
DRM_MODE_CONNECTOR_WRITEBACK)),
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -540,7 +540,7 @@ struct vc4_txp_data {
|
|
struct vc4_crtc_data base;
|
|
};
|
|
|
|
-extern const struct vc4_txp_data vc4_txp_data;
|
|
+extern const struct vc4_txp_data bcm2835_txp_data;
|
|
|
|
struct vc4_pv_data {
|
|
struct vc4_crtc_data base;
|
|
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
|
@@ -485,7 +485,7 @@ static irqreturn_t vc4_txp_interrupt(int
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
-const struct vc4_txp_data vc4_txp_data = {
|
|
+const struct vc4_txp_data bcm2835_txp_data = {
|
|
.base = {
|
|
.name = "txp",
|
|
.debugfs_name = "txp_regs",
|
|
@@ -588,7 +588,7 @@ static void vc4_txp_remove(struct platfo
|
|
}
|
|
|
|
static const struct of_device_id vc4_txp_dt_match[] = {
|
|
- { .compatible = "brcm,bcm2835-txp", .data = &vc4_txp_data },
|
|
+ { .compatible = "brcm,bcm2835-txp", .data = &bcm2835_txp_data },
|
|
{ /* sentinel */ },
|
|
};
|
|
|