[Intel-gfx] [PATCH v2 5/6] drm/rcar_du: changes to rcar-du driver resulting from drm_writeback_connector structure changes

[Kandpal Suraj]

Changing rcar_du driver to accomadate the change of
drm_writeback_connector.base and drm_writeback_connector.encoder
to a pointer the reason for which is explained in the
Patch(drm: add writeback pointers to drm_connector).

Signed-off-by: Kandpal Suraj <suraj.kand...@intel.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h      | 2 ++
 drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h 
b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
index 66e8839db708..68f387a04502 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
@@ -72,6 +72,8 @@ struct rcar_du_crtc {
        const char *const *sources;
        unsigned int sources_count;
 
+       struct drm_connector connector;
+       struct drm_encoder encoder;
        struct drm_writeback_connector writeback;
 };
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_writeback.c 
b/drivers/gpu/drm/rcar-du/rcar_du_writeback.c
index c79d1259e49b..5b1e83380c47 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_writeback.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_writeback.c
@@ -200,8 +200,10 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu,
 {
        struct drm_writeback_connector *wb_conn = &rcrtc->writeback;
 
-       wb_conn->encoder.possible_crtcs = 1 << drm_crtc_index(&rcrtc->crtc);
-       drm_connector_helper_add(&wb_conn->base,
+       wb_conn->base = &rcrtc->connector;
+       wb_conn->encoder = &rcrtc->encoder;
+       wb_conn->encoder->possible_crtcs = 1 << drm_crtc_index(&rcrtc->crtc);
+       drm_connector_helper_add(wb_conn->base,
                                 &rcar_du_wb_conn_helper_funcs);
 
        return drm_writeback_connector_init(&rcdu->ddev, wb_conn,
@@ -220,7 +222,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
        struct drm_framebuffer *fb;
        unsigned int i;
 
-       state = rcrtc->writeback.base.state;
+       state = rcrtc->writeback.base->state;
        if (!state || !state->writeback_job)
                return;
 
-- 
2.17.1