github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 23:22:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/vc4: txp: Add byte enable toggle bit

Browse Source 
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>
This commit is contained in:
Maxime Ripard 2024-10-25 18:15:46 +01:00 committed by Dave Stevenson
parent 4013716de7
commit fcd1465d22
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/vc4/vc4_drv.h
View File

@ -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;

6
drivers/gpu/drm/vc4/vc4_txp.c
View File

@ -287,6 +287,7 @@ static void vc4_txp_connector_atomic_commit(struct drm_connector *conn,
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_commit(struct drm_connector *conn,
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_data = {
.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)