Lets now pass drm_connector to prepare_writeback_job since
drm_writeback_connector now resides within drm_connector.
It also make it uniform with params passed to other
drm_connector_helper_funcs.
Signed-off-by: Suraj Kandpal <suraj.kand...@intel.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 2 +-
drivers/gpu/drm/drm_writeback.c | 2 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 4 +---
drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 6 ++----
drivers/gpu/drm/vkms/vkms_writeback.c | 2 +-
include/drm/drm_modeset_helper_vtables.h | 2 +-
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
index 84a9c1d2bd8e..d02f5d20f3b1 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
@@ -80,7 +80,7 @@ static int amdgpu_dm_wb_connector_get_modes(struct
drm_connector *connector)
return drm_add_modes_noedid(connector, 3840, 2160);
}
-static int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector
*wb_connector,
+static int amdgpu_dm_wb_prepare_job(struct drm_connector *connector,
struct drm_writeback_job *job)
{
struct amdgpu_framebuffer *afb;
diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
index 569160ed713c..32a8e6498585 100644
--- a/drivers/gpu/drm/drm_writeback.c
+++ b/drivers/gpu/drm/drm_writeback.c
@@ -395,7 +395,7 @@ int drm_writeback_prepare_job(struct drm_writeback_job *job)
int ret;
if (funcs->prepare_writeback_job) {
- ret = funcs->prepare_writeback_job(wb_connector, job);
+ ret = funcs->prepare_writeback_job(connector, job);
if (ret < 0)
return ret;
}
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c
b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c
index 8d29e09952c5..26a93c3cc454 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c
@@ -83,11 +83,9 @@ static const struct drm_connector_funcs dpu_wb_conn_funcs = {
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
-static int dpu_wb_conn_prepare_job(struct drm_writeback_connector *wb_conn,
+static int dpu_wb_conn_prepare_job(struct drm_connector *connector,
struct drm_writeback_job *job)
{
- struct drm_connector *connector =
- container_of(wb_conn, struct drm_connector, writeback);
struct dpu_wb_connector *dpu_wb_conn = to_dpu_wb_conn(connector);
if (!job->fb)
diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
index 1ec9b4242c39..725981cc1d0c 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
@@ -47,12 +47,10 @@ static int rcar_du_wb_conn_get_modes(struct drm_connector
*connector)
dev->mode_config.max_height);
}
-static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
+static int rcar_du_wb_prepare_job(struct drm_connector *connector,
struct drm_writeback_job *job)
{
- struct drm_connector *conn =
- drm_writeback_to_connector(connector);
- struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(conn);
+ struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
struct rcar_du_wb_job *rjob;
int ret;
diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c
b/drivers/gpu/drm/vkms/vkms_writeback.c
index 28d361517a55..032896fb5c5b 100644
--- a/drivers/gpu/drm/vkms/vkms_writeback.c
+++ b/drivers/gpu/drm/vkms/vkms_writeback.c
@@ -71,7 +71,7 @@ static int vkms_wb_connector_get_modes(struct drm_connector
*connector)
dev->mode_config.max_height);
}
-static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector,
+static int vkms_wb_prepare_job(struct drm_connector *connector,
struct drm_writeback_job *job)
{
struct vkms_writeback_job *vkmsjob;
diff --git a/include/drm/drm_modeset_helper_vtables.h
b/include/drm/drm_modeset_helper_vtables.h
index ce7c7aeac887..f6a14f396c40 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -1130,7 +1130,7 @@ struct drm_connector_helper_funcs {
*
* This callback is used by the atomic modeset helpers.
*/
- int (*prepare_writeback_job)(struct drm_writeback_connector *connector,
+ int (*prepare_writeback_job)(struct drm_connector *connector,
struct drm_writeback_job *job);
/**
* @cleanup_writeback_job:
--
2.34.1
