mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
|
From 6314c24d162b32cfe3113329e5a44bfd7ac71ddc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Wed, 23 Nov 2022 16:25:58 +0100
|
||
|
|
Subject: [PATCH] drm/vc4: txp: Initialise the CRTC before the encoder
|
||
|
|
and connector
|
||
|
|
|
||
|
|
It makes more sense to register the CRTC before the encoder and
|
||
|
|
connectors, so let's move our call around.
|
||
|
|
|
||
|
|
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-16-051a0bb60a16@cerno.tech
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_txp.c | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_txp.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
|
||
|
|
@@ -516,6 +516,11 @@ static int vc4_txp_bind(struct device *d
|
||
|
|
vc4_crtc->regset.regs = txp_regs;
|
||
|
|
vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
|
||
|
|
|
||
|
|
+ ret = vc4_crtc_init(drm, vc4_crtc,
|
||
|
|
+ &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs);
|
||
|
|
+ if (ret)
|
||
|
|
+ return ret;
|
||
|
|
+
|
||
|
|
vc4_encoder = &txp->encoder;
|
||
|
|
txp->encoder.type = VC4_ENCODER_TYPE_TXP;
|
||
|
|
|
||
|
|
@@ -537,11 +542,6 @@ static int vc4_txp_bind(struct device *d
|
||
|
|
if (ret)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
- ret = vc4_crtc_init(drm, vc4_crtc,
|
||
|
|
- &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs);
|
||
|
|
- if (ret)
|
||
|
|
- return ret;
|
||
|
|
-
|
||
|
|
ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
|
||
|
|
dev_name(dev), txp);
|
||
|
|
if (ret)
|