Commit 56761051 authored by Maxime Ripard's avatar Maxime Ripard

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: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-16-051a0bb60a16@cerno.tech
parent b998eb4f
No related merge requests found
...@@ -516,6 +516,11 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) ...@@ -516,6 +516,11 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
vc4_crtc->regset.regs = txp_regs; vc4_crtc->regset.regs = txp_regs;
vc4_crtc->regset.nregs = ARRAY_SIZE(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; vc4_encoder = &txp->encoder;
txp->encoder.type = VC4_ENCODER_TYPE_TXP; txp->encoder.type = VC4_ENCODER_TYPE_TXP;
...@@ -537,11 +542,6 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) ...@@ -537,11 +542,6 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
if (ret) if (ret)
return 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, ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
dev_name(dev), txp); dev_name(dev), txp);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment