[RFC PATCH 5/8] drm/vc4: Adapt vc4 writeback to new drm_writeback_connector

[Suraj Kandpal]

Now that drm_writeback_connector is embedded with the drm_connector
adapt the vc4 writeback functionality to this changes. This
includes changing the drm_writeback_connector to be changed to drm_connector
within the vc4_txp.Some other changes are done which are a
result of the all the above changes mentioned.

Signed-off-by: Suraj Kandpal <suraj.kand...@intel.com>
---
 drivers/gpu/drm/vc4/vc4_txp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
index fef4e4ee47cf..2428807e9714 100644
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@ -167,7 +167,7 @@ struct vc4_txp {
        struct platform_device *pdev;
 
        struct vc4_encoder encoder;
-       struct drm_writeback_connector connector;
+       struct drm_connector connector;
 
        void __iomem *regs;
 };
@@ -176,7 +176,7 @@ struct vc4_txp {
        container_of_const(_encoder, struct vc4_txp, encoder.base)
 
 #define connector_to_vc4_txp(_connector)                               \
-       container_of_const(_connector, struct vc4_txp, connector.base)
+       container_of_const(_connector, struct vc4_txp, connector)
 
 static const struct debugfs_reg32 txp_regs[] = {
        VC4_REG32(TXP_DST_PTR),
@@ -356,7 +356,7 @@ static void vc4_txp_connector_atomic_commit(struct 
drm_connector *conn,
 
        TXP_WRITE(TXP_DST_CTRL, ctrl);
 
-       drm_writeback_queue_job(&txp->connector, conn_state);
+       drm_writeback_queue_job(&txp->connector.writeback, conn_state);
 
        drm_dev_exit(idx);
 }
@@ -504,7 +504,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data)
         */
        TXP_WRITE(TXP_DST_CTRL, TXP_READ(TXP_DST_CTRL) & ~TXP_EI);
        vc4_crtc_handle_vblank(vc4_crtc);
-       drm_writeback_signal_completion(&txp->connector, 0);
+       drm_writeback_signal_completion(&txp->connector.writeback, 0);
 
        return IRQ_HANDLED;
 }
@@ -598,9 +598,9 @@ static int vc4_txp_bind(struct device *dev, struct device 
*master, void *data)
        if (ret)
                return ret;
 
-       drm_connector_helper_add(&txp->connector.base,
+       drm_connector_helper_add(&txp->connector,
                                 &vc4_txp_connector_helper_funcs);
-       ret = drmm_writeback_connector_init(drm, &txp->connector,
+       ret = drmm_writeback_connector_init(drm, &txp->connector.writeback,
                                            &vc4_txp_connector_funcs,
                                            encoder,
                                            drm_fmts, ARRAY_SIZE(drm_fmts));
@@ -622,7 +622,7 @@ static void vc4_txp_unbind(struct device *dev, struct 
device *master,
 {
        struct vc4_txp *txp = dev_get_drvdata(dev);
 
-       drm_connector_cleanup(&txp->connector.base);
+       drm_connector_cleanup(&txp->connector);
 }
 
 static const struct component_ops vc4_txp_ops = {
-- 
2.34.1