Move to using drm_connector instead of drm_writeback_connector since
it now resides within drm_connector. This will also help with
make sure drivers do not need to access drm_writeback_connector
as much.
Signed-off-by: Suraj Kandpal <suraj.kand...@intel.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +-
drivers/gpu/drm/arm/malidp_hw.c | 6 +++---
drivers/gpu/drm/drm_writeback.c | 7 +++++--
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 4 ++--
drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 2 +-
drivers/gpu/drm/vc4/vc4_txp.c | 2 +-
drivers/gpu/drm/vkms/vkms_composer.c | 2 +-
include/drm/drm_writeback.h | 2 +-
9 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 4aaa7d233f4a..cf693aebb43f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -640,7 +640,7 @@ static void dm_crtc_high_irq(void *interrupt_params)
100LL, (v_total *
stream->timing.h_total));
mdelay(1000 / refresh_hz);
- drm_writeback_signal_completion(acrtc->wb_conn,
0);
+
drm_writeback_signal_completion(acrtc->connector, 0);
dc_stream_fc_disable_writeback(adev->dm.dc,
acrtc->dm_irq_params.stream, 0);
}
diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
index b3f1d3ca23aa..aa5f2776d6c0 100644
--- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
+++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
@@ -210,7 +210,7 @@ void komeda_crtc_handle_event(struct komeda_crtc *kcrtc,
struct komeda_wb_connector *wb_conn = kcrtc->wb_conn;
if (wb_conn)
-
drm_writeback_signal_completion(&wb_conn->base.writeback, 0);
+ drm_writeback_signal_completion(&wb_conn->base, 0);
else
DRM_WARN("CRTC[%d]: EOW happen but no wb_connector.\n",
drm_crtc_index(&kcrtc->base));
diff --git a/drivers/gpu/drm/arm/malidp_hw.c b/drivers/gpu/drm/arm/malidp_hw.c
index 5a7bd27d3718..9b845d3f34e1 100644
--- a/drivers/gpu/drm/arm/malidp_hw.c
+++ b/drivers/gpu/drm/arm/malidp_hw.c
@@ -1315,15 +1315,15 @@ static irqreturn_t malidp_se_irq(int irq, void *arg)
if (status & se->vsync_irq) {
switch (hwdev->mw_state) {
case MW_ONESHOT:
-
drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0);
+ drm_writeback_signal_completion(&malidp->mw_connector,
0);
break;
case MW_STOP:
-
drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0);
+ drm_writeback_signal_completion(&malidp->mw_connector,
0);
/* disable writeback after stop */
hwdev->mw_state = MW_NOT_ENABLED;
break;
case MW_RESTART:
-
drm_writeback_signal_completion(&malidp->mw_connector.writeback, 0);
+ drm_writeback_signal_completion(&malidp->mw_connector,
0);
fallthrough; /* to a new start */
case MW_START:
/* writeback started, need to emulate one-shot mode */
diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
index 02c8bffcca11..d41eee6688d8 100644
--- a/drivers/gpu/drm/drm_writeback.c
+++ b/drivers/gpu/drm/drm_writeback.c
@@ -481,7 +481,8 @@ static void cleanup_work(struct work_struct *work)
/**
* drm_writeback_signal_completion - Signal the completion of a writeback job
- * @wb_connector: The writeback connector whose job is complete
+ * @connector: The drm connector whicha has the drm_writeback_connector whose
+ * job is complete
* @status: Status code to set in the writeback out_fence (0 for success)
*
* Drivers should call this to signal the completion of a previously queued
@@ -496,10 +497,12 @@ static void cleanup_work(struct work_struct *work)
* See also: drm_writeback_queue_job()
*/
void
-drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
+drm_writeback_signal_completion(struct drm_connector *connector,
int status)
{
unsigned long flags;
+ struct drm_writeback_connector *wb_connector =
+ drm_connector_to_writeback(connector);
struct drm_writeback_job *job;
struct dma_fence *out_fence;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
index 32db3e248a4d..8472b90b522e 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
@@ -373,7 +373,7 @@ static void dpu_encoder_phys_wb_done_irq(void *arg)
spin_unlock_irqrestore(phys_enc->enc_spinlock, lock_flags);
if (wb_enc->wb_conn)
- drm_writeback_signal_completion(wb_enc->wb_conn, 0);
+
drm_writeback_signal_completion(drm_writeback_to_connector(wb_enc->wb_conn), 0);
/* Signal any waiting atomic commit thread */
wake_up_all(&phys_enc->pending_kickoff_wq);
@@ -434,7 +434,7 @@ static void _dpu_encoder_phys_wb_handle_wbdone_timeout(
phys_enc->enable_state = DPU_ENC_ERR_NEEDS_HW_RESET;
if (wb_enc->wb_conn)
- drm_writeback_signal_completion(wb_enc->wb_conn, 0);
+
drm_writeback_signal_completion(drm_writeback_to_connector(wb_enc->wb_conn), 0);
dpu_encoder_frame_done_callback(phys_enc->parent, phys_enc,
frame_event);
}
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 4e8fa7a5bc32..1ec9b4242c39 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
@@ -253,5 +253,5 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc)
{
- drm_writeback_signal_completion(&rcrtc->writeback.writeback, 0);
+ drm_writeback_signal_completion(&rcrtc->writeback, 0);
}
diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
index 8afd1a50ab98..ace13bfa1994 100644
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@ -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.writeback, 0);
+ drm_writeback_signal_completion(&txp->connector, 0);
return IRQ_HANDLED;
}
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c
b/drivers/gpu/drm/vkms/vkms_composer.c
index 4d0bafdebcd1..fa269d279e25 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -543,7 +543,7 @@ void vkms_composer_worker(struct work_struct *work)
return;
if (wb_pending) {
- drm_writeback_signal_completion(&out->wb_connector.writeback,
0);
+ drm_writeback_signal_completion(&out->wb_connector, 0);
spin_lock_irq(&out->composer_lock);
crtc_state->wb_pending = false;
spin_unlock_irq(&out->composer_lock);
diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
index a814b33cbb53..42b7f635eab6 100644
--- a/include/drm/drm_writeback.h
+++ b/include/drm/drm_writeback.h
@@ -106,7 +106,7 @@ void drm_writeback_queue_job(struct drm_connector
*wb_connector,
void drm_writeback_cleanup_job(struct drm_writeback_job *job);
void
-drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector,
+drm_writeback_signal_completion(struct drm_connector *connector,
int status);
struct dma_fence *
--
2.34.1
