mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
|
From ddb9aa80692ed5d35e4ee4688c36789620f78c5c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Fri, 14 Apr 2023 17:47:11 +0200
|
||
|
|
Subject: [PATCH 0970/1016] drm/vc4: txp: Handle 40-bits DMA Addresses
|
||
|
|
|
||
|
|
The BCM2712 MOP and MOPLET can handle addresses larger than 32bits
|
||
|
|
through an extra register. We can easily support it and make it
|
||
|
|
conditional based on the compatible through a boolean in our variant
|
||
|
|
structure.
|
||
|
|
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 1 +
|
||
|
|
drivers/gpu/drm/vc4/vc4_txp.c | 10 +++++++++-
|
||
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
|
||
|
|
index 41281db0743b..346749b64d38 100644
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
||
|
|
@@ -565,6 +565,7 @@ struct vc4_txp_data {
|
||
|
|
struct vc4_crtc_data base;
|
||
|
|
unsigned int has_byte_enable:1;
|
||
|
|
unsigned int size_minus_one:1;
|
||
|
|
+ unsigned int supports_40bit_addresses:1;
|
||
|
|
};
|
||
|
|
|
||
|
|
extern const struct vc4_txp_data bcm2835_txp_data;
|
||
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
|
||
|
|
index e8a38e9004d6..7655258b394c 100644
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
||
|
|
@@ -145,6 +145,8 @@
|
||
|
|
/* Number of lines received and committed to memory. */
|
||
|
|
#define TXP_PROGRESS 0x10
|
||
|
|
|
||
|
|
+#define TXP_DST_PTR_HIGH 0x1c
|
||
|
|
+
|
||
|
|
#define TXP_READ(offset) \
|
||
|
|
({ \
|
||
|
|
kunit_fail_current_test("Accessing a register in a unit test!\n"); \
|
||
|
|
@@ -297,6 +299,7 @@ static void vc4_txp_connector_atomic_commit(struct drm_connector *conn,
|
||
|
|
struct drm_framebuffer *fb;
|
||
|
|
unsigned int hdisplay;
|
||
|
|
unsigned int vdisplay;
|
||
|
|
+ dma_addr_t addr;
|
||
|
|
u32 ctrl;
|
||
|
|
int idx;
|
||
|
|
int i;
|
||
|
|
@@ -334,7 +337,12 @@ static void vc4_txp_connector_atomic_commit(struct drm_connector *conn,
|
||
|
|
return;
|
||
|
|
|
||
|
|
gem = drm_fb_dma_get_gem_obj(fb, 0);
|
||
|
|
- TXP_WRITE(TXP_DST_PTR, gem->dma_addr + fb->offsets[0]);
|
||
|
|
+ addr = gem->dma_addr + fb->offsets[0];
|
||
|
|
+ TXP_WRITE(TXP_DST_PTR, lower_32_bits(addr));
|
||
|
|
+
|
||
|
|
+ if (txp_data->supports_40bit_addresses)
|
||
|
|
+ TXP_WRITE(TXP_DST_PTR_HIGH, upper_32_bits(addr) & 0xff);
|
||
|
|
+
|
||
|
|
TXP_WRITE(TXP_DST_PITCH, fb->pitches[0]);
|
||
|
|
|
||
|
|
hdisplay = mode->hdisplay ?: 1;
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|