Now that drm_writeback_connector is embedded with the drm_connector
adapt the malidp writeback functionality to this changes. This includes
changing the drm_writeback_connector to be changed to drm_connector
within the malidp_drm.
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/arm/malidp_drv.h | 2 +-
drivers/gpu/drm/arm/malidp_mw.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/arm/malidp_drv.h b/drivers/gpu/drm/arm/malidp_drv.h
index bc0387876dea..cc6d21aa5544 100644
--- a/drivers/gpu/drm/arm/malidp_drv.h
+++ b/drivers/gpu/drm/arm/malidp_drv.h
@@ -32,7 +32,7 @@ struct malidp_drm {
struct drm_device base;
struct malidp_hw_device *dev;
struct drm_crtc crtc;
- struct drm_writeback_connector mw_connector;
+ struct drm_connector connector;
wait_queue_head_t wq;
struct drm_pending_vblank_event *event;
atomic_t config_valid;
diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c
index 182275c0c29c..67fcdc7b3669 100644
--- a/drivers/gpu/drm/arm/malidp_mw.c
+++ b/drivers/gpu/drm/arm/malidp_mw.c
@@ -212,7 +212,7 @@ int malidp_mw_connector_init(struct drm_device *drm)
if (!malidp->dev->hw->enable_memwrite)
return 0;
- drm_connector_helper_add(&malidp->mw_connector.base,
+ drm_connector_helper_add(&malidp->connector,
&malidp_mw_connector_helper_funcs);
formats = get_writeback_formats(malidp, &n_formats);
@@ -228,7 +228,7 @@ int malidp_mw_connector_init(struct drm_device *drm)
encoder->possible_crtcs = 1 << drm_crtc_index(&malidp->crtc);
- ret = drmm_writeback_connector_init(drm, &malidp->mw_connector,
+ ret = drmm_writeback_connector_init(drm, &malidp->connector.writeback,
&malidp_mw_connector_funcs,
encoder,
formats, n_formats);
@@ -243,7 +243,7 @@ void malidp_mw_atomic_commit(struct drm_device *drm,
struct drm_atomic_state *old_state)
{
struct malidp_drm *malidp = drm_to_malidp(drm);
- struct drm_writeback_connector *mw_conn = &malidp->mw_connector;
+ struct drm_writeback_connector *mw_conn = &malidp->connector.writeback;
struct drm_connector_state *conn_state = mw_conn->base.state;
struct malidp_hw_device *hwdev = malidp->dev;
struct malidp_mw_connector_state *mw_state;
--
2.34.1
