mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-09 07:37:07 +08:00
d81c03f05e
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>
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
From 48df2304aceec253185240ddb95628ee000dbcbd Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <mripard@kernel.org>
|
|
Date: Fri, 25 Oct 2024 18:15:46 +0100
|
|
Subject: [PATCH] drm/vc4: txp: Add byte enable toggle bit
|
|
|
|
The MOPLET doesn't have the BYTE_ENABLE field to set, but the TXP and
|
|
MOP do, so let's add a boolean to control whether or not we need to set
|
|
it.
|
|
|
|
Signed-off-by: Maxime Ripard <mripard@kernel.org>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20241025-drm-vc4-2712-support-v2-15-35efa83c8fc0@raspberrypi.com
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.h | 1 +
|
|
drivers/gpu/drm/vc4/vc4_txp.c | 6 +++++-
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
|
|
@@ -538,6 +538,7 @@ struct vc4_crtc_data {
|
|
|
|
struct vc4_txp_data {
|
|
struct vc4_crtc_data base;
|
|
+ unsigned int has_byte_enable:1;
|
|
};
|
|
|
|
extern const struct vc4_txp_data bcm2835_txp_data;
|
|
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
|
@@ -287,6 +287,7 @@ static void vc4_txp_connector_atomic_com
|
|
struct drm_connector_state *conn_state = drm_atomic_get_new_connector_state(state,
|
|
conn);
|
|
struct vc4_txp *txp = connector_to_vc4_txp(conn);
|
|
+ const struct vc4_txp_data *txp_data = txp->data;
|
|
struct drm_gem_dma_object *gem;
|
|
struct drm_display_mode *mode;
|
|
struct drm_framebuffer *fb;
|
|
@@ -309,9 +310,11 @@ static void vc4_txp_connector_atomic_com
|
|
return;
|
|
|
|
ctrl = TXP_GO | TXP_EI |
|
|
- VC4_SET_FIELD(0xf, TXP_BYTE_ENABLE) |
|
|
VC4_SET_FIELD(txp_fmts[i], TXP_FORMAT);
|
|
|
|
+ if (txp_data->has_byte_enable)
|
|
+ ctrl |= VC4_SET_FIELD(0xf, TXP_BYTE_ENABLE);
|
|
+
|
|
if (fb->format->has_alpha)
|
|
ctrl |= TXP_ALPHA_ENABLE;
|
|
else
|
|
@@ -492,6 +495,7 @@ const struct vc4_txp_data bcm2835_txp_da
|
|
.hvs_available_channels = BIT(2),
|
|
.hvs_output = 2,
|
|
},
|
|
+ .has_byte_enable = true,
|
|
};
|
|
|
|
static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
|