| Message ID | 20220914071228.1595878-4-suraj.kandpal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable Pipewriteback | expand |
> From: Suraj Kandpal <suraj.kandpal@intel.com> > > Adding support for writeback transcoder to start capturing frames using > interrupt mechanism > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > --- > drivers/gpu/drm/i915/Makefile | 1 + > drivers/gpu/drm/i915/display/intel_acpi.c | 1 + > drivers/gpu/drm/i915/display/intel_crtc.c | 6 + > .../drm/i915/display/intel_crtc_state_dump.c | 1 + > drivers/gpu/drm/i915/display/intel_ddi.c | 6 + > drivers/gpu/drm/i915/display/intel_display.c | 68 +- > drivers/gpu/drm/i915/display/intel_display.h | 5 + > .../drm/i915/display/intel_display_debugfs.c | 13 +- > .../drm/i915/display/intel_display_types.h | 11 +- > drivers/gpu/drm/i915/display/intel_dpll.c | 6 + > .../drm/i915/display/intel_modeset_setup.c | 103 ++- > .../drm/i915/display/intel_modeset_verify.c | 17 +- > drivers/gpu/drm/i915/display/intel_opregion.c | 3 + > drivers/gpu/drm/i915/display/intel_wd.c | 695 ++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_wd.h | 48 ++ > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/i915_irq.c | 8 +- > drivers/gpu/drm/i915/i915_pci.c | 7 +- > 18 files changed, 951 insertions(+), 49 deletions(-) create mode 100644 > drivers/gpu/drm/i915/display/intel_wd.c > create mode 100644 drivers/gpu/drm/i915/display/intel_wd.h > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index a26edcdadc21..f34db43cf58d 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -304,6 +304,7 @@ i915-y += \ > display/intel_tv.o \ > display/intel_vdsc.o \ > display/intel_vrr.o \ > + display/intel_wd.o \ > display/vlv_dsi.o \ > display/vlv_dsi_pll.o > > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c > b/drivers/gpu/drm/i915/display/intel_acpi.c > index e78430001f07..ae08db164f73 100644 > --- a/drivers/gpu/drm/i915/display/intel_acpi.c > +++ b/drivers/gpu/drm/i915/display/intel_acpi.c > @@ -247,6 +247,7 @@ static u32 acpi_display_type(struct intel_connector > *connector) > case DRM_MODE_CONNECTOR_LVDS: > case DRM_MODE_CONNECTOR_eDP: > case DRM_MODE_CONNECTOR_DSI: > + case DRM_MODE_CONNECTOR_WRITEBACK: > display_type = ACPI_DISPLAY_TYPE_INTERNAL_DIGITAL; > break; > case DRM_MODE_CONNECTOR_Unknown: > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c > b/drivers/gpu/drm/i915/display/intel_crtc.c > index 6792a9056f46..66d552758720 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc.c > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c > @@ -491,6 +491,9 @@ void intel_pipe_update_start(struct intel_crtc_state > *new_crtc_state) > if (new_crtc_state->do_async_flip) > return; > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > + return; > + > if (intel_crtc_needs_vblank_work(new_crtc_state)) > intel_crtc_vblank_work_init(new_crtc_state); > > @@ -638,6 +641,9 @@ void intel_pipe_update_end(struct intel_crtc_state > *new_crtc_state) > if (new_crtc_state->do_async_flip) > return; > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > + return; > + > trace_intel_pipe_update_end(crtc, end_vbl_count, scanline_end); > > /* > diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > index e9212f69c360..8435065f3b7d 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > @@ -71,6 +71,7 @@ static const char * const output_type_str[] = { > OUTPUT_TYPE(DSI), > OUTPUT_TYPE(DDI), > OUTPUT_TYPE(DP_MST), > + OUTPUT_TYPE(WD), > }; > > #undef OUTPUT_TYPE > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 643832d55c28..ea8e07a957ab 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -1953,6 +1953,12 @@ void > intel_ddi_sanitize_encoder_pll_mapping(struct intel_encoder *encoder) > */ > if (encoder->type == INTEL_OUTPUT_DP_MST) > return; > + /* > + * WD transcoder is a virtual encoder hence sanization > + * is not required for it > + */ > + if (encoder->type == INTEL_OUTPUT_WD) > + return; > > if (!encoder->base.crtc && intel_encoder_is_dp(encoder)) { > u8 pipe_mask; > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 2d0018ae34b1..15b2b7a6a110 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -115,6 +115,7 @@ > #include "intel_sprite.h" > #include "intel_tc.h" > #include "intel_vga.h" > +#include "intel_wd.h" > #include "i9xx_plane.h" > #include "skl_scaler.h" > #include "skl_universal_plane.h" > @@ -1511,6 +1512,10 @@ static void intel_encoders_update_prepare(struct > intel_atomic_state *state) > continue; > > intel_connector = to_intel_connector(connector); > + /* intel_connector instance is not created for WD transcoder > */ > + if (!intel_connector) > + continue; > + > encoder = > intel_connector_primary_encoder(intel_connector); > if (!encoder->update_prepare) > continue; > @@ -1540,6 +1545,10 @@ static void > intel_encoders_update_complete(struct intel_atomic_state *state) > continue; > > intel_connector = to_intel_connector(connector); > + /* intel_connector instance is not created for WD transcoder > */ > + if (!intel_connector) > + continue; > + > encoder = > intel_connector_primary_encoder(intel_connector); > if (!encoder->update_complete) > continue; > @@ -1550,6 +1559,37 @@ static void > intel_encoders_update_complete(struct intel_atomic_state *state) > } > } > > +static void intel_queue_writeback_job(struct intel_atomic_state *state) > +{ > + struct drm_connector_state *new_conn_state; > + struct drm_connector *connector; > + struct drm_writeback_connector *wb_conn; > + int i; > + > + for_each_new_connector_in_state(&state->base, connector, > new_conn_state, > + i) { > + if (!new_conn_state->writeback_job) > + continue; > + > + wb_conn = drm_connector_to_writeback(connector); > + drm_writeback_queue_job(wb_conn, new_conn_state); > + } > +} > + > +static void intel_enable_writeback_capture(struct intel_atomic_state > +*state,struct intel_crtc_state *crtc_state) { > + struct drm_connector_state *new_conn_state; > + struct drm_connector *connector; > + int i; > + > + for_each_new_connector_in_state(&state->base, connector, > new_conn_state, > + i) { > + if (connector->connector_type != > DRM_MODE_CONNECTOR_WRITEBACK) > + continue; > + intel_wd_enable_capture(crtc_state, new_conn_state); > + } > +} > + > static void intel_encoders_pre_pll_enable(struct intel_atomic_state *state, > struct intel_crtc *crtc) > { > @@ -1650,8 +1690,12 @@ static void intel_encoders_post_disable(struct > intel_atomic_state *state, > int i; > > for_each_old_connector_in_state(&state->base, conn, > old_conn_state, i) { > - struct intel_encoder *encoder = > - to_intel_encoder(old_conn_state->best_encoder); > + struct intel_encoder *encoder; > + > + if (conn->connector_type == > DRM_MODE_CONNECTOR_WRITEBACK) > + continue; > + > + encoder = to_intel_encoder(old_conn_state->best_encoder); > > if (old_conn_state->crtc != &crtc->base) > continue; > @@ -1928,7 +1972,8 @@ static void hsw_crtc_enable(struct > intel_atomic_state *state, > bdw_set_pipemisc(new_crtc_state); > > if (!intel_crtc_is_bigjoiner_slave(new_crtc_state) && > - !transcoder_is_dsi(cpu_transcoder)) > + !transcoder_is_dsi(cpu_transcoder) && > + !transcoder_is_wd(cpu_transcoder)) > hsw_configure_cpu_transcoder(new_crtc_state); > > crtc->active = true; > @@ -7528,6 +7573,11 @@ static void intel_atomic_commit_tail(struct > intel_atomic_state *state) > } > } > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > + if ((new_crtc_state->output_types & > BIT(INTEL_OUTPUT_WD))) > + intel_wd_set_vblank_event(state, crtc, > new_crtc_state); > + } > + > intel_encoders_update_prepare(state); > > intel_dbuf_pre_plane_update(state); > @@ -7538,6 +7588,14 @@ static void intel_atomic_commit_tail(struct > intel_atomic_state *state) > intel_crtc_enable_flip_done(state, crtc); > } > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > + if ((new_crtc_state->output_types & > BIT(INTEL_OUTPUT_WD))) > + { > + intel_queue_writeback_job(state); > + intel_enable_writeback_capture(state, > new_crtc_state); > + } > + } > + > /* Now enable the clocks, plane, pipe, and connectors that we set > up. */ > dev_priv->display.funcs.display->commit_modeset_enables(state); > > @@ -7892,6 +7950,10 @@ static void intel_setup_outputs(struct > drm_i915_private *dev_priv) > if (!HAS_DISPLAY(dev_priv)) > return; > > + /* Initializing WD transcoder */ > + if (DISPLAY_VER(dev_priv) >= 12) > + intel_wd_init(dev_priv, TRANSCODER_WD_0); > + > if (IS_DG2(dev_priv)) { > intel_ddi_init(dev_priv, PORT_A); > intel_ddi_init(dev_priv, PORT_B); > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > b/drivers/gpu/drm/i915/display/intel_display.h > index 102bf7d47ccc..1ee5e8600809 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -158,6 +158,11 @@ static inline bool transcoder_is_dsi(enum > transcoder transcoder) > return transcoder == TRANSCODER_DSI_A || transcoder == > TRANSCODER_DSI_C; } > > +static inline bool transcoder_is_wd(enum transcoder transcoder) { > + return transcoder == TRANSCODER_WD_0 || transcoder == > TRANSCODER_WD_1; > +} > + > /* > * Global legacy plane identifier. Valid only for primary/sprite > * planes on pre-g4x, and only for primary planes on g4x-bdw. > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index fe40e2a226d6..3ec11c937dbc 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -550,7 +550,7 @@ static void intel_hdmi_info(struct seq_file *m, static > void intel_connector_info(struct seq_file *m, > struct drm_connector *connector) > { > - struct intel_connector *intel_connector = > to_intel_connector(connector); > + struct intel_connector *intel_connector; > const struct drm_connector_state *conn_state = connector->state; > struct intel_encoder *encoder = > to_intel_encoder(conn_state->best_encoder); > @@ -573,6 +573,8 @@ static void intel_connector_info(struct seq_file *m, > if (!encoder) > return; > > + intel_connector = to_intel_connector(connector); > + > switch (connector->connector_type) { > case DRM_MODE_CONNECTOR_DisplayPort: > case DRM_MODE_CONNECTOR_eDP: > @@ -590,12 +592,15 @@ static void intel_connector_info(struct seq_file *m, > break; > } > > - seq_puts(m, "\tHDCP version: "); > - intel_hdcp_info(m, intel_connector); > + if (intel_connector) { > + seq_puts(m, "\tHDCP version: "); > + intel_hdcp_info(m, intel_connector); > + } > > seq_printf(m, "\tmax bpc: %u\n", connector->display_info.bpc); > > - intel_panel_info(m, intel_connector); > + if (intel_connector) > + intel_panel_info(m, intel_connector); > > seq_printf(m, "\tmodes:\n"); > list_for_each_entry(mode, &connector->modes, head) diff --git > a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index 8eacb9133fce..7931dbacaba7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -44,6 +44,7 @@ > #include <drm/drm_vblank.h> > #include <drm/drm_vblank_work.h> > #include <drm/i915_mei_hdcp_interface.h> > +#include <drm/drm_writeback.h> > #include <media/cec-notifier.h> > > #include "i915_vma.h" > @@ -1371,6 +1372,11 @@ struct intel_crtc { > bool cpu_fifo_underrun_disabled; > bool pch_fifo_underrun_disabled; > > + struct { > + struct drm_pending_vblank_event *e; > + atomic_t work_busy; > + wait_queue_head_t wd_wait; > + } wd; > /* per-pipe watermark state */ > struct { > /* watermarks currently being used */ @@ -1498,7 +1504,6 > @@ struct cxsr_latency { #define to_intel_atomic_state(x) container_of(x, > struct intel_atomic_state, base) #define to_intel_crtc(x) container_of(x, > struct intel_crtc, base) #define to_intel_crtc_state(x) container_of(x, struct > intel_crtc_state, uapi) -#define to_intel_wb_connector(x) container_of(x, > struct intel_wb_connector, base) #define to_intel_encoder(x) > container_of(x, struct intel_encoder, base) #define to_intel_framebuffer(x) > container_of(x, struct intel_framebuffer, base) #define to_intel_plane(x) > container_of(x, struct intel_plane, base) @@ -2077,8 +2082,8 @@ > intel_connector_list_iter_next(struct drm_connector_list_iter *iter) > struct drm_connector *connector; > bool flag = true; > /* > - * Skipping connector that are Writeback connector as they will > - * not be embedded in intel connector > + * An intel_connector entity is not created for a writeback > + * connector hence decoupling. > */ > while (flag) { > connector = drm_connector_list_iter_next(iter); > diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c > b/drivers/gpu/drm/i915/display/intel_dpll.c > index 52f2fe1735da..411f3366b9de 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll.c > @@ -940,6 +940,9 @@ static int hsw_crtc_compute_clock(struct > intel_atomic_state *state, > intel_get_crtc_new_encoder(state, crtc_state); > int ret; > > + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) > + return 0; > + > if (DISPLAY_VER(dev_priv) < 11 && > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > return 0; > @@ -968,6 +971,9 @@ static int hsw_crtc_get_shared_dpll(struct > intel_atomic_state *state, > struct intel_encoder *encoder = > intel_get_crtc_new_encoder(state, crtc_state); > > + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) > + return 0; > + > if (DISPLAY_VER(dev_priv) < 11 && > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > return 0; > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > index e1a90331c230..15792a5dd04c 100644 > --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > @@ -24,6 +24,7 @@ > #include "intel_pch_display.h" > #include "intel_pm.h" > #include "skl_watermark.h" > +#include "intel_wd.h" > > static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, > struct drm_modeset_acquire_ctx > *ctx) @@ -111,17 +112,17 @@ static void intel_crtc_disable_noatomic(struct > intel_crtc *crtc, > > static void intel_modeset_update_connector_atomic_state(struct > drm_i915_private *i915) { > - struct intel_connector *connector; > + struct drm_connector *connector; > struct drm_connector_list_iter conn_iter; > > drm_connector_list_iter_begin(&i915->drm, &conn_iter); > - for_each_intel_connector_iter(connector, &conn_iter) { > - struct drm_connector_state *conn_state = connector- > >base.state; > + drm_for_each_connector_iter(connector, &conn_iter) { > + struct drm_connector_state *conn_state = connector->state; > struct intel_encoder *encoder = > - to_intel_encoder(connector->base.encoder); > + to_intel_encoder(connector->encoder); > > if (conn_state->crtc) > - drm_connector_put(&connector->base); > + drm_connector_put(connector); > > if (encoder) { > struct intel_crtc *crtc = > @@ -133,7 +134,7 @@ static void > intel_modeset_update_connector_atomic_state(struct drm_i915_private > conn_state->crtc = &crtc->base; > conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) > / 3; > > - drm_connector_get(&connector->base); > + drm_connector_get(connector); > } else { > conn_state->best_encoder = NULL; > conn_state->crtc = NULL; > @@ -433,6 +434,8 @@ static void intel_modeset_readout_hw_state(struct > drm_i915_private *i915) > struct intel_crtc *crtc; > struct intel_encoder *encoder; > struct intel_connector *connector; > + struct drm_connector *_connector; > + struct drm_encoder *_encoder; Usually in i915 for struct intel_connector *intel_connector, struct drm_connector *connector is used or Struct intel_connector *connector, struct drm_connector *conn is used. Using this _connector or _encoder will be a totally new notation. Can anyone of the above use used? > struct drm_connector_list_iter conn_iter; > u8 active_pipes = 0; > > @@ -509,38 +512,70 @@ static void > intel_modeset_readout_hw_state(struct drm_i915_private *i915) > intel_dpll_readout_hw_state(i915); > > drm_connector_list_iter_begin(&i915->drm, &conn_iter); > - for_each_intel_connector_iter(connector, &conn_iter) { > - if (connector->get_hw_state(connector)) { > - struct intel_crtc_state *crtc_state; > - struct intel_crtc *crtc; > - > - connector->base.dpms = DRM_MODE_DPMS_ON; > - > - encoder = intel_attached_encoder(connector); > - connector->base.encoder = &encoder->base; > - > - crtc = to_intel_crtc(encoder->base.crtc); > - crtc_state = crtc ? to_intel_crtc_state(crtc- > >base.state) : NULL; > - > - if (crtc_state && crtc_state->hw.active) { > - /* > - * This has to be done during hardware > readout > - * because anything calling .crtc_disable may > - * rely on the connector_mask being > accurate. > - */ > - crtc_state->uapi.connector_mask |= > - drm_connector_mask(&connector- > >base); > - crtc_state->uapi.encoder_mask |= > - drm_encoder_mask(&encoder- > >base); > + drm_for_each_connector_iter(_connector, &conn_iter) { > + struct intel_crtc_state *crtc_state; > + struct intel_crtc *crtc; > + struct drm_writeback_connector *wb_conn; > + struct intel_wd *intel_wd; > + > + connector = to_intel_connector(_connector); > + if (!connector) { > + wb_conn = > drm_connector_to_writeback(_connector); > + intel_wd = wb_conn_to_intel_wd(wb_conn); > + _encoder = &intel_wd->base.base; > + _connector->encoder = _encoder; > + encoder = to_intel_encoder(_encoder); > + pipe = 0; > + if (encoder->get_hw_state(encoder, &pipe)) { > + _connector->dpms = > DRM_MODE_DPMS_ON; > + crtc = to_intel_crtc(_encoder->crtc); > + crtc_state = crtc ? to_intel_crtc_state(crtc- > >base.state) : NULL; > + > + if (crtc_state && crtc_state->hw.active) { > + /* > + * This has to be done during > hardware readout > + * because anything calling > .crtc_disable may > + * rely on the connector_mask being > accurate. > + */ > + crtc_state->uapi.connector_mask |= > + > drm_connector_mask(&connector->base); > + crtc_state->uapi.encoder_mask |= > + > drm_encoder_mask(&encoder->base); > + } > + } else { > + _connector->dpms = > DRM_MODE_DPMS_OFF; > + _connector->encoder = NULL; > } > } else { > - connector->base.dpms = DRM_MODE_DPMS_OFF; > - connector->base.encoder = NULL; > + if (connector->get_hw_state(connector)) { > + connector->base.dpms = > DRM_MODE_DPMS_OFF; > + encoder = > intel_attached_encoder(connector); > + connector->base.encoder = &encoder->base; > + > + crtc = to_intel_crtc(encoder->base.crtc); > + crtc_state = crtc ? to_intel_crtc_state(crtc- > >base.state) : NULL; > + > + if (crtc_state && crtc_state->hw.active) { > + /* > + * This has to be done during > hardware readout > + * because anything calling > .crtc_disable may > + * rely on the connector_mask being > accurate. > + */ > + crtc_state->uapi.connector_mask |= > + > drm_connector_mask(&connector->base); > + crtc_state->uapi.encoder_mask |= > + > drm_encoder_mask(&encoder->base); > + } > + } else { > + connector->base.dpms = > DRM_MODE_DPMS_OFF; > + connector->base.encoder = NULL; > + } > } > drm_dbg_kms(&i915->drm, > - "[CONNECTOR:%d:%s] hw state readout: %s\n", > - connector->base.base.id, connector->base.name, > - str_enabled_disabled(connector->base.encoder)); > + "[CONNECTOR:%d:%s] hw state readout: > %s\n", > + _connector->base.id, _connector->name, > + str_enabled_disabled(_connector- > >encoder)); > + > } > drm_connector_list_iter_end(&conn_iter); > > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c > b/drivers/gpu/drm/i915/display/intel_modeset_verify.c > index 0fdcf2e6d57f..80e9840e2e5f 100644 > --- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c > +++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c > @@ -25,11 +25,16 @@ > static void intel_connector_verify_state(struct intel_crtc_state *crtc_state, > struct drm_connector_state > *conn_state) { > - struct intel_connector *connector = to_intel_connector(conn_state- > >connector); > - struct drm_i915_private *i915 = to_i915(connector->base.dev); > + struct drm_connector *_connector = conn_state->connector; > + struct intel_connector *connector; > + struct drm_i915_private *i915 = to_i915(_connector->dev); > > drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s]\n", > - connector->base.base.id, connector->base.name); > + _connector->base.id, _connector->name); > + > + connector = to_intel_connector(_connector); > + if (!connector) > + return; > > if (connector->get_hw_state(connector)) { > struct intel_encoder *encoder = > intel_attached_encoder(connector); > @@ -119,6 +124,9 @@ verify_encoder_state(struct drm_i915_private > *dev_priv, struct intel_atomic_stat > encoder->base.base.id, > encoder->base.name); > > + if (encoder->type == INTEL_OUTPUT_WD) > + continue; > + > for_each_oldnew_connector_in_state(&state->base, > connector, old_conn_state, > new_conn_state, i) { > if (old_conn_state->best_encoder == &encoder- > >base) @@ -177,6 +185,9 @@ verify_crtc_state(struct intel_crtc *crtc, > > intel_crtc_get_pipe_config(pipe_config); > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > + return; > + > /* we keep both pipes enabled on 830 */ > if (IS_I830(dev_priv) && pipe_config->hw.active) > pipe_config->hw.active = new_crtc_state->hw.active; diff --git > a/drivers/gpu/drm/i915/display/intel_opregion.c > b/drivers/gpu/drm/i915/display/intel_opregion.c > index caa07ef34f21..1bcb4b58d992 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > @@ -374,6 +374,9 @@ int intel_opregion_notify_encoder(struct > intel_encoder *intel_encoder, > if (ret) > return ret; > > + if (intel_encoder->type == INTEL_OUTPUT_WD) > + return 0; > + > if (intel_encoder->type == INTEL_OUTPUT_DSI) > port = 0; > else > diff --git a/drivers/gpu/drm/i915/display/intel_wd.c > b/drivers/gpu/drm/i915/display/intel_wd.c > new file mode 100644 > index 000000000000..e3e990f4f26f > --- /dev/null > +++ b/drivers/gpu/drm/i915/display/intel_wd.c > @@ -0,0 +1,695 @@ > +// SPDX-License-Identifier: MIT > +/* > + * Copyright © 2022 Intel Corporation > + */ > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_fourcc.h> > + > +#include "intel_atomic.h" > +#include "intel_connector.h" > +#include "intel_wd.h" > +#include "intel_fb_pin.h" > +#include "intel_de.h" > + > +enum { > + WD_CAPTURE_4_PIX, > + WD_CAPTURE_2_PIX, > +} wd_capture_format; > + > +struct drm_writeback_job > +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd) { > + struct drm_writeback_job *job; > + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); > + struct drm_writeback_connector *wb_conn = > + &intel_wd->wb_conn; > + unsigned long flags; > + > + spin_lock_irqsave(&wb_conn->job_lock, flags); > + job = list_first_entry_or_null(&wb_conn->job_queue, > + struct drm_writeback_job, > + list_entry); > + spin_unlock_irqrestore(&wb_conn->job_lock, flags); > + if (job == NULL) { > + drm_dbg_kms(&i915->drm, "job queue is empty\n"); > + return NULL; > + } > + > + return job; > +} > + > +static const u32 wd_fmts[] = { > + DRM_FORMAT_YUV444, > + DRM_FORMAT_XYUV8888, > + DRM_FORMAT_XBGR8888, > + DRM_FORMAT_XRGB8888, > + DRM_FORMAT_Y410, > + DRM_FORMAT_YUV422, > + DRM_FORMAT_XBGR2101010, > + DRM_FORMAT_RGB565, > +}; > + > +static int intel_wd_get_format(int pixel_format) { > + int wd_format = -EINVAL; > + > + switch (pixel_format) { > + case DRM_FORMAT_XBGR8888: > + case DRM_FORMAT_XRGB8888: > + case DRM_FORMAT_XBGR2101010: > + case DRM_FORMAT_XYUV8888: > + case DRM_FORMAT_YUV444: > + wd_format = WD_CAPTURE_4_PIX; > + break; > + case DRM_FORMAT_YUV422: > + case DRM_FORMAT_RGB565: > + wd_format = WD_CAPTURE_2_PIX; > + break; > + default: > + DRM_ERROR("unsupported pixel format %x!\n", > + pixel_format); > + } > + > + return wd_format; > +} > + > +static int intel_wd_verify_pix_format(int format) { > + const struct drm_format_info *info = drm_format_info(format); > + int pix_format = info->format; > + int i = 0; > + > + for (i = 0; i < ARRAY_SIZE(wd_fmts); i++) > + if (pix_format == wd_fmts[i]) > + return 0; > + > + return true; > +} > + > +static u32 intel_wd_get_stride(const struct intel_crtc_state *crtc_state, > + int format) > +{ > + const struct drm_format_info *info = drm_format_info(format); > + int wd_format; > + int hactive, pixel_size; > + > + wd_format = intel_wd_get_format(info->format); > + > + switch (wd_format) { > + case WD_CAPTURE_4_PIX: > + pixel_size = 4; > + break; > + case WD_CAPTURE_2_PIX: > + pixel_size = 2; > + break; > + default: > + pixel_size = 1; > + break; > + } > + > + hactive = crtc_state->hw.adjusted_mode.crtc_hdisplay; > + > + return DIV_ROUND_UP(hactive * pixel_size, 64); } > + > +static int intel_wd_pin_fb(struct intel_wd *intel_wd, > + struct drm_framebuffer *fb) > +{ > + const struct i915_gtt_view view = { > + .type = I915_GTT_VIEW_NORMAL, > + }; > + struct i915_vma *vma; > + > + vma = intel_pin_and_fence_fb_obj(fb, false, &view, false, > + &intel_wd->flags); > + > + if (IS_ERR(vma)) > + return PTR_ERR(vma); > + > + intel_wd->vma = vma; > + return 0; > +} > + > +static void intel_configure_slicing_strategy(struct drm_i915_private *i915, > + struct intel_wd *intel_wd, > + u32 *tmp) > +{ > + *tmp &= ~WD_STRAT_MASK; > + if (intel_wd->slicing_strategy == 1) > + *tmp |= WD_SLICING_STRAT_1_1; > + else if (intel_wd->slicing_strategy == 2) > + *tmp |= WD_SLICING_STRAT_2_1; > + else if (intel_wd->slicing_strategy == 3) > + *tmp |= WD_SLICING_STRAT_4_1; > + else if (intel_wd->slicing_strategy == 4) > + *tmp |= WD_SLICING_STRAT_8_1; > + > + intel_de_write(i915, WD_STREAMCAP_CTL(intel_wd->trans), > + *tmp); > +} > + > +static enum drm_mode_status > +intel_wd_mode_valid(struct drm_connector *connector, > + struct drm_display_mode *mode) > +{ > + return MODE_OK; > +} > + > +static int intel_wd_get_modes(struct drm_connector *connector) { > + return 0; > +} > + > +static void intel_wd_get_config(struct intel_encoder *encoder, > + struct intel_crtc_state *pipe_config) { > + struct intel_crtc *intel_crtc = > + to_intel_crtc(pipe_config->uapi.crtc); > + > + if (intel_crtc) { > + memcpy(pipe_config, intel_crtc->config, > + sizeof(*pipe_config)); > + pipe_config->output_types |= BIT(INTEL_OUTPUT_WD); > + } > +} > + > +static int intel_wd_compute_config(struct intel_encoder *encoder, > + struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state) { > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > + struct drm_writeback_job *job; > + > + job = intel_get_writeback_job_from_queue(intel_wd); > + if (job || conn_state->writeback_job) { > + /* > + * Saving reference of pipe/crtc for later use if > + * writeback job is present > + */ > + intel_wd->wd_crtc = to_intel_crtc(pipe_config->uapi.crtc); > + return 0; > + } > + > + return 0; > +} > + > +static void intel_wd_get_power_domains(struct intel_encoder *encoder, > + struct intel_crtc_state *crtc_state) { > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > + intel_wakeref_t wakeref; > + > + wakeref = intel_display_power_get(i915, encoder->power_domain); > + > + intel_wd->io_wakeref[0] = wakeref; > +} > + > +static bool intel_wd_get_hw_state(struct intel_encoder *encoder, > + enum pipe *pipe) > +{ > + bool ret = false; > + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; > + intel_wakeref_t wakeref; > + u32 tmp; > + > + if (wd_crtc) > + return false; > + > + wakeref = intel_display_power_get_if_enabled(dev_priv, > + encoder->power_domain); > + > + if (!wakeref) > + goto out; > + > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > + ret = tmp & WD_TRANS_ACTIVE; > + if (ret) { > + *pipe = wd_crtc->pipe; > + return true; > + } > + > +out: > + intel_display_power_put(dev_priv, encoder->power_domain, > wakeref); > + return false; > +} > + > +static int intel_wd_encoder_atomic_check(struct drm_encoder *encoder, > + struct drm_crtc_state *crtc_st, > + struct drm_connector_state > *conn_st) { > + /* Check for the format and buffers and property validity */ > + struct drm_framebuffer *fb; > + struct drm_writeback_job *job = conn_st->writeback_job; > + struct drm_i915_private *i915 = to_i915(encoder->dev); > + const struct drm_display_mode *mode = &crtc_st->mode; > + int ret; > + > + if (!job) { > + drm_dbg_kms(&i915->drm, "No writeback job created > returning\n"); > + return -EINVAL; > + } > + > + fb = job->fb; > + if (!fb) { > + drm_dbg_kms(&i915->drm, "Invalid framebuffer\n"); > + return -EINVAL; > + } > + > + if (fb->width != mode->hdisplay || fb->height != mode->vdisplay) { > + drm_dbg_kms(&i915->drm, "Invalid framebuffer size > %ux%u\n", > + fb->width, fb->height); > + return -EINVAL; > + } > + > + ret = intel_wd_verify_pix_format(fb->format->format); > + if (ret) { > + drm_dbg_kms(&i915->drm, "Unsupported framebuffer > format %08x\n", > + fb->format->format); > + return -EINVAL; > + } > + > + return 0; > +} > + > + > +static const struct drm_encoder_helper_funcs wd_encoder_helper_funcs = > { > + .atomic_check = intel_wd_encoder_atomic_check, }; > + > +static void intel_wd_connector_destroy(struct drm_connector *connector) > +{ > + drm_connector_cleanup(connector); > +} > + > +static enum drm_connector_status > +intel_wd_connector_detect(struct drm_connector *connector, bool force) > +{ > + return connector_status_connected; > +} > + > +static const struct drm_connector_funcs wb_connector_funcs = { > + .detect = intel_wd_connector_detect, > + .reset = drm_atomic_helper_connector_reset, > + .destroy = intel_wd_connector_destroy, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .atomic_destroy_state = > drm_atomic_helper_connector_destroy_state, > + .atomic_duplicate_state = > drm_atomic_helper_connector_duplicate_state, > +}; > + > +static const struct drm_connector_helper_funcs > wb_connector_helper_funcs = { > + .get_modes = intel_wd_get_modes, > + .mode_valid = intel_wd_mode_valid, > +}; > + > +static const struct drm_encoder_funcs drm_writeback_encoder_funcs = { > + .destroy = drm_encoder_cleanup, > +}; > + > +static bool intel_fastset_dis(struct intel_encoder *encoder, > + struct intel_crtc_state *pipe_config) { > + return false; > +} > + > +static void intel_wd_connector_init(struct intel_wd *intel_wd) { > + drm_atomic_helper_connector_reset(&intel_wd->wb_conn.base); > +} > + > +static void intel_wd_disable_capture(struct intel_wd *intel_wd) { > + struct drm_i915_private *dev_priv = to_i915(intel_wd- > >base.base.dev); > + u32 tmp; > + > + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), 0xFF); > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > + tmp &= WD_TRANS_DISABLE; > + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); > + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd- > >trans)); > +} > + > +void intel_wd_init(struct drm_i915_private *i915, enum transcoder > +trans) { > + struct intel_wd *intel_wd; > + struct intel_encoder *encoder; > + struct drm_writeback_connector *wb_conn; > + int n_formats = ARRAY_SIZE(wd_fmts); > + struct drm_encoder *drm_enc; > + int err, ret; > + > + intel_wd = kzalloc(sizeof(*intel_wd), GFP_KERNEL); > + if (!intel_wd) > + return; > + > + intel_wd_connector_init(intel_wd); > + encoder = &intel_wd->base; > + drm_enc = &encoder->base; > + wb_conn = &intel_wd->wb_conn; > + intel_wd->trans = trans; > + intel_wd->triggered_cap_mode = 1; > + intel_wd->frame_num = 1; > + intel_wd->slicing_strategy = 1; > + encoder->get_config = intel_wd_get_config; > + encoder->compute_config = intel_wd_compute_config; > + encoder->get_hw_state = intel_wd_get_hw_state; > + encoder->type = INTEL_OUTPUT_WD; > + encoder->cloneable = 0; > + encoder->pipe_mask = ~0; > + encoder->power_domain = POWER_DOMAIN_TRANSCODER_B; > + encoder->get_power_domains = intel_wd_get_power_domains; > + encoder->initial_fastset_check = intel_fastset_dis; > + > + drm_encoder_helper_add(drm_enc, > + &wd_encoder_helper_funcs); > + > + drm_enc->possible_crtcs = ~0; > + ret = drm_encoder_init(&i915->drm, drm_enc, > + &drm_writeback_encoder_funcs, > + DRM_MODE_ENCODER_VIRTUAL, NULL); > + > + if (ret) { > + drm_dbg_kms(&i915->drm, > + "Writeback drm_encoder init Failed: %d\n", > + ret); > + goto cleanup; > + } > + > + err = drm_writeback_connector_init_with_encoder(&i915->drm, > + wb_conn, drm_enc, &wb_connector_funcs, > + wd_fmts, n_formats); > + > + if (err != 0) { > + drm_dbg_kms(&i915->drm, > + "drm_writeback_connector_init: Failed: %d\n", > + err); > + goto cleanup; > + } > + > + wb_conn->base.encoder = drm_enc; > + drm_connector_helper_add(&wb_conn->base, > &wb_connector_helper_funcs); > + wb_conn->base.status = connector_status_connected; > + return; > + > +cleanup: > + kfree(intel_wd); > + return; > +} > + > +static void intel_wd_writeback_complete(struct intel_wd *intel_wd, > + struct drm_writeback_job *job, > + int status) > +{ > + struct drm_writeback_connector *wb_conn = > + &intel_wd->wb_conn; > + drm_writeback_signal_completion(wb_conn, status); } > + > +static int intel_wd_setup_transcoder(struct intel_wd *intel_wd, > + struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state, > + struct drm_writeback_job *job) { > + struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc); > + enum pipe pipe = intel_crtc->pipe; > + struct drm_framebuffer *fb; > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > + struct drm_gem_object *wd_fb_obj; > + int ret; > + u32 stride, tmp; > + u16 hactive, vactive; > + > + fb = job->fb; > + wd_fb_obj = fb->obj[0]; > + if (!wd_fb_obj) { > + drm_dbg_kms(&dev_priv->drm, "No framebuffer gem object > created\n"); > + return -EINVAL; > + } > + > + ret = intel_wd_pin_fb(intel_wd, fb); > + drm_WARN_ON(&dev_priv->drm, ret != 0); > + /* Write stride and surface registers in that particular order */ > + stride = intel_wd_get_stride(pipe_config, fb->format->format); > + > + tmp = intel_de_read(dev_priv, WD_STRIDE(intel_wd->trans)); > + tmp &= ~WD_STRIDE_MASK; > + tmp |= (stride << WD_STRIDE_SHIFT); > + > + intel_de_write(dev_priv, WD_STRIDE(intel_wd->trans), tmp); > + > + tmp = intel_de_read(dev_priv, WD_SURF(intel_wd->trans)); > + > + intel_de_write(dev_priv, WD_SURF(intel_wd->trans), > + i915_ggtt_offset(intel_wd->vma)); > + > + tmp = intel_de_read_fw(dev_priv, WD_IIR(intel_wd->trans)); > + intel_de_write_fw(dev_priv, WD_IIR(intel_wd->trans), tmp); > + > + tmp = ~(WD_GTT_FAULT_INT | WD_WRITE_COMPLETE_INT | > WD_FRAME_COMPLETE_INT | > + WD_VBLANK_INT | WD_OVERRUN_INT | > WD_CAPTURING_INT); > + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), tmp); > + > + if (intel_wd->stream_cap) { > + tmp = intel_de_read(dev_priv, > + WD_STREAMCAP_CTL(intel_wd->trans)); > + tmp |= WD_STREAM_CAP_MODE_EN; > + intel_configure_slicing_strategy(dev_priv, intel_wd, &tmp); > + } > + > + hactive = pipe_config->uapi.mode.hdisplay; > + vactive = pipe_config->uapi.mode.vdisplay; > + tmp = intel_de_read(dev_priv, HTOTAL(intel_wd->trans)); > + tmp = intel_de_read(dev_priv, VTOTAL(intel_wd->trans)); > + > + /* minimum hactive as per bspec: 64 pixels */ > + if (hactive < 64) > + drm_err(&dev_priv->drm, "hactive is less then 64 pixels\n"); > + > + intel_de_write(dev_priv, HTOTAL(intel_wd->trans), hactive - 1); > + intel_de_write(dev_priv, VTOTAL(intel_wd->trans), vactive - 1); > + > + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd- > >trans)); > + /* select pixel format */ > + tmp &= ~WD_PIX_FMT_MASK; > + > + switch (fb->format->format) { > + default: > + fallthrough; > + case DRM_FORMAT_YUYV: > + tmp |= WD_PIX_FMT_YUYV; > + break; > + case DRM_FORMAT_XYUV8888: > + tmp |= WD_PIX_FMT_XYUV8888; > + break; > + case DRM_FORMAT_XBGR8888: > + case DRM_FORMAT_XRGB8888: > + tmp |= WD_PIX_FMT_XBGR8888; > + break; > + case DRM_FORMAT_Y410: > + tmp |= WD_PIX_FMT_Y410; > + break; > + case DRM_FORMAT_YUV422: > + tmp |= WD_PIX_FMT_YUV422; > + break; > + case DRM_FORMAT_XBGR2101010: > + tmp |= WD_PIX_FMT_XBGR2101010; > + break; > + case DRM_FORMAT_RGB565: > + tmp |= WD_PIX_FMT_RGB565; > + break; > + } > + > + if (intel_wd->triggered_cap_mode) > + tmp |= WD_TRIGGERED_CAP_MODE_ENABLE; > + > + if (intel_wd->stream_cap) > + tmp |= WD_CTL_POINTER_DTDH; > + > + /* select input pipe */ > + tmp &= ~WD_INPUT_SELECT_MASK; > + switch (pipe) { > + default: > + fallthrough; > + case PIPE_A: > + tmp |= WD_INPUT_PIPE_A; > + break; > + case PIPE_B: > + tmp |= WD_INPUT_PIPE_B; > + break; > + case PIPE_C: > + tmp |= WD_INPUT_PIPE_C; > + break; > + case PIPE_D: > + tmp |= WD_INPUT_PIPE_D; > + break; > + } > + > + /* enable DDI buffer */ > + if (!(tmp & TRANS_WD_FUNC_ENABLE)) > + tmp |= TRANS_WD_FUNC_ENABLE; > + > + intel_de_write(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans), > tmp); > + > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > + ret = tmp & WD_TRANS_ACTIVE; > + if (!ret) { > + /* enable the transcoder */ > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > + tmp |= WD_TRANS_ENABLE; > + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); > + > + /* wait for transcoder to be enabled */ > + if (intel_de_wait_for_set(dev_priv, PIPECONF(intel_wd- > >trans), > + WD_TRANS_ACTIVE, 10)) > + drm_err(&dev_priv->drm, "WD transcoder could not > be enabled\n"); > + } > + > + return 0; > +} > + > +static int intel_wd_capture(struct intel_wd *intel_wd, > + struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state, > + struct drm_writeback_job *job) > +{ > + u32 tmp; > + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); > + int ret = 0, status = 0; > + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; > + unsigned long flags; > + > + if (!job->out_fence) > + drm_dbg_kms(&i915->drm, "Not able to get out_fence for > job\n"); > + > + ret = intel_wd_setup_transcoder(intel_wd, pipe_config, > + conn_state, job); > + > + if (ret < 0) { > + drm_dbg_kms(&i915->drm, > + "WD transcoder setup not completed aborting > capture\n"); > + return -1; > + } > + > + if (!wd_crtc) { > + drm_err(&i915->drm, "CRTC not attached\n"); > + return -1; > + } > + > + tmp = intel_de_read_fw(i915, WD_TRANS_FUNC_CTL(intel_wd- > >trans)); > + tmp |= START_TRIGGER_FRAME; > + tmp &= ~WD_FRAME_NUMBER_MASK; > + tmp |= intel_wd->frame_num; > + intel_de_write_fw(i915, WD_TRANS_FUNC_CTL(intel_wd- > >trans), tmp); Why this tab space? > + > + if (!intel_de_wait_for_set(i915, WD_IIR(intel_wd->trans), > + WD_FRAME_COMPLETE_INT, 100)){ > + drm_dbg_kms(&i915->drm, "frame captured\n"); > + status = 0; > + } else { > + drm_dbg_kms(&i915->drm, "frame not captured triggering > stop frame\n"); > + tmp = intel_de_read(i915, WD_TRANS_FUNC_CTL(intel_wd- > >trans)); > + tmp |= STOP_TRIGGER_FRAME; > + intel_de_write(i915, WD_TRANS_FUNC_CTL(intel_wd->trans), > tmp); > + status = -1; > + } > + > + intel_wd_writeback_complete(intel_wd, job, status); > + if (wd_crtc->wd.e) { > + spin_lock_irqsave(&i915->drm.event_lock, flags); > + drm_dbg_kms(&i915->drm, "send %p\n", wd_crtc->wd.e); Can this debug print be moved outside the spin_lock_irqsave.? > + drm_crtc_send_vblank_event(&wd_crtc->base, > + wd_crtc->wd.e); > + spin_unlock_irqrestore(&i915->drm.event_lock, flags); > + wd_crtc->wd.e = NULL; > + } else { > + drm_err(&i915->drm, "Event NULL! %p, %p\n", &i915->drm, > + wd_crtc); > + } > + if (!intel_get_writeback_job_from_queue(intel_wd)) > + intel_wd_disable_capture(intel_wd); > + return 0; > +} > + > +void intel_wd_enable_capture(struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state) { > + struct drm_i915_private *i915 = > + to_i915(conn_state->connector->dev); > + struct drm_writeback_connector *wb_conn = > + drm_connector_to_writeback(conn_state->connector); > + struct intel_wd *intel_wd = wb_conn_to_intel_wd(wb_conn); > + struct drm_writeback_job *job; > + > + job = intel_get_writeback_job_from_queue(intel_wd); > + if (!job) { > + drm_dbg_kms(&i915->drm, > + "job queue is empty not capturing any frame\n"); > + return; > + } > + > + intel_wd_capture(intel_wd, pipe_config, > + conn_state, job); > + intel_wd->frame_num += 1; > +} > + > +void intel_wd_set_vblank_event(struct intel_atomic_state *state, struct > intel_crtc *intel_crtc, > + struct intel_crtc_state *intel_crtc_state) { > + struct drm_i915_private *i915 = to_i915(intel_crtc->base.dev); > + struct drm_crtc_state *crtc_state = &intel_crtc_state->uapi; > + struct intel_encoder *encoder; > + struct intel_wd *intel_wd; > + struct drm_connector_state *conn_state; > + struct drm_connector *connector; > + int i; > + > + for_each_intel_encoder(&i915->drm, encoder) { > + if (encoder->type != INTEL_OUTPUT_WD) > + continue; > + > + intel_wd = enc_to_intel_wd(encoder); > + if (!intel_wd->wd_crtc) > + return; > + } > + > + if (intel_wd && intel_crtc == intel_wd->wd_crtc) { > + for_each_new_connector_in_state(&state->base, connector, > conn_state, > + i) { > + if (!conn_state->writeback_job) > + continue; > + > + intel_crtc->wd.e = crtc_state->event; > + crtc_state->event = NULL; > + } > + } > +} > + > +void intel_wd_handle_isr(struct drm_i915_private *i915) { > + u32 iir_value = 0; > + struct intel_encoder *encoder; > + struct intel_wd *intel_wd; > + > + iir_value = intel_de_read(i915, WD_IIR(TRANSCODER_WD_0)); > + > + for_each_intel_encoder(&i915->drm, encoder) { > + > + if (encoder->type != INTEL_OUTPUT_WD) > + continue; > + > + intel_wd = enc_to_intel_wd(encoder); > + if (!intel_wd->wd_crtc) { > + drm_err(&i915->drm, "NO CRTC attached with > WD\n"); > + goto clear_iir; > + } > + } > + > + if (iir_value & WD_FRAME_COMPLETE_INT) > + return; > + > +clear_iir: > + intel_de_write(i915, WD_IIR(TRANSCODER_WD_0), iir_value); } > diff --git a/drivers/gpu/drm/i915/display/intel_wd.h > b/drivers/gpu/drm/i915/display/intel_wd.h > new file mode 100644 > index 000000000000..0fcd1a746593 > --- /dev/null > +++ b/drivers/gpu/drm/i915/display/intel_wd.h > @@ -0,0 +1,48 @@ > +/* SPDX-License-Identifier: MIT*/ > +/* > + * Copyright © 2022 Intel Corporation > + */ > + > +#ifndef _INTEL_WD_H > +#define _INTEL_WD_H > + > +#include <drm/drm_crtc.h> > + > +#include "intel_display_types.h" > + > +#define I915_MAX_WD_TANSCODERS 2 > + > +struct intel_wd { > + struct intel_encoder base; > + struct drm_writeback_connector wb_conn; > + struct intel_crtc *wd_crtc; > + intel_wakeref_t io_wakeref[I915_MAX_WD_TANSCODERS]; > + enum transcoder trans; > + struct i915_vma *vma; > + unsigned long flags; > + struct drm_writeback_job *job; > + int triggered_cap_mode; > + int frame_num; > + bool stream_cap; > + bool start_capture; > + int slicing_strategy; > +}; > + > +static inline struct intel_wd *enc_to_intel_wd(struct intel_encoder > +*encoder) { > + return container_of(&encoder->base, struct intel_wd, base.base); } > + > +static inline struct intel_wd *wb_conn_to_intel_wd(struct > +drm_writeback_connector *wb_conn) { > + return container_of(wb_conn, struct intel_wd, wb_conn); } > + > +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder > +trans); void intel_wd_enable_capture(struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state); void > +intel_wd_handle_isr(struct drm_i915_private *dev_priv); void > +intel_wd_set_vblank_event(struct intel_atomic_state *state, struct > intel_crtc *crtc, > + struct intel_crtc_state *crtc_state); struct > drm_writeback_job > +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd); > +#endif/* _INTEL_WD_H */ > diff --git a/drivers/gpu/drm/i915/i915_drv.h > b/drivers/gpu/drm/i915/i915_drv.h index 55794b87a6c1..503a21c77d14 > 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -34,6 +34,7 @@ > > #include <linux/pm_qos.h> > > +#include <drm/drm_writeback.h> > #include <drm/ttm/ttm_device.h> > > #include "display/intel_display.h" > diff --git a/drivers/gpu/drm/i915/i915_irq.c > b/drivers/gpu/drm/i915/i915_irq.c index 86a42d9e8041..ee0255d9eb64 > 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -42,6 +42,7 @@ > #include "display/intel_hotplug.h" > #include "display/intel_lpe_audio.h" > #include "display/intel_psr.h" > +#include "display/intel_wd.h" > > #include "gt/intel_breadcrumbs.h" > #include "gt/intel_gt.h" > @@ -2342,6 +2343,11 @@ gen8_de_misc_irq_handler(struct > drm_i915_private *dev_priv, u32 iir) > found = true; > } > > + if (iir & GEN8_DE_MISC_WD0) { > + intel_wd_handle_isr(dev_priv); > + found = true; > + } > + > if (iir & GEN8_DE_EDP_PSR) { > struct intel_encoder *encoder; > u32 psr_iir; > @@ -3767,7 +3773,7 @@ static void gen8_de_irq_postinstall(struct > drm_i915_private *dev_priv) > u32 de_pipe_enables; > u32 de_port_masked = gen8_de_port_aux_mask(dev_priv); > u32 de_port_enables; > - u32 de_misc_masked = GEN8_DE_EDP_PSR; > + u32 de_misc_masked = GEN8_DE_EDP_PSR | GEN8_DE_MISC_WD0; > u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | > BIT(TRANSCODER_C) | BIT(TRANSCODER_D); > enum pipe pipe; > diff --git a/drivers/gpu/drm/i915/i915_pci.c > b/drivers/gpu/drm/i915/i915_pci.c index 19fc00bcd7b9..d6eb63aefc47 > 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -868,7 +868,8 @@ static const struct intel_device_info jsl_info = { > .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | > BIT(PIPE_D), \ > .__runtime.cpu_transcoder_mask = BIT(TRANSCODER_A) | > BIT(TRANSCODER_B) | \ > BIT(TRANSCODER_C) | BIT(TRANSCODER_D) | \ > - BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1), \ > + BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1) | \ > + BIT(TRANSCODER_WD_0), \ > .display.pipe_offsets = { \ > [TRANSCODER_A] = PIPE_A_OFFSET, \ > [TRANSCODER_B] = PIPE_B_OFFSET, \ > @@ -876,6 +877,8 @@ static const struct intel_device_info jsl_info = { > [TRANSCODER_D] = PIPE_D_OFFSET, \ > [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ > [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ > + [TRANSCODER_WD_0] = PIPE_WD0_OFFSET, \ > + [TRANSCODER_WD_1] = PIPE_WD1_OFFSET, \ > }, \ > .display.trans_offsets = { \ > [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ @@ -884,6 > +887,8 @@ static const struct intel_device_info jsl_info = { > [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ > [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ > [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ > + [TRANSCODER_WD_0] = TRANSCODER_WD0_OFFSET, \ > + [TRANSCODER_WD_1] = TRANSCODER_WD1_OFFSET, \ > }, \ > TGL_CURSOR_OFFSETS, \ > .has_global_mocs = 1, \ > -- > 2.25.1 Thanks and Regards, Arun R Murthy --------------------
Hi Arun, > > From: Suraj Kandpal <suraj.kandpal@intel.com> > > > > Adding support for writeback transcoder to start capturing frames > > using interrupt mechanism > > > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> > > --- > > drivers/gpu/drm/i915/Makefile | 1 + > > drivers/gpu/drm/i915/display/intel_acpi.c | 1 + > > drivers/gpu/drm/i915/display/intel_crtc.c | 6 + > > .../drm/i915/display/intel_crtc_state_dump.c | 1 + > > drivers/gpu/drm/i915/display/intel_ddi.c | 6 + > > drivers/gpu/drm/i915/display/intel_display.c | 68 +- > > drivers/gpu/drm/i915/display/intel_display.h | 5 + > > .../drm/i915/display/intel_display_debugfs.c | 13 +- > > .../drm/i915/display/intel_display_types.h | 11 +- > > drivers/gpu/drm/i915/display/intel_dpll.c | 6 + > > .../drm/i915/display/intel_modeset_setup.c | 103 ++- > > .../drm/i915/display/intel_modeset_verify.c | 17 +- > > drivers/gpu/drm/i915/display/intel_opregion.c | 3 + > > drivers/gpu/drm/i915/display/intel_wd.c | 695 ++++++++++++++++++ > > drivers/gpu/drm/i915/display/intel_wd.h | 48 ++ > > drivers/gpu/drm/i915/i915_drv.h | 1 + > > drivers/gpu/drm/i915/i915_irq.c | 8 +- > > drivers/gpu/drm/i915/i915_pci.c | 7 +- > > 18 files changed, 951 insertions(+), 49 deletions(-) create mode > > 100644 drivers/gpu/drm/i915/display/intel_wd.c > > create mode 100644 drivers/gpu/drm/i915/display/intel_wd.h > > > > diff --git a/drivers/gpu/drm/i915/Makefile > > b/drivers/gpu/drm/i915/Makefile index a26edcdadc21..f34db43cf58d > > 100644 > > --- a/drivers/gpu/drm/i915/Makefile > > +++ b/drivers/gpu/drm/i915/Makefile > > @@ -304,6 +304,7 @@ i915-y += \ > > display/intel_tv.o \ > > display/intel_vdsc.o \ > > display/intel_vrr.o \ > > + display/intel_wd.o \ > > display/vlv_dsi.o \ > > display/vlv_dsi_pll.o > > > > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c > > b/drivers/gpu/drm/i915/display/intel_acpi.c > > index e78430001f07..ae08db164f73 100644 > > --- a/drivers/gpu/drm/i915/display/intel_acpi.c > > +++ b/drivers/gpu/drm/i915/display/intel_acpi.c > > @@ -247,6 +247,7 @@ static u32 acpi_display_type(struct > > intel_connector > > *connector) > > case DRM_MODE_CONNECTOR_LVDS: > > case DRM_MODE_CONNECTOR_eDP: > > case DRM_MODE_CONNECTOR_DSI: > > + case DRM_MODE_CONNECTOR_WRITEBACK: > > display_type = ACPI_DISPLAY_TYPE_INTERNAL_DIGITAL; > > break; > > case DRM_MODE_CONNECTOR_Unknown: > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c > > b/drivers/gpu/drm/i915/display/intel_crtc.c > > index 6792a9056f46..66d552758720 100644 > > --- a/drivers/gpu/drm/i915/display/intel_crtc.c > > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c > > @@ -491,6 +491,9 @@ void intel_pipe_update_start(struct > > intel_crtc_state > > *new_crtc_state) > > if (new_crtc_state->do_async_flip) > > return; > > > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > > + return; > > + > > if (intel_crtc_needs_vblank_work(new_crtc_state)) > > intel_crtc_vblank_work_init(new_crtc_state); > > > > @@ -638,6 +641,9 @@ void intel_pipe_update_end(struct > intel_crtc_state > > *new_crtc_state) > > if (new_crtc_state->do_async_flip) > > return; > > > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > > + return; > > + > > trace_intel_pipe_update_end(crtc, end_vbl_count, scanline_end); > > > > /* > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > index e9212f69c360..8435065f3b7d 100644 > > --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > @@ -71,6 +71,7 @@ static const char * const output_type_str[] = { > > OUTPUT_TYPE(DSI), > > OUTPUT_TYPE(DDI), > > OUTPUT_TYPE(DP_MST), > > + OUTPUT_TYPE(WD), > > }; > > > > #undef OUTPUT_TYPE > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > index 643832d55c28..ea8e07a957ab 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -1953,6 +1953,12 @@ void > > intel_ddi_sanitize_encoder_pll_mapping(struct intel_encoder *encoder) > > */ > > if (encoder->type == INTEL_OUTPUT_DP_MST) > > return; > > + /* > > + * WD transcoder is a virtual encoder hence sanization > > + * is not required for it > > + */ > > + if (encoder->type == INTEL_OUTPUT_WD) > > + return; > > > > if (!encoder->base.crtc && intel_encoder_is_dp(encoder)) { > > u8 pipe_mask; > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > b/drivers/gpu/drm/i915/display/intel_display.c > > index 2d0018ae34b1..15b2b7a6a110 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -115,6 +115,7 @@ > > #include "intel_sprite.h" > > #include "intel_tc.h" > > #include "intel_vga.h" > > +#include "intel_wd.h" > > #include "i9xx_plane.h" > > #include "skl_scaler.h" > > #include "skl_universal_plane.h" > > @@ -1511,6 +1512,10 @@ static void > > intel_encoders_update_prepare(struct > > intel_atomic_state *state) > > continue; > > > > intel_connector = to_intel_connector(connector); > > + /* intel_connector instance is not created for WD > transcoder > > */ > > + if (!intel_connector) > > + continue; > > + > > encoder = > > intel_connector_primary_encoder(intel_connector); > > if (!encoder->update_prepare) > > continue; > > @@ -1540,6 +1545,10 @@ static void > > intel_encoders_update_complete(struct intel_atomic_state *state) > > continue; > > > > intel_connector = to_intel_connector(connector); > > + /* intel_connector instance is not created for WD > transcoder > > */ > > + if (!intel_connector) > > + continue; > > + > > encoder = > > intel_connector_primary_encoder(intel_connector); > > if (!encoder->update_complete) > > continue; > > @@ -1550,6 +1559,37 @@ static void > > intel_encoders_update_complete(struct intel_atomic_state *state) > > } > > } > > > > +static void intel_queue_writeback_job(struct intel_atomic_state > > +*state) { > > + struct drm_connector_state *new_conn_state; > > + struct drm_connector *connector; > > + struct drm_writeback_connector *wb_conn; > > + int i; > > + > > + for_each_new_connector_in_state(&state->base, connector, > > new_conn_state, > > + i) { > > + if (!new_conn_state->writeback_job) > > + continue; > > + > > + wb_conn = drm_connector_to_writeback(connector); > > + drm_writeback_queue_job(wb_conn, new_conn_state); > > + } > > +} > > + > > +static void intel_enable_writeback_capture(struct intel_atomic_state > > +*state,struct intel_crtc_state *crtc_state) { > > + struct drm_connector_state *new_conn_state; > > + struct drm_connector *connector; > > + int i; > > + > > + for_each_new_connector_in_state(&state->base, connector, > > new_conn_state, > > + i) { > > + if (connector->connector_type != > > DRM_MODE_CONNECTOR_WRITEBACK) > > + continue; > > + intel_wd_enable_capture(crtc_state, new_conn_state); > > + } > > +} > > + > > static void intel_encoders_pre_pll_enable(struct intel_atomic_state > *state, > > struct intel_crtc *crtc) > > { > > @@ -1650,8 +1690,12 @@ static void intel_encoders_post_disable(struct > > intel_atomic_state *state, > > int i; > > > > for_each_old_connector_in_state(&state->base, conn, > old_conn_state, > > i) { > > - struct intel_encoder *encoder = > > - to_intel_encoder(old_conn_state->best_encoder); > > + struct intel_encoder *encoder; > > + > > + if (conn->connector_type == > > DRM_MODE_CONNECTOR_WRITEBACK) > > + continue; > > + > > + encoder = to_intel_encoder(old_conn_state- > >best_encoder); > > > > if (old_conn_state->crtc != &crtc->base) > > continue; > > @@ -1928,7 +1972,8 @@ static void hsw_crtc_enable(struct > > intel_atomic_state *state, > > bdw_set_pipemisc(new_crtc_state); > > > > if (!intel_crtc_is_bigjoiner_slave(new_crtc_state) && > > - !transcoder_is_dsi(cpu_transcoder)) > > + !transcoder_is_dsi(cpu_transcoder) && > > + !transcoder_is_wd(cpu_transcoder)) > > hsw_configure_cpu_transcoder(new_crtc_state); > > > > crtc->active = true; > > @@ -7528,6 +7573,11 @@ static void intel_atomic_commit_tail(struct > > intel_atomic_state *state) > > } > > } > > > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > > + if ((new_crtc_state->output_types & > > BIT(INTEL_OUTPUT_WD))) > > + intel_wd_set_vblank_event(state, crtc, > > new_crtc_state); > > + } > > + > > intel_encoders_update_prepare(state); > > > > intel_dbuf_pre_plane_update(state); > > @@ -7538,6 +7588,14 @@ static void intel_atomic_commit_tail(struct > > intel_atomic_state *state) > > intel_crtc_enable_flip_done(state, crtc); > > } > > > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > > + if ((new_crtc_state->output_types & > > BIT(INTEL_OUTPUT_WD))) > > + { > > + intel_queue_writeback_job(state); > > + intel_enable_writeback_capture(state, > > new_crtc_state); > > + } > > + } > > + > > /* Now enable the clocks, plane, pipe, and connectors that we set > > up. */ > > dev_priv->display.funcs.display->commit_modeset_enables(state); > > > > @@ -7892,6 +7950,10 @@ static void intel_setup_outputs(struct > > drm_i915_private *dev_priv) > > if (!HAS_DISPLAY(dev_priv)) > > return; > > > > + /* Initializing WD transcoder */ > > + if (DISPLAY_VER(dev_priv) >= 12) > > + intel_wd_init(dev_priv, TRANSCODER_WD_0); > > + > > if (IS_DG2(dev_priv)) { > > intel_ddi_init(dev_priv, PORT_A); > > intel_ddi_init(dev_priv, PORT_B); > > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > > b/drivers/gpu/drm/i915/display/intel_display.h > > index 102bf7d47ccc..1ee5e8600809 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.h > > +++ b/drivers/gpu/drm/i915/display/intel_display.h > > @@ -158,6 +158,11 @@ static inline bool transcoder_is_dsi(enum > > transcoder transcoder) > > return transcoder == TRANSCODER_DSI_A || transcoder == > > TRANSCODER_DSI_C; } > > > > +static inline bool transcoder_is_wd(enum transcoder transcoder) { > > + return transcoder == TRANSCODER_WD_0 || transcoder == > > TRANSCODER_WD_1; > > +} > > + > > /* > > * Global legacy plane identifier. Valid only for primary/sprite > > * planes on pre-g4x, and only for primary planes on g4x-bdw. > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > index fe40e2a226d6..3ec11c937dbc 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > @@ -550,7 +550,7 @@ static void intel_hdmi_info(struct seq_file *m, > > static void intel_connector_info(struct seq_file *m, > > struct drm_connector *connector) { > > - struct intel_connector *intel_connector = > > to_intel_connector(connector); > > + struct intel_connector *intel_connector; > > const struct drm_connector_state *conn_state = connector->state; > > struct intel_encoder *encoder = > > to_intel_encoder(conn_state->best_encoder); > > @@ -573,6 +573,8 @@ static void intel_connector_info(struct seq_file > *m, > > if (!encoder) > > return; > > > > + intel_connector = to_intel_connector(connector); > > + > > switch (connector->connector_type) { > > case DRM_MODE_CONNECTOR_DisplayPort: > > case DRM_MODE_CONNECTOR_eDP: > > @@ -590,12 +592,15 @@ static void intel_connector_info(struct seq_file > *m, > > break; > > } > > > > - seq_puts(m, "\tHDCP version: "); > > - intel_hdcp_info(m, intel_connector); > > + if (intel_connector) { > > + seq_puts(m, "\tHDCP version: "); > > + intel_hdcp_info(m, intel_connector); > > + } > > > > seq_printf(m, "\tmax bpc: %u\n", connector->display_info.bpc); > > > > - intel_panel_info(m, intel_connector); > > + if (intel_connector) > > + intel_panel_info(m, intel_connector); > > > > seq_printf(m, "\tmodes:\n"); > > list_for_each_entry(mode, &connector->modes, head) diff --git > > a/drivers/gpu/drm/i915/display/intel_display_types.h > > b/drivers/gpu/drm/i915/display/intel_display_types.h > > index 8eacb9133fce..7931dbacaba7 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > @@ -44,6 +44,7 @@ > > #include <drm/drm_vblank.h> > > #include <drm/drm_vblank_work.h> > > #include <drm/i915_mei_hdcp_interface.h> > > +#include <drm/drm_writeback.h> > > #include <media/cec-notifier.h> > > > > #include "i915_vma.h" > > @@ -1371,6 +1372,11 @@ struct intel_crtc { > > bool cpu_fifo_underrun_disabled; > > bool pch_fifo_underrun_disabled; > > > > + struct { > > + struct drm_pending_vblank_event *e; > > + atomic_t work_busy; > > + wait_queue_head_t wd_wait; > > + } wd; > > /* per-pipe watermark state */ > > struct { > > /* watermarks currently being used */ @@ -1498,7 +1504,6 > @@ struct > > cxsr_latency { #define to_intel_atomic_state(x) container_of(x, > > struct intel_atomic_state, base) #define to_intel_crtc(x) > > container_of(x, struct intel_crtc, base) #define > > to_intel_crtc_state(x) container_of(x, struct intel_crtc_state, uapi) > > -#define to_intel_wb_connector(x) container_of(x, struct > > intel_wb_connector, base) #define to_intel_encoder(x) container_of(x, > > struct intel_encoder, base) #define to_intel_framebuffer(x) > > container_of(x, struct intel_framebuffer, base) #define > > to_intel_plane(x) container_of(x, struct intel_plane, base) @@ -2077,8 > +2082,8 @@ intel_connector_list_iter_next(struct drm_connector_list_iter > *iter) > > struct drm_connector *connector; > > bool flag = true; > > /* > > - * Skipping connector that are Writeback connector as they will > > - * not be embedded in intel connector > > + * An intel_connector entity is not created for a writeback > > + * connector hence decoupling. > > */ > > while (flag) { > > connector = drm_connector_list_iter_next(iter); > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c > > b/drivers/gpu/drm/i915/display/intel_dpll.c > > index 52f2fe1735da..411f3366b9de 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dpll.c > > +++ b/drivers/gpu/drm/i915/display/intel_dpll.c > > @@ -940,6 +940,9 @@ static int hsw_crtc_compute_clock(struct > > intel_atomic_state *state, > > intel_get_crtc_new_encoder(state, crtc_state); > > int ret; > > > > + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) > > + return 0; > > + > > if (DISPLAY_VER(dev_priv) < 11 && > > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > > return 0; > > @@ -968,6 +971,9 @@ static int hsw_crtc_get_shared_dpll(struct > > intel_atomic_state *state, > > struct intel_encoder *encoder = > > intel_get_crtc_new_encoder(state, crtc_state); > > > > + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) > > + return 0; > > + > > if (DISPLAY_VER(dev_priv) < 11 && > > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > > return 0; > > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > index e1a90331c230..15792a5dd04c 100644 > > --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > @@ -24,6 +24,7 @@ > > #include "intel_pch_display.h" > > #include "intel_pm.h" > > #include "skl_watermark.h" > > +#include "intel_wd.h" > > > > static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, > > struct drm_modeset_acquire_ctx > > *ctx) @@ -111,17 +112,17 @@ static void > > intel_crtc_disable_noatomic(struct > > intel_crtc *crtc, > > > > static void intel_modeset_update_connector_atomic_state(struct > > drm_i915_private *i915) { > > - struct intel_connector *connector; > > + struct drm_connector *connector; > > struct drm_connector_list_iter conn_iter; > > > > drm_connector_list_iter_begin(&i915->drm, &conn_iter); > > - for_each_intel_connector_iter(connector, &conn_iter) { > > - struct drm_connector_state *conn_state = connector- > > >base.state; > > + drm_for_each_connector_iter(connector, &conn_iter) { > > + struct drm_connector_state *conn_state = connector- > >state; > > struct intel_encoder *encoder = > > - to_intel_encoder(connector->base.encoder); > > + to_intel_encoder(connector->encoder); > > > > if (conn_state->crtc) > > - drm_connector_put(&connector->base); > > + drm_connector_put(connector); > > > > if (encoder) { > > struct intel_crtc *crtc = > > @@ -133,7 +134,7 @@ static void > > intel_modeset_update_connector_atomic_state(struct drm_i915_private > > conn_state->crtc = &crtc->base; > > conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) > / 3; > > > > - drm_connector_get(&connector->base); > > + drm_connector_get(connector); > > } else { > > conn_state->best_encoder = NULL; > > conn_state->crtc = NULL; > > @@ -433,6 +434,8 @@ static void > intel_modeset_readout_hw_state(struct > > drm_i915_private *i915) > > struct intel_crtc *crtc; > > struct intel_encoder *encoder; > > struct intel_connector *connector; > > + struct drm_connector *_connector; > > + struct drm_encoder *_encoder; > > Usually in i915 for struct intel_connector *intel_connector, struct > drm_connector *connector is used or Struct intel_connector *connector, > struct drm_connector *conn is used. > Using this _connector or _encoder will be a totally new notation. Can > anyone of the above use used? > So this combo was chosen because of Jani's comment on one of the previous Versions of the patches he commented "These are the combos generally in use, from most preferred to least preferred: struct drm_encoder *_encoder; struct intel_encoder *encoder struct drm_encoder *encoder; struct intel_encoder *intel_encoder struct drm_encoder *drm_encoder struct intel_encoder *encoder" so would you still like to change the notation if so to which one of the above > > struct drm_connector_list_iter conn_iter; > > u8 active_pipes = 0; > > > > @@ -509,38 +512,70 @@ static void > > intel_modeset_readout_hw_state(struct drm_i915_private *i915) > > intel_dpll_readout_hw_state(i915); > > > > drm_connector_list_iter_begin(&i915->drm, &conn_iter); > > - for_each_intel_connector_iter(connector, &conn_iter) { > > - if (connector->get_hw_state(connector)) { > > - struct intel_crtc_state *crtc_state; > > - struct intel_crtc *crtc; > > - > > - connector->base.dpms = DRM_MODE_DPMS_ON; > > - > > - encoder = intel_attached_encoder(connector); > > - connector->base.encoder = &encoder->base; > > - > > - crtc = to_intel_crtc(encoder->base.crtc); > > - crtc_state = crtc ? to_intel_crtc_state(crtc- > > >base.state) : NULL; > > - > > - if (crtc_state && crtc_state->hw.active) { > > - /* > > - * This has to be done during hardware > > readout > > - * because anything calling .crtc_disable may > > - * rely on the connector_mask being > > accurate. > > - */ > > - crtc_state->uapi.connector_mask |= > > - drm_connector_mask(&connector- > > >base); > > - crtc_state->uapi.encoder_mask |= > > - drm_encoder_mask(&encoder- > > >base); > > + drm_for_each_connector_iter(_connector, &conn_iter) { > > + struct intel_crtc_state *crtc_state; > > + struct intel_crtc *crtc; > > + struct drm_writeback_connector *wb_conn; > > + struct intel_wd *intel_wd; > > + > > + connector = to_intel_connector(_connector); > > + if (!connector) { > > + wb_conn = > > drm_connector_to_writeback(_connector); > > + intel_wd = wb_conn_to_intel_wd(wb_conn); > > + _encoder = &intel_wd->base.base; > > + _connector->encoder = _encoder; > > + encoder = to_intel_encoder(_encoder); > > + pipe = 0; > > + if (encoder->get_hw_state(encoder, &pipe)) { > > + _connector->dpms = > > DRM_MODE_DPMS_ON; > > + crtc = to_intel_crtc(_encoder->crtc); > > + crtc_state = crtc ? to_intel_crtc_state(crtc- > > >base.state) : NULL; > > + > > + if (crtc_state && crtc_state->hw.active) { > > + /* > > + * This has to be done during > > hardware readout > > + * because anything calling > > .crtc_disable may > > + * rely on the connector_mask being > > accurate. > > + */ > > + crtc_state->uapi.connector_mask |= > > + > > drm_connector_mask(&connector->base); > > + crtc_state->uapi.encoder_mask |= > > + > > drm_encoder_mask(&encoder->base); > > + } > > + } else { > > + _connector->dpms = > > DRM_MODE_DPMS_OFF; > > + _connector->encoder = NULL; > > } > > } else { > > - connector->base.dpms = DRM_MODE_DPMS_OFF; > > - connector->base.encoder = NULL; > > + if (connector->get_hw_state(connector)) { > > + connector->base.dpms = > > DRM_MODE_DPMS_OFF; > > + encoder = > > intel_attached_encoder(connector); > > + connector->base.encoder = &encoder->base; > > + > > + crtc = to_intel_crtc(encoder->base.crtc); > > + crtc_state = crtc ? to_intel_crtc_state(crtc- > > >base.state) : NULL; > > + > > + if (crtc_state && crtc_state->hw.active) { > > + /* > > + * This has to be done during > > hardware readout > > + * because anything calling > > .crtc_disable may > > + * rely on the connector_mask being > > accurate. > > + */ > > + crtc_state->uapi.connector_mask |= > > + > > drm_connector_mask(&connector->base); > > + crtc_state->uapi.encoder_mask |= > > + > > drm_encoder_mask(&encoder->base); > > + } > > + } else { > > + connector->base.dpms = > > DRM_MODE_DPMS_OFF; > > + connector->base.encoder = NULL; > > + } > > } > > drm_dbg_kms(&i915->drm, > > - "[CONNECTOR:%d:%s] hw state readout: %s\n", > > - connector->base.base.id, connector->base.name, > > - str_enabled_disabled(connector->base.encoder)); > > + "[CONNECTOR:%d:%s] hw state readout: > > %s\n", > > + _connector->base.id, _connector->name, > > + str_enabled_disabled(_connector- > > >encoder)); > > + > > } > > drm_connector_list_iter_end(&conn_iter); > > > > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > b/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > index 0fdcf2e6d57f..80e9840e2e5f 100644 > > --- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > +++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > @@ -25,11 +25,16 @@ > > static void intel_connector_verify_state(struct intel_crtc_state > *crtc_state, > > struct drm_connector_state > > *conn_state) { > > - struct intel_connector *connector = to_intel_connector(conn_state- > > >connector); > > - struct drm_i915_private *i915 = to_i915(connector->base.dev); > > + struct drm_connector *_connector = conn_state->connector; > > + struct intel_connector *connector; > > + struct drm_i915_private *i915 = to_i915(_connector->dev); > > > > drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s]\n", > > - connector->base.base.id, connector->base.name); > > + _connector->base.id, _connector->name); > > + > > + connector = to_intel_connector(_connector); > > + if (!connector) > > + return; > > > > if (connector->get_hw_state(connector)) { > > struct intel_encoder *encoder = > > intel_attached_encoder(connector); > > @@ -119,6 +124,9 @@ verify_encoder_state(struct drm_i915_private > > *dev_priv, struct intel_atomic_stat > > encoder->base.base.id, > > encoder->base.name); > > > > + if (encoder->type == INTEL_OUTPUT_WD) > > + continue; > > + > > for_each_oldnew_connector_in_state(&state->base, > > connector, old_conn_state, > > new_conn_state, i) { > > if (old_conn_state->best_encoder == &encoder- > > >base) @@ -177,6 +185,9 @@ verify_crtc_state(struct intel_crtc *crtc, > > > > intel_crtc_get_pipe_config(pipe_config); > > > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > > + return; > > + > > /* we keep both pipes enabled on 830 */ > > if (IS_I830(dev_priv) && pipe_config->hw.active) > > pipe_config->hw.active = new_crtc_state->hw.active; diff -- > git > > a/drivers/gpu/drm/i915/display/intel_opregion.c > > b/drivers/gpu/drm/i915/display/intel_opregion.c > > index caa07ef34f21..1bcb4b58d992 100644 > > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > > @@ -374,6 +374,9 @@ int intel_opregion_notify_encoder(struct > > intel_encoder *intel_encoder, > > if (ret) > > return ret; > > > > + if (intel_encoder->type == INTEL_OUTPUT_WD) > > + return 0; > > + > > if (intel_encoder->type == INTEL_OUTPUT_DSI) > > port = 0; > > else > > diff --git a/drivers/gpu/drm/i915/display/intel_wd.c > > b/drivers/gpu/drm/i915/display/intel_wd.c > > new file mode 100644 > > index 000000000000..e3e990f4f26f > > --- /dev/null > > +++ b/drivers/gpu/drm/i915/display/intel_wd.c > > @@ -0,0 +1,695 @@ > > +// SPDX-License-Identifier: MIT > > +/* > > + * Copyright © 2022 Intel Corporation */ > > + > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_fourcc.h> > > + > > +#include "intel_atomic.h" > > +#include "intel_connector.h" > > +#include "intel_wd.h" > > +#include "intel_fb_pin.h" > > +#include "intel_de.h" > > + > > +enum { > > + WD_CAPTURE_4_PIX, > > + WD_CAPTURE_2_PIX, > > +} wd_capture_format; > > + > > +struct drm_writeback_job > > +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd) { > > + struct drm_writeback_job *job; > > + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); > > + struct drm_writeback_connector *wb_conn = > > + &intel_wd->wb_conn; > > + unsigned long flags; > > + > > + spin_lock_irqsave(&wb_conn->job_lock, flags); > > + job = list_first_entry_or_null(&wb_conn->job_queue, > > + struct drm_writeback_job, > > + list_entry); > > + spin_unlock_irqrestore(&wb_conn->job_lock, flags); > > + if (job == NULL) { > > + drm_dbg_kms(&i915->drm, "job queue is empty\n"); > > + return NULL; > > + } > > + > > + return job; > > +} > > + > > +static const u32 wd_fmts[] = { > > + DRM_FORMAT_YUV444, > > + DRM_FORMAT_XYUV8888, > > + DRM_FORMAT_XBGR8888, > > + DRM_FORMAT_XRGB8888, > > + DRM_FORMAT_Y410, > > + DRM_FORMAT_YUV422, > > + DRM_FORMAT_XBGR2101010, > > + DRM_FORMAT_RGB565, > > +}; > > + > > +static int intel_wd_get_format(int pixel_format) { > > + int wd_format = -EINVAL; > > + > > + switch (pixel_format) { > > + case DRM_FORMAT_XBGR8888: > > + case DRM_FORMAT_XRGB8888: > > + case DRM_FORMAT_XBGR2101010: > > + case DRM_FORMAT_XYUV8888: > > + case DRM_FORMAT_YUV444: > > + wd_format = WD_CAPTURE_4_PIX; > > + break; > > + case DRM_FORMAT_YUV422: > > + case DRM_FORMAT_RGB565: > > + wd_format = WD_CAPTURE_2_PIX; > > + break; > > + default: > > + DRM_ERROR("unsupported pixel format %x!\n", > > + pixel_format); > > + } > > + > > + return wd_format; > > +} > > + > > +static int intel_wd_verify_pix_format(int format) { > > + const struct drm_format_info *info = drm_format_info(format); > > + int pix_format = info->format; > > + int i = 0; > > + > > + for (i = 0; i < ARRAY_SIZE(wd_fmts); i++) > > + if (pix_format == wd_fmts[i]) > > + return 0; > > + > > + return true; > > +} > > + > > +static u32 intel_wd_get_stride(const struct intel_crtc_state *crtc_state, > > + int format) > > +{ > > + const struct drm_format_info *info = drm_format_info(format); > > + int wd_format; > > + int hactive, pixel_size; > > + > > + wd_format = intel_wd_get_format(info->format); > > + > > + switch (wd_format) { > > + case WD_CAPTURE_4_PIX: > > + pixel_size = 4; > > + break; > > + case WD_CAPTURE_2_PIX: > > + pixel_size = 2; > > + break; > > + default: > > + pixel_size = 1; > > + break; > > + } > > + > > + hactive = crtc_state->hw.adjusted_mode.crtc_hdisplay; > > + > > + return DIV_ROUND_UP(hactive * pixel_size, 64); } > > + > > +static int intel_wd_pin_fb(struct intel_wd *intel_wd, > > + struct drm_framebuffer *fb) > > +{ > > + const struct i915_gtt_view view = { > > + .type = I915_GTT_VIEW_NORMAL, > > + }; > > + struct i915_vma *vma; > > + > > + vma = intel_pin_and_fence_fb_obj(fb, false, &view, false, > > + &intel_wd->flags); > > + > > + if (IS_ERR(vma)) > > + return PTR_ERR(vma); > > + > > + intel_wd->vma = vma; > > + return 0; > > +} > > + > > +static void intel_configure_slicing_strategy(struct drm_i915_private > *i915, > > + struct intel_wd *intel_wd, > > + u32 *tmp) > > +{ > > + *tmp &= ~WD_STRAT_MASK; > > + if (intel_wd->slicing_strategy == 1) > > + *tmp |= WD_SLICING_STRAT_1_1; > > + else if (intel_wd->slicing_strategy == 2) > > + *tmp |= WD_SLICING_STRAT_2_1; > > + else if (intel_wd->slicing_strategy == 3) > > + *tmp |= WD_SLICING_STRAT_4_1; > > + else if (intel_wd->slicing_strategy == 4) > > + *tmp |= WD_SLICING_STRAT_8_1; > > + > > + intel_de_write(i915, WD_STREAMCAP_CTL(intel_wd->trans), > > + *tmp); > > +} > > + > > +static enum drm_mode_status > > +intel_wd_mode_valid(struct drm_connector *connector, > > + struct drm_display_mode *mode) > > +{ > > + return MODE_OK; > > +} > > + > > +static int intel_wd_get_modes(struct drm_connector *connector) { > > + return 0; > > +} > > + > > +static void intel_wd_get_config(struct intel_encoder *encoder, > > + struct intel_crtc_state *pipe_config) { > > + struct intel_crtc *intel_crtc = > > + to_intel_crtc(pipe_config->uapi.crtc); > > + > > + if (intel_crtc) { > > + memcpy(pipe_config, intel_crtc->config, > > + sizeof(*pipe_config)); > > + pipe_config->output_types |= BIT(INTEL_OUTPUT_WD); > > + } > > +} > > + > > +static int intel_wd_compute_config(struct intel_encoder *encoder, > > + struct intel_crtc_state *pipe_config, > > + struct drm_connector_state *conn_state) { > > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > > + struct drm_writeback_job *job; > > + > > + job = intel_get_writeback_job_from_queue(intel_wd); > > + if (job || conn_state->writeback_job) { > > + /* > > + * Saving reference of pipe/crtc for later use if > > + * writeback job is present > > + */ > > + intel_wd->wd_crtc = to_intel_crtc(pipe_config->uapi.crtc); > > + return 0; > > + } > > + > > + return 0; > > +} > > + > > +static void intel_wd_get_power_domains(struct intel_encoder *encoder, > > + struct intel_crtc_state *crtc_state) { > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > > + intel_wakeref_t wakeref; > > + > > + wakeref = intel_display_power_get(i915, encoder->power_domain); > > + > > + intel_wd->io_wakeref[0] = wakeref; > > +} > > + > > +static bool intel_wd_get_hw_state(struct intel_encoder *encoder, > > + enum pipe *pipe) > > +{ > > + bool ret = false; > > + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > > + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; > > + intel_wakeref_t wakeref; > > + u32 tmp; > > + > > + if (wd_crtc) > > + return false; > > + > > + wakeref = intel_display_power_get_if_enabled(dev_priv, > > + encoder->power_domain); > > + > > + if (!wakeref) > > + goto out; > > + > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > + ret = tmp & WD_TRANS_ACTIVE; > > + if (ret) { > > + *pipe = wd_crtc->pipe; > > + return true; > > + } > > + > > +out: > > + intel_display_power_put(dev_priv, encoder->power_domain, > > wakeref); > > + return false; > > +} > > + > > +static int intel_wd_encoder_atomic_check(struct drm_encoder *encoder, > > + struct drm_crtc_state *crtc_st, > > + struct drm_connector_state > > *conn_st) { > > + /* Check for the format and buffers and property validity */ > > + struct drm_framebuffer *fb; > > + struct drm_writeback_job *job = conn_st->writeback_job; > > + struct drm_i915_private *i915 = to_i915(encoder->dev); > > + const struct drm_display_mode *mode = &crtc_st->mode; > > + int ret; > > + > > + if (!job) { > > + drm_dbg_kms(&i915->drm, "No writeback job created > > returning\n"); > > + return -EINVAL; > > + } > > + > > + fb = job->fb; > > + if (!fb) { > > + drm_dbg_kms(&i915->drm, "Invalid framebuffer\n"); > > + return -EINVAL; > > + } > > + > > + if (fb->width != mode->hdisplay || fb->height != mode->vdisplay) { > > + drm_dbg_kms(&i915->drm, "Invalid framebuffer size > > %ux%u\n", > > + fb->width, fb->height); > > + return -EINVAL; > > + } > > + > > + ret = intel_wd_verify_pix_format(fb->format->format); > > + if (ret) { > > + drm_dbg_kms(&i915->drm, "Unsupported framebuffer > > format %08x\n", > > + fb->format->format); > > + return -EINVAL; > > + } > > + > > + return 0; > > +} > > + > > + > > +static const struct drm_encoder_helper_funcs wd_encoder_helper_funcs > > += > > { > > + .atomic_check = intel_wd_encoder_atomic_check, }; > > + > > +static void intel_wd_connector_destroy(struct drm_connector > > +*connector) { > > + drm_connector_cleanup(connector); > > +} > > + > > +static enum drm_connector_status > > +intel_wd_connector_detect(struct drm_connector *connector, bool > > +force) { > > + return connector_status_connected; > > +} > > + > > +static const struct drm_connector_funcs wb_connector_funcs = { > > + .detect = intel_wd_connector_detect, > > + .reset = drm_atomic_helper_connector_reset, > > + .destroy = intel_wd_connector_destroy, > > + .fill_modes = drm_helper_probe_single_connector_modes, > > + .atomic_destroy_state = > > drm_atomic_helper_connector_destroy_state, > > + .atomic_duplicate_state = > > drm_atomic_helper_connector_duplicate_state, > > +}; > > + > > +static const struct drm_connector_helper_funcs > > wb_connector_helper_funcs = { > > + .get_modes = intel_wd_get_modes, > > + .mode_valid = intel_wd_mode_valid, > > +}; > > + > > +static const struct drm_encoder_funcs drm_writeback_encoder_funcs = { > > + .destroy = drm_encoder_cleanup, > > +}; > > + > > +static bool intel_fastset_dis(struct intel_encoder *encoder, > > + struct intel_crtc_state *pipe_config) { > > + return false; > > +} > > + > > +static void intel_wd_connector_init(struct intel_wd *intel_wd) { > > + drm_atomic_helper_connector_reset(&intel_wd->wb_conn.base); > > +} > > + > > +static void intel_wd_disable_capture(struct intel_wd *intel_wd) { > > + struct drm_i915_private *dev_priv = to_i915(intel_wd- > > >base.base.dev); > > + u32 tmp; > > + > > + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), 0xFF); > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > + tmp &= WD_TRANS_DISABLE; > > + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); > > + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd- > > >trans)); > > +} > > + > > +void intel_wd_init(struct drm_i915_private *i915, enum transcoder > > +trans) { > > + struct intel_wd *intel_wd; > > + struct intel_encoder *encoder; > > + struct drm_writeback_connector *wb_conn; > > + int n_formats = ARRAY_SIZE(wd_fmts); > > + struct drm_encoder *drm_enc; > > + int err, ret; > > + > > + intel_wd = kzalloc(sizeof(*intel_wd), GFP_KERNEL); > > + if (!intel_wd) > > + return; > > + > > + intel_wd_connector_init(intel_wd); > > + encoder = &intel_wd->base; > > + drm_enc = &encoder->base; > > + wb_conn = &intel_wd->wb_conn; > > + intel_wd->trans = trans; > > + intel_wd->triggered_cap_mode = 1; > > + intel_wd->frame_num = 1; > > + intel_wd->slicing_strategy = 1; > > + encoder->get_config = intel_wd_get_config; > > + encoder->compute_config = intel_wd_compute_config; > > + encoder->get_hw_state = intel_wd_get_hw_state; > > + encoder->type = INTEL_OUTPUT_WD; > > + encoder->cloneable = 0; > > + encoder->pipe_mask = ~0; > > + encoder->power_domain = POWER_DOMAIN_TRANSCODER_B; > > + encoder->get_power_domains = intel_wd_get_power_domains; > > + encoder->initial_fastset_check = intel_fastset_dis; > > + > > + drm_encoder_helper_add(drm_enc, > > + &wd_encoder_helper_funcs); > > + > > + drm_enc->possible_crtcs = ~0; > > + ret = drm_encoder_init(&i915->drm, drm_enc, > > + &drm_writeback_encoder_funcs, > > + DRM_MODE_ENCODER_VIRTUAL, NULL); > > + > > + if (ret) { > > + drm_dbg_kms(&i915->drm, > > + "Writeback drm_encoder init Failed: %d\n", > > + ret); > > + goto cleanup; > > + } > > + > > + err = drm_writeback_connector_init_with_encoder(&i915->drm, > > + wb_conn, drm_enc, &wb_connector_funcs, > > + wd_fmts, n_formats); > > + > > + if (err != 0) { > > + drm_dbg_kms(&i915->drm, > > + "drm_writeback_connector_init: Failed: %d\n", > > + err); > > + goto cleanup; > > + } > > + > > + wb_conn->base.encoder = drm_enc; > > + drm_connector_helper_add(&wb_conn->base, > > &wb_connector_helper_funcs); > > + wb_conn->base.status = connector_status_connected; > > + return; > > + > > +cleanup: > > + kfree(intel_wd); > > + return; > > +} > > + > > +static void intel_wd_writeback_complete(struct intel_wd *intel_wd, > > + struct drm_writeback_job *job, > > + int status) > > +{ > > + struct drm_writeback_connector *wb_conn = > > + &intel_wd->wb_conn; > > + drm_writeback_signal_completion(wb_conn, status); } > > + > > +static int intel_wd_setup_transcoder(struct intel_wd *intel_wd, > > + struct intel_crtc_state *pipe_config, > > + struct drm_connector_state *conn_state, > > + struct drm_writeback_job *job) { > > + struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc); > > + enum pipe pipe = intel_crtc->pipe; > > + struct drm_framebuffer *fb; > > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > > + struct drm_gem_object *wd_fb_obj; > > + int ret; > > + u32 stride, tmp; > > + u16 hactive, vactive; > > + > > + fb = job->fb; > > + wd_fb_obj = fb->obj[0]; > > + if (!wd_fb_obj) { > > + drm_dbg_kms(&dev_priv->drm, "No framebuffer gem object > > created\n"); > > + return -EINVAL; > > + } > > + > > + ret = intel_wd_pin_fb(intel_wd, fb); > > + drm_WARN_ON(&dev_priv->drm, ret != 0); > > + /* Write stride and surface registers in that particular order */ > > + stride = intel_wd_get_stride(pipe_config, fb->format->format); > > + > > + tmp = intel_de_read(dev_priv, WD_STRIDE(intel_wd->trans)); > > + tmp &= ~WD_STRIDE_MASK; > > + tmp |= (stride << WD_STRIDE_SHIFT); > > + > > + intel_de_write(dev_priv, WD_STRIDE(intel_wd->trans), tmp); > > + > > + tmp = intel_de_read(dev_priv, WD_SURF(intel_wd->trans)); > > + > > + intel_de_write(dev_priv, WD_SURF(intel_wd->trans), > > + i915_ggtt_offset(intel_wd->vma)); > > + > > + tmp = intel_de_read_fw(dev_priv, WD_IIR(intel_wd->trans)); > > + intel_de_write_fw(dev_priv, WD_IIR(intel_wd->trans), tmp); > > + > > + tmp = ~(WD_GTT_FAULT_INT | WD_WRITE_COMPLETE_INT | > > WD_FRAME_COMPLETE_INT | > > + WD_VBLANK_INT | WD_OVERRUN_INT | > > WD_CAPTURING_INT); > > + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), tmp); > > + > > + if (intel_wd->stream_cap) { > > + tmp = intel_de_read(dev_priv, > > + WD_STREAMCAP_CTL(intel_wd->trans)); > > + tmp |= WD_STREAM_CAP_MODE_EN; > > + intel_configure_slicing_strategy(dev_priv, intel_wd, &tmp); > > + } > > + > > + hactive = pipe_config->uapi.mode.hdisplay; > > + vactive = pipe_config->uapi.mode.vdisplay; > > + tmp = intel_de_read(dev_priv, HTOTAL(intel_wd->trans)); > > + tmp = intel_de_read(dev_priv, VTOTAL(intel_wd->trans)); > > + > > + /* minimum hactive as per bspec: 64 pixels */ > > + if (hactive < 64) > > + drm_err(&dev_priv->drm, "hactive is less then 64 pixels\n"); > > + > > + intel_de_write(dev_priv, HTOTAL(intel_wd->trans), hactive - 1); > > + intel_de_write(dev_priv, VTOTAL(intel_wd->trans), vactive - 1); > > + > > + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd- > > >trans)); > > + /* select pixel format */ > > + tmp &= ~WD_PIX_FMT_MASK; > > + > > + switch (fb->format->format) { > > + default: > > + fallthrough; > > + case DRM_FORMAT_YUYV: > > + tmp |= WD_PIX_FMT_YUYV; > > + break; > > + case DRM_FORMAT_XYUV8888: > > + tmp |= WD_PIX_FMT_XYUV8888; > > + break; > > + case DRM_FORMAT_XBGR8888: > > + case DRM_FORMAT_XRGB8888: > > + tmp |= WD_PIX_FMT_XBGR8888; > > + break; > > + case DRM_FORMAT_Y410: > > + tmp |= WD_PIX_FMT_Y410; > > + break; > > + case DRM_FORMAT_YUV422: > > + tmp |= WD_PIX_FMT_YUV422; > > + break; > > + case DRM_FORMAT_XBGR2101010: > > + tmp |= WD_PIX_FMT_XBGR2101010; > > + break; > > + case DRM_FORMAT_RGB565: > > + tmp |= WD_PIX_FMT_RGB565; > > + break; > > + } > > + > > + if (intel_wd->triggered_cap_mode) > > + tmp |= WD_TRIGGERED_CAP_MODE_ENABLE; > > + > > + if (intel_wd->stream_cap) > > + tmp |= WD_CTL_POINTER_DTDH; > > + > > + /* select input pipe */ > > + tmp &= ~WD_INPUT_SELECT_MASK; > > + switch (pipe) { > > + default: > > + fallthrough; > > + case PIPE_A: > > + tmp |= WD_INPUT_PIPE_A; > > + break; > > + case PIPE_B: > > + tmp |= WD_INPUT_PIPE_B; > > + break; > > + case PIPE_C: > > + tmp |= WD_INPUT_PIPE_C; > > + break; > > + case PIPE_D: > > + tmp |= WD_INPUT_PIPE_D; > > + break; > > + } > > + > > + /* enable DDI buffer */ > > + if (!(tmp & TRANS_WD_FUNC_ENABLE)) > > + tmp |= TRANS_WD_FUNC_ENABLE; > > + > > + intel_de_write(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans), > > tmp); > > + > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > + ret = tmp & WD_TRANS_ACTIVE; > > + if (!ret) { > > + /* enable the transcoder */ > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > + tmp |= WD_TRANS_ENABLE; > > + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); > > + > > + /* wait for transcoder to be enabled */ > > + if (intel_de_wait_for_set(dev_priv, PIPECONF(intel_wd- > > >trans), > > + WD_TRANS_ACTIVE, 10)) > > + drm_err(&dev_priv->drm, "WD transcoder could not > > be enabled\n"); > > + } > > + > > + return 0; > > +} > > + > > +static int intel_wd_capture(struct intel_wd *intel_wd, > > + struct intel_crtc_state *pipe_config, > > + struct drm_connector_state *conn_state, > > + struct drm_writeback_job *job) { > > + u32 tmp; > > + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); > > + int ret = 0, status = 0; > > + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; > > + unsigned long flags; > > + > > + if (!job->out_fence) > > + drm_dbg_kms(&i915->drm, "Not able to get out_fence for > > job\n"); > > + > > + ret = intel_wd_setup_transcoder(intel_wd, pipe_config, > > + conn_state, job); > > + > > + if (ret < 0) { > > + drm_dbg_kms(&i915->drm, > > + "WD transcoder setup not completed aborting > > capture\n"); > > + return -1; > > + } > > + > > + if (!wd_crtc) { > > + drm_err(&i915->drm, "CRTC not attached\n"); > > + return -1; > > + } > > + > > + tmp = intel_de_read_fw(i915, WD_TRANS_FUNC_CTL(intel_wd- > > >trans)); > > + tmp |= START_TRIGGER_FRAME; > > + tmp &= ~WD_FRAME_NUMBER_MASK; > > + tmp |= intel_wd->frame_num; > > + intel_de_write_fw(i915, WD_TRANS_FUNC_CTL(intel_wd- > > >trans), tmp); > Why this tab space? Have not given a tab space here > > > + > > + if (!intel_de_wait_for_set(i915, WD_IIR(intel_wd->trans), > > + WD_FRAME_COMPLETE_INT, 100)){ > > + drm_dbg_kms(&i915->drm, "frame captured\n"); > > + status = 0; > > + } else { > > + drm_dbg_kms(&i915->drm, "frame not captured triggering > > stop frame\n"); > > + tmp = intel_de_read(i915, WD_TRANS_FUNC_CTL(intel_wd- > > >trans)); > > + tmp |= STOP_TRIGGER_FRAME; > > + intel_de_write(i915, WD_TRANS_FUNC_CTL(intel_wd- > >trans), > > tmp); > > + status = -1; > > + } > > + > > + intel_wd_writeback_complete(intel_wd, job, status); > > + if (wd_crtc->wd.e) { > > + spin_lock_irqsave(&i915->drm.event_lock, flags); > > + drm_dbg_kms(&i915->drm, "send %p\n", wd_crtc->wd.e); > Can this debug print be moved outside the spin_lock_irqsave.? > Causes an error to be thrown if I do as wd.e needs to be locked. > > + drm_crtc_send_vblank_event(&wd_crtc->base, > > + wd_crtc->wd.e); > > + spin_unlock_irqrestore(&i915->drm.event_lock, flags); > > + wd_crtc->wd.e = NULL; > > + } else { > > + drm_err(&i915->drm, "Event NULL! %p, %p\n", &i915->drm, > > + wd_crtc); > > + } > > + if (!intel_get_writeback_job_from_queue(intel_wd)) > > + intel_wd_disable_capture(intel_wd); > > + return 0; > > +} > > + > > +void intel_wd_enable_capture(struct intel_crtc_state *pipe_config, > > + struct drm_connector_state *conn_state) { > > + struct drm_i915_private *i915 = > > + to_i915(conn_state->connector->dev); > > + struct drm_writeback_connector *wb_conn = > > + drm_connector_to_writeback(conn_state->connector); > > + struct intel_wd *intel_wd = wb_conn_to_intel_wd(wb_conn); > > + struct drm_writeback_job *job; > > + > > + job = intel_get_writeback_job_from_queue(intel_wd); > > + if (!job) { > > + drm_dbg_kms(&i915->drm, > > + "job queue is empty not capturing any frame\n"); > > + return; > > + } > > + > > + intel_wd_capture(intel_wd, pipe_config, > > + conn_state, job); > > + intel_wd->frame_num += 1; > > +} > > + > > +void intel_wd_set_vblank_event(struct intel_atomic_state *state, > > +struct > > intel_crtc *intel_crtc, > > + struct intel_crtc_state *intel_crtc_state) { > > + struct drm_i915_private *i915 = to_i915(intel_crtc->base.dev); > > + struct drm_crtc_state *crtc_state = &intel_crtc_state->uapi; > > + struct intel_encoder *encoder; > > + struct intel_wd *intel_wd; > > + struct drm_connector_state *conn_state; > > + struct drm_connector *connector; > > + int i; > > + > > + for_each_intel_encoder(&i915->drm, encoder) { > > + if (encoder->type != INTEL_OUTPUT_WD) > > + continue; > > + > > + intel_wd = enc_to_intel_wd(encoder); > > + if (!intel_wd->wd_crtc) > > + return; > > + } > > + > > + if (intel_wd && intel_crtc == intel_wd->wd_crtc) { > > + for_each_new_connector_in_state(&state->base, connector, > > conn_state, > > + i) { > > + if (!conn_state->writeback_job) > > + continue; > > + > > + intel_crtc->wd.e = crtc_state->event; > > + crtc_state->event = NULL; > > + } > > + } > > +} > > + > > +void intel_wd_handle_isr(struct drm_i915_private *i915) { > > + u32 iir_value = 0; > > + struct intel_encoder *encoder; > > + struct intel_wd *intel_wd; > > + > > + iir_value = intel_de_read(i915, WD_IIR(TRANSCODER_WD_0)); > > + > > + for_each_intel_encoder(&i915->drm, encoder) { > > + > > + if (encoder->type != INTEL_OUTPUT_WD) > > + continue; > > + > > + intel_wd = enc_to_intel_wd(encoder); > > + if (!intel_wd->wd_crtc) { > > + drm_err(&i915->drm, "NO CRTC attached with > > WD\n"); > > + goto clear_iir; > > + } > > + } > > + > > + if (iir_value & WD_FRAME_COMPLETE_INT) > > + return; > > + > > +clear_iir: > > + intel_de_write(i915, WD_IIR(TRANSCODER_WD_0), iir_value); } > > diff --git a/drivers/gpu/drm/i915/display/intel_wd.h > > b/drivers/gpu/drm/i915/display/intel_wd.h > > new file mode 100644 > > index 000000000000..0fcd1a746593 > > --- /dev/null > > +++ b/drivers/gpu/drm/i915/display/intel_wd.h > > @@ -0,0 +1,48 @@ > > +/* SPDX-License-Identifier: MIT*/ > > +/* > > + * Copyright © 2022 Intel Corporation */ > > + > > +#ifndef _INTEL_WD_H > > +#define _INTEL_WD_H > > + > > +#include <drm/drm_crtc.h> > > + > > +#include "intel_display_types.h" > > + > > +#define I915_MAX_WD_TANSCODERS 2 > > + > > +struct intel_wd { > > + struct intel_encoder base; > > + struct drm_writeback_connector wb_conn; > > + struct intel_crtc *wd_crtc; > > + intel_wakeref_t io_wakeref[I915_MAX_WD_TANSCODERS]; > > + enum transcoder trans; > > + struct i915_vma *vma; > > + unsigned long flags; > > + struct drm_writeback_job *job; > > + int triggered_cap_mode; > > + int frame_num; > > + bool stream_cap; > > + bool start_capture; > > + int slicing_strategy; > > +}; > > + > > +static inline struct intel_wd *enc_to_intel_wd(struct intel_encoder > > +*encoder) { > > + return container_of(&encoder->base, struct intel_wd, base.base); } > > + > > +static inline struct intel_wd *wb_conn_to_intel_wd(struct > > +drm_writeback_connector *wb_conn) { > > + return container_of(wb_conn, struct intel_wd, wb_conn); } > > + > > +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder > > +trans); void intel_wd_enable_capture(struct intel_crtc_state > *pipe_config, > > + struct drm_connector_state *conn_state); void > > +intel_wd_handle_isr(struct drm_i915_private *dev_priv); void > > +intel_wd_set_vblank_event(struct intel_atomic_state *state, struct > > intel_crtc *crtc, > > + struct intel_crtc_state *crtc_state); struct > > drm_writeback_job > > +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd); > > +#endif/* _INTEL_WD_H */ > > diff --git a/drivers/gpu/drm/i915/i915_drv.h > > b/drivers/gpu/drm/i915/i915_drv.h index 55794b87a6c1..503a21c77d14 > > 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -34,6 +34,7 @@ > > > > #include <linux/pm_qos.h> > > > > +#include <drm/drm_writeback.h> > > #include <drm/ttm/ttm_device.h> > > > > #include "display/intel_display.h" > > diff --git a/drivers/gpu/drm/i915/i915_irq.c > > b/drivers/gpu/drm/i915/i915_irq.c index 86a42d9e8041..ee0255d9eb64 > > 100644 > > --- a/drivers/gpu/drm/i915/i915_irq.c > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > @@ -42,6 +42,7 @@ > > #include "display/intel_hotplug.h" > > #include "display/intel_lpe_audio.h" > > #include "display/intel_psr.h" > > +#include "display/intel_wd.h" > > > > #include "gt/intel_breadcrumbs.h" > > #include "gt/intel_gt.h" > > @@ -2342,6 +2343,11 @@ gen8_de_misc_irq_handler(struct > > drm_i915_private *dev_priv, u32 iir) > > found = true; > > } > > > > + if (iir & GEN8_DE_MISC_WD0) { > > + intel_wd_handle_isr(dev_priv); > > + found = true; > > + } > > + > > if (iir & GEN8_DE_EDP_PSR) { > > struct intel_encoder *encoder; > > u32 psr_iir; > > @@ -3767,7 +3773,7 @@ static void gen8_de_irq_postinstall(struct > > drm_i915_private *dev_priv) > > u32 de_pipe_enables; > > u32 de_port_masked = gen8_de_port_aux_mask(dev_priv); > > u32 de_port_enables; > > - u32 de_misc_masked = GEN8_DE_EDP_PSR; > > + u32 de_misc_masked = GEN8_DE_EDP_PSR | GEN8_DE_MISC_WD0; > > u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | > > BIT(TRANSCODER_C) | BIT(TRANSCODER_D); > > enum pipe pipe; > > diff --git a/drivers/gpu/drm/i915/i915_pci.c > > b/drivers/gpu/drm/i915/i915_pci.c index 19fc00bcd7b9..d6eb63aefc47 > > 100644 > > --- a/drivers/gpu/drm/i915/i915_pci.c > > +++ b/drivers/gpu/drm/i915/i915_pci.c > > @@ -868,7 +868,8 @@ static const struct intel_device_info jsl_info = { > > .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | > > BIT(PIPE_D), \ > > .__runtime.cpu_transcoder_mask = BIT(TRANSCODER_A) | > > BIT(TRANSCODER_B) | \ > > BIT(TRANSCODER_C) | BIT(TRANSCODER_D) | \ > > - BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1), \ > > + BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1) | \ > > + BIT(TRANSCODER_WD_0), \ > > .display.pipe_offsets = { \ > > [TRANSCODER_A] = PIPE_A_OFFSET, \ > > [TRANSCODER_B] = PIPE_B_OFFSET, \ > > @@ -876,6 +877,8 @@ static const struct intel_device_info jsl_info = { > > [TRANSCODER_D] = PIPE_D_OFFSET, \ > > [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ > > [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ > > + [TRANSCODER_WD_0] = PIPE_WD0_OFFSET, \ > > + [TRANSCODER_WD_1] = PIPE_WD1_OFFSET, \ > > }, \ > > .display.trans_offsets = { \ > > [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ @@ -884,6 > > +887,8 @@ static const struct intel_device_info jsl_info = { > > [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ > > [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ > > [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ > > + [TRANSCODER_WD_0] = TRANSCODER_WD0_OFFSET, \ > > + [TRANSCODER_WD_1] = TRANSCODER_WD1_OFFSET, \ > > }, \ > > TGL_CURSOR_OFFSETS, \ > > .has_global_mocs = 1, \ > > -- > > 2.25.1 > > Thanks and Regards, > Arun R Murthy > --------------------
-----Original Message----- > From: Kandpal, Suraj <suraj.kandpal@intel.com> > Sent: Monday, September 19, 2022 11:58 AM > To: Murthy, Arun R <arun.r.murthy@intel.com>; intel- > gfx@lists.freedesktop.org > Cc: Shankar, Uma <uma.shankar@intel.com>; Nautiyal, Ankit K > <ankit.k.nautiyal@intel.com>; Borah, Chaitanya Kumar > <chaitanya.kumar.borah@intel.com>; Nikula, Jani <jani.nikula@intel.com> > Subject: RE: [PATCH v4 3/3] drm/i915: Enabling WD Transcoder > > Hi Arun, > > > > From: Suraj Kandpal <suraj.kandpal@intel.com> > > > > > > Adding support for writeback transcoder to start capturing frames > > > using interrupt mechanism > > > > > > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com> Thanks and Regards, Arun R Murthy --------------------- > > > --- > > > drivers/gpu/drm/i915/Makefile | 1 + > > > drivers/gpu/drm/i915/display/intel_acpi.c | 1 + > > > drivers/gpu/drm/i915/display/intel_crtc.c | 6 + > > > .../drm/i915/display/intel_crtc_state_dump.c | 1 + > > > drivers/gpu/drm/i915/display/intel_ddi.c | 6 + > > > drivers/gpu/drm/i915/display/intel_display.c | 68 +- > > > drivers/gpu/drm/i915/display/intel_display.h | 5 + > > > .../drm/i915/display/intel_display_debugfs.c | 13 +- > > > .../drm/i915/display/intel_display_types.h | 11 +- > > > drivers/gpu/drm/i915/display/intel_dpll.c | 6 + > > > .../drm/i915/display/intel_modeset_setup.c | 103 ++- > > > .../drm/i915/display/intel_modeset_verify.c | 17 +- > > > drivers/gpu/drm/i915/display/intel_opregion.c | 3 + > > > drivers/gpu/drm/i915/display/intel_wd.c | 695 ++++++++++++++++++ > > > drivers/gpu/drm/i915/display/intel_wd.h | 48 ++ > > > drivers/gpu/drm/i915/i915_drv.h | 1 + > > > drivers/gpu/drm/i915/i915_irq.c | 8 +- > > > drivers/gpu/drm/i915/i915_pci.c | 7 +- > > > 18 files changed, 951 insertions(+), 49 deletions(-) create mode > > > 100644 drivers/gpu/drm/i915/display/intel_wd.c > > > create mode 100644 drivers/gpu/drm/i915/display/intel_wd.h > > > > > > diff --git a/drivers/gpu/drm/i915/Makefile > > > b/drivers/gpu/drm/i915/Makefile index a26edcdadc21..f34db43cf58d > > > 100644 > > > --- a/drivers/gpu/drm/i915/Makefile > > > +++ b/drivers/gpu/drm/i915/Makefile > > > @@ -304,6 +304,7 @@ i915-y += \ > > > display/intel_tv.o \ > > > display/intel_vdsc.o \ > > > display/intel_vrr.o \ > > > + display/intel_wd.o \ > > > display/vlv_dsi.o \ > > > display/vlv_dsi_pll.o > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c > > > b/drivers/gpu/drm/i915/display/intel_acpi.c > > > index e78430001f07..ae08db164f73 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_acpi.c > > > +++ b/drivers/gpu/drm/i915/display/intel_acpi.c > > > @@ -247,6 +247,7 @@ static u32 acpi_display_type(struct > > > intel_connector > > > *connector) > > > case DRM_MODE_CONNECTOR_LVDS: > > > case DRM_MODE_CONNECTOR_eDP: > > > case DRM_MODE_CONNECTOR_DSI: > > > + case DRM_MODE_CONNECTOR_WRITEBACK: > > > display_type = ACPI_DISPLAY_TYPE_INTERNAL_DIGITAL; > > > break; > > > case DRM_MODE_CONNECTOR_Unknown: > > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c > > > b/drivers/gpu/drm/i915/display/intel_crtc.c > > > index 6792a9056f46..66d552758720 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_crtc.c > > > +++ b/drivers/gpu/drm/i915/display/intel_crtc.c > > > @@ -491,6 +491,9 @@ void intel_pipe_update_start(struct > > > intel_crtc_state > > > *new_crtc_state) > > > if (new_crtc_state->do_async_flip) > > > return; > > > > > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > > > + return; > > > + > > > if (intel_crtc_needs_vblank_work(new_crtc_state)) > > > intel_crtc_vblank_work_init(new_crtc_state); > > > > > > @@ -638,6 +641,9 @@ void intel_pipe_update_end(struct > > intel_crtc_state > > > *new_crtc_state) > > > if (new_crtc_state->do_async_flip) > > > return; > > > > > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > > > + return; > > > + > > > trace_intel_pipe_update_end(crtc, end_vbl_count, scanline_end); > > > > > > /* > > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > > b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > > index e9212f69c360..8435065f3b7d 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > > +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c > > > @@ -71,6 +71,7 @@ static const char * const output_type_str[] = { > > > OUTPUT_TYPE(DSI), > > > OUTPUT_TYPE(DDI), > > > OUTPUT_TYPE(DP_MST), > > > + OUTPUT_TYPE(WD), > > > }; > > > > > > #undef OUTPUT_TYPE > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > > index 643832d55c28..ea8e07a957ab 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > > @@ -1953,6 +1953,12 @@ void > > > intel_ddi_sanitize_encoder_pll_mapping(struct intel_encoder *encoder) > > > */ > > > if (encoder->type == INTEL_OUTPUT_DP_MST) > > > return; > > > + /* > > > + * WD transcoder is a virtual encoder hence sanization > > > + * is not required for it > > > + */ > > > + if (encoder->type == INTEL_OUTPUT_WD) > > > + return; > > > > > > if (!encoder->base.crtc && intel_encoder_is_dp(encoder)) { > > > u8 pipe_mask; > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > > b/drivers/gpu/drm/i915/display/intel_display.c > > > index 2d0018ae34b1..15b2b7a6a110 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -115,6 +115,7 @@ > > > #include "intel_sprite.h" > > > #include "intel_tc.h" > > > #include "intel_vga.h" > > > +#include "intel_wd.h" > > > #include "i9xx_plane.h" > > > #include "skl_scaler.h" > > > #include "skl_universal_plane.h" > > > @@ -1511,6 +1512,10 @@ static void > > > intel_encoders_update_prepare(struct > > > intel_atomic_state *state) > > > continue; > > > > > > intel_connector = to_intel_connector(connector); > > > + /* intel_connector instance is not created for WD > > transcoder > > > */ > > > + if (!intel_connector) > > > + continue; > > > + > > > encoder = > > > intel_connector_primary_encoder(intel_connector); > > > if (!encoder->update_prepare) > > > continue; > > > @@ -1540,6 +1545,10 @@ static void > > > intel_encoders_update_complete(struct intel_atomic_state *state) > > > continue; > > > > > > intel_connector = to_intel_connector(connector); > > > + /* intel_connector instance is not created for WD > > transcoder > > > */ > > > + if (!intel_connector) > > > + continue; > > > + > > > encoder = > > > intel_connector_primary_encoder(intel_connector); > > > if (!encoder->update_complete) > > > continue; > > > @@ -1550,6 +1559,37 @@ static void > > > intel_encoders_update_complete(struct intel_atomic_state *state) > > > } > > > } > > > > > > +static void intel_queue_writeback_job(struct intel_atomic_state > > > +*state) { > > > + struct drm_connector_state *new_conn_state; > > > + struct drm_connector *connector; > > > + struct drm_writeback_connector *wb_conn; > > > + int i; > > > + > > > + for_each_new_connector_in_state(&state->base, connector, > > > new_conn_state, > > > + i) { > > > + if (!new_conn_state->writeback_job) > > > + continue; > > > + > > > + wb_conn = drm_connector_to_writeback(connector); > > > + drm_writeback_queue_job(wb_conn, new_conn_state); > > > + } > > > +} > > > + > > > +static void intel_enable_writeback_capture(struct intel_atomic_state > > > +*state,struct intel_crtc_state *crtc_state) { > > > + struct drm_connector_state *new_conn_state; > > > + struct drm_connector *connector; > > > + int i; > > > + > > > + for_each_new_connector_in_state(&state->base, connector, > > > new_conn_state, > > > + i) { > > > + if (connector->connector_type != > > > DRM_MODE_CONNECTOR_WRITEBACK) > > > + continue; > > > + intel_wd_enable_capture(crtc_state, new_conn_state); > > > + } > > > +} > > > + > > > static void intel_encoders_pre_pll_enable(struct intel_atomic_state > > *state, > > > struct intel_crtc *crtc) > > > { > > > @@ -1650,8 +1690,12 @@ static void intel_encoders_post_disable(struct > > > intel_atomic_state *state, > > > int i; > > > > > > for_each_old_connector_in_state(&state->base, conn, > > old_conn_state, > > > i) { > > > - struct intel_encoder *encoder = > > > - to_intel_encoder(old_conn_state->best_encoder); > > > + struct intel_encoder *encoder; > > > + > > > + if (conn->connector_type == > > > DRM_MODE_CONNECTOR_WRITEBACK) > > > + continue; > > > + > > > + encoder = to_intel_encoder(old_conn_state- > > >best_encoder); > > > > > > if (old_conn_state->crtc != &crtc->base) > > > continue; > > > @@ -1928,7 +1972,8 @@ static void hsw_crtc_enable(struct > > > intel_atomic_state *state, > > > bdw_set_pipemisc(new_crtc_state); > > > > > > if (!intel_crtc_is_bigjoiner_slave(new_crtc_state) && > > > - !transcoder_is_dsi(cpu_transcoder)) > > > + !transcoder_is_dsi(cpu_transcoder) && > > > + !transcoder_is_wd(cpu_transcoder)) > > > hsw_configure_cpu_transcoder(new_crtc_state); > > > > > > crtc->active = true; > > > @@ -7528,6 +7573,11 @@ static void intel_atomic_commit_tail(struct > > > intel_atomic_state *state) > > > } > > > } > > > > > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > > > + if ((new_crtc_state->output_types & > > > BIT(INTEL_OUTPUT_WD))) > > > + intel_wd_set_vblank_event(state, crtc, > > > new_crtc_state); > > > + } > > > + > > > intel_encoders_update_prepare(state); > > > > > > intel_dbuf_pre_plane_update(state); > > > @@ -7538,6 +7588,14 @@ static void intel_atomic_commit_tail(struct > > > intel_atomic_state *state) > > > intel_crtc_enable_flip_done(state, crtc); > > > } > > > > > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > > > + if ((new_crtc_state->output_types & > > > BIT(INTEL_OUTPUT_WD))) > > > + { > > > + intel_queue_writeback_job(state); > > > + intel_enable_writeback_capture(state, > > > new_crtc_state); > > > + } > > > + } > > > + > > > /* Now enable the clocks, plane, pipe, and connectors that we set > > > up. */ > > > dev_priv->display.funcs.display->commit_modeset_enables(state); > > > > > > @@ -7892,6 +7950,10 @@ static void intel_setup_outputs(struct > > > drm_i915_private *dev_priv) > > > if (!HAS_DISPLAY(dev_priv)) > > > return; > > > > > > + /* Initializing WD transcoder */ > > > + if (DISPLAY_VER(dev_priv) >= 12) > > > + intel_wd_init(dev_priv, TRANSCODER_WD_0); > > > + > > > if (IS_DG2(dev_priv)) { > > > intel_ddi_init(dev_priv, PORT_A); > > > intel_ddi_init(dev_priv, PORT_B); > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.h > > > b/drivers/gpu/drm/i915/display/intel_display.h > > > index 102bf7d47ccc..1ee5e8600809 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.h > > > +++ b/drivers/gpu/drm/i915/display/intel_display.h > > > @@ -158,6 +158,11 @@ static inline bool transcoder_is_dsi(enum > > > transcoder transcoder) > > > return transcoder == TRANSCODER_DSI_A || transcoder == > > > TRANSCODER_DSI_C; } > > > > > > +static inline bool transcoder_is_wd(enum transcoder transcoder) { > > > + return transcoder == TRANSCODER_WD_0 || transcoder == > > > TRANSCODER_WD_1; > > > +} > > > + > > > /* > > > * Global legacy plane identifier. Valid only for primary/sprite > > > * planes on pre-g4x, and only for primary planes on g4x-bdw. > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > index fe40e2a226d6..3ec11c937dbc 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > @@ -550,7 +550,7 @@ static void intel_hdmi_info(struct seq_file *m, > > > static void intel_connector_info(struct seq_file *m, > > > struct drm_connector *connector) { > > > - struct intel_connector *intel_connector = > > > to_intel_connector(connector); > > > + struct intel_connector *intel_connector; > > > const struct drm_connector_state *conn_state = connector->state; > > > struct intel_encoder *encoder = > > > to_intel_encoder(conn_state->best_encoder); > > > @@ -573,6 +573,8 @@ static void intel_connector_info(struct seq_file > > *m, > > > if (!encoder) > > > return; > > > > > > + intel_connector = to_intel_connector(connector); > > > + > > > switch (connector->connector_type) { > > > case DRM_MODE_CONNECTOR_DisplayPort: > > > case DRM_MODE_CONNECTOR_eDP: > > > @@ -590,12 +592,15 @@ static void intel_connector_info(struct seq_file > > *m, > > > break; > > > } > > > > > > - seq_puts(m, "\tHDCP version: "); > > > - intel_hdcp_info(m, intel_connector); > > > + if (intel_connector) { > > > + seq_puts(m, "\tHDCP version: "); > > > + intel_hdcp_info(m, intel_connector); > > > + } > > > > > > seq_printf(m, "\tmax bpc: %u\n", connector->display_info.bpc); > > > > > > - intel_panel_info(m, intel_connector); > > > + if (intel_connector) > > > + intel_panel_info(m, intel_connector); > > > > > > seq_printf(m, "\tmodes:\n"); > > > list_for_each_entry(mode, &connector->modes, head) diff --git > > > a/drivers/gpu/drm/i915/display/intel_display_types.h > > > b/drivers/gpu/drm/i915/display/intel_display_types.h > > > index 8eacb9133fce..7931dbacaba7 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > > @@ -44,6 +44,7 @@ > > > #include <drm/drm_vblank.h> > > > #include <drm/drm_vblank_work.h> > > > #include <drm/i915_mei_hdcp_interface.h> > > > +#include <drm/drm_writeback.h> > > > #include <media/cec-notifier.h> > > > > > > #include "i915_vma.h" > > > @@ -1371,6 +1372,11 @@ struct intel_crtc { > > > bool cpu_fifo_underrun_disabled; > > > bool pch_fifo_underrun_disabled; > > > > > > + struct { > > > + struct drm_pending_vblank_event *e; > > > + atomic_t work_busy; > > > + wait_queue_head_t wd_wait; > > > + } wd; > > > /* per-pipe watermark state */ > > > struct { > > > /* watermarks currently being used */ @@ -1498,7 +1504,6 > > @@ struct > > > cxsr_latency { #define to_intel_atomic_state(x) container_of(x, > > > struct intel_atomic_state, base) #define to_intel_crtc(x) > > > container_of(x, struct intel_crtc, base) #define > > > to_intel_crtc_state(x) container_of(x, struct intel_crtc_state, uapi) > > > -#define to_intel_wb_connector(x) container_of(x, struct > > > intel_wb_connector, base) #define to_intel_encoder(x) container_of(x, > > > struct intel_encoder, base) #define to_intel_framebuffer(x) > > > container_of(x, struct intel_framebuffer, base) #define > > > to_intel_plane(x) container_of(x, struct intel_plane, base) @@ -2077,8 > > +2082,8 @@ intel_connector_list_iter_next(struct drm_connector_list_iter > > *iter) > > > struct drm_connector *connector; > > > bool flag = true; > > > /* > > > - * Skipping connector that are Writeback connector as they will > > > - * not be embedded in intel connector > > > + * An intel_connector entity is not created for a writeback > > > + * connector hence decoupling. > > > */ > > > while (flag) { > > > connector = drm_connector_list_iter_next(iter); > > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c > > > b/drivers/gpu/drm/i915/display/intel_dpll.c > > > index 52f2fe1735da..411f3366b9de 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dpll.c > > > +++ b/drivers/gpu/drm/i915/display/intel_dpll.c > > > @@ -940,6 +940,9 @@ static int hsw_crtc_compute_clock(struct > > > intel_atomic_state *state, > > > intel_get_crtc_new_encoder(state, crtc_state); > > > int ret; > > > > > > + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) > > > + return 0; > > > + > > > if (DISPLAY_VER(dev_priv) < 11 && > > > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > > > return 0; > > > @@ -968,6 +971,9 @@ static int hsw_crtc_get_shared_dpll(struct > > > intel_atomic_state *state, > > > struct intel_encoder *encoder = > > > intel_get_crtc_new_encoder(state, crtc_state); > > > > > > + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) > > > + return 0; > > > + > > > if (DISPLAY_VER(dev_priv) < 11 && > > > intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) > > > return 0; > > > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > > b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > > index e1a90331c230..15792a5dd04c 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > > +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > > @@ -24,6 +24,7 @@ > > > #include "intel_pch_display.h" > > > #include "intel_pm.h" > > > #include "skl_watermark.h" > > > +#include "intel_wd.h" > > > > > > static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, > > > struct drm_modeset_acquire_ctx > > > *ctx) @@ -111,17 +112,17 @@ static void > > > intel_crtc_disable_noatomic(struct > > > intel_crtc *crtc, > > > > > > static void intel_modeset_update_connector_atomic_state(struct > > > drm_i915_private *i915) { > > > - struct intel_connector *connector; > > > + struct drm_connector *connector; > > > struct drm_connector_list_iter conn_iter; > > > > > > drm_connector_list_iter_begin(&i915->drm, &conn_iter); > > > - for_each_intel_connector_iter(connector, &conn_iter) { > > > - struct drm_connector_state *conn_state = connector- > > > >base.state; > > > + drm_for_each_connector_iter(connector, &conn_iter) { > > > + struct drm_connector_state *conn_state = connector- > > >state; > > > struct intel_encoder *encoder = > > > - to_intel_encoder(connector->base.encoder); > > > + to_intel_encoder(connector->encoder); > > > > > > if (conn_state->crtc) > > > - drm_connector_put(&connector->base); > > > + drm_connector_put(connector); > > > > > > if (encoder) { > > > struct intel_crtc *crtc = > > > @@ -133,7 +134,7 @@ static void > > > intel_modeset_update_connector_atomic_state(struct drm_i915_private > > > conn_state->crtc = &crtc->base; > > > conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) > > / 3; > > > > > > - drm_connector_get(&connector->base); > > > + drm_connector_get(connector); > > > } else { > > > conn_state->best_encoder = NULL; > > > conn_state->crtc = NULL; > > > @@ -433,6 +434,8 @@ static void > > intel_modeset_readout_hw_state(struct > > > drm_i915_private *i915) > > > struct intel_crtc *crtc; > > > struct intel_encoder *encoder; > > > struct intel_connector *connector; > > > + struct drm_connector *_connector; > > > + struct drm_encoder *_encoder; > > > > Usually in i915 for struct intel_connector *intel_connector, struct > > drm_connector *connector is used or Struct intel_connector *connector, > > struct drm_connector *conn is used. > > Using this _connector or _encoder will be a totally new notation. Can > > anyone of the above use used? > > > So this combo was chosen because of Jani's comment on one of the previous > Versions of the patches he commented > "These are the combos generally in use, from most preferred to least > preferred: > > struct drm_encoder *_encoder; > struct intel_encoder *encoder > > struct drm_encoder *encoder; > struct intel_encoder *intel_encoder > > struct drm_encoder *drm_encoder > struct intel_encoder *encoder" > > so would you still like to change the notation if so to which one of the above > > > > struct drm_connector_list_iter conn_iter; > > > u8 active_pipes = 0; > > > > > > @@ -509,38 +512,70 @@ static void > > > intel_modeset_readout_hw_state(struct drm_i915_private *i915) > > > intel_dpll_readout_hw_state(i915); > > > > > > drm_connector_list_iter_begin(&i915->drm, &conn_iter); > > > - for_each_intel_connector_iter(connector, &conn_iter) { > > > - if (connector->get_hw_state(connector)) { > > > - struct intel_crtc_state *crtc_state; > > > - struct intel_crtc *crtc; > > > - > > > - connector->base.dpms = DRM_MODE_DPMS_ON; > > > - > > > - encoder = intel_attached_encoder(connector); > > > - connector->base.encoder = &encoder->base; > > > - > > > - crtc = to_intel_crtc(encoder->base.crtc); > > > - crtc_state = crtc ? to_intel_crtc_state(crtc- > > > >base.state) : NULL; > > > - > > > - if (crtc_state && crtc_state->hw.active) { > > > - /* > > > - * This has to be done during hardware > > > readout > > > - * because anything calling .crtc_disable may > > > - * rely on the connector_mask being > > > accurate. > > > - */ > > > - crtc_state->uapi.connector_mask |= > > > - drm_connector_mask(&connector- > > > >base); > > > - crtc_state->uapi.encoder_mask |= > > > - drm_encoder_mask(&encoder- > > > >base); > > > + drm_for_each_connector_iter(_connector, &conn_iter) { > > > + struct intel_crtc_state *crtc_state; > > > + struct intel_crtc *crtc; > > > + struct drm_writeback_connector *wb_conn; > > > + struct intel_wd *intel_wd; > > > + > > > + connector = to_intel_connector(_connector); > > > + if (!connector) { > > > + wb_conn = > > > drm_connector_to_writeback(_connector); > > > + intel_wd = wb_conn_to_intel_wd(wb_conn); > > > + _encoder = &intel_wd->base.base; > > > + _connector->encoder = _encoder; > > > + encoder = to_intel_encoder(_encoder); > > > + pipe = 0; > > > + if (encoder->get_hw_state(encoder, &pipe)) { > > > + _connector->dpms = > > > DRM_MODE_DPMS_ON; > > > + crtc = to_intel_crtc(_encoder->crtc); > > > + crtc_state = crtc ? to_intel_crtc_state(crtc- > > > >base.state) : NULL; > > > + > > > + if (crtc_state && crtc_state->hw.active) { > > > + /* > > > + * This has to be done during > > > hardware readout > > > + * because anything calling > > > .crtc_disable may > > > + * rely on the connector_mask being > > > accurate. > > > + */ > > > + crtc_state->uapi.connector_mask |= > > > + > > > drm_connector_mask(&connector->base); > > > + crtc_state->uapi.encoder_mask |= > > > + > > > drm_encoder_mask(&encoder->base); > > > + } > > > + } else { > > > + _connector->dpms = > > > DRM_MODE_DPMS_OFF; > > > + _connector->encoder = NULL; > > > } > > > } else { > > > - connector->base.dpms = DRM_MODE_DPMS_OFF; > > > - connector->base.encoder = NULL; > > > + if (connector->get_hw_state(connector)) { > > > + connector->base.dpms = > > > DRM_MODE_DPMS_OFF; > > > + encoder = > > > intel_attached_encoder(connector); > > > + connector->base.encoder = &encoder->base; > > > + > > > + crtc = to_intel_crtc(encoder->base.crtc); > > > + crtc_state = crtc ? to_intel_crtc_state(crtc- > > > >base.state) : NULL; > > > + > > > + if (crtc_state && crtc_state->hw.active) { > > > + /* > > > + * This has to be done during > > > hardware readout > > > + * because anything calling > > > .crtc_disable may > > > + * rely on the connector_mask being > > > accurate. > > > + */ > > > + crtc_state->uapi.connector_mask |= > > > + > > > drm_connector_mask(&connector->base); > > > + crtc_state->uapi.encoder_mask |= > > > + > > > drm_encoder_mask(&encoder->base); > > > + } > > > + } else { > > > + connector->base.dpms = > > > DRM_MODE_DPMS_OFF; > > > + connector->base.encoder = NULL; > > > + } > > > } > > > drm_dbg_kms(&i915->drm, > > > - "[CONNECTOR:%d:%s] hw state readout: %s\n", > > > - connector->base.base.id, connector->base.name, > > > - str_enabled_disabled(connector->base.encoder)); > > > + "[CONNECTOR:%d:%s] hw state readout: > > > %s\n", > > > + _connector->base.id, _connector->name, > > > + str_enabled_disabled(_connector- > > > >encoder)); > > > + > > > } > > > drm_connector_list_iter_end(&conn_iter); > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > > b/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > > index 0fdcf2e6d57f..80e9840e2e5f 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > > +++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c > > > @@ -25,11 +25,16 @@ > > > static void intel_connector_verify_state(struct intel_crtc_state > > *crtc_state, > > > struct drm_connector_state > > > *conn_state) { > > > - struct intel_connector *connector = to_intel_connector(conn_state- > > > >connector); > > > - struct drm_i915_private *i915 = to_i915(connector->base.dev); > > > + struct drm_connector *_connector = conn_state->connector; > > > + struct intel_connector *connector; > > > + struct drm_i915_private *i915 = to_i915(_connector->dev); > > > > > > drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s]\n", > > > - connector->base.base.id, connector->base.name); > > > + _connector->base.id, _connector->name); > > > + > > > + connector = to_intel_connector(_connector); > > > + if (!connector) > > > + return; > > > > > > if (connector->get_hw_state(connector)) { > > > struct intel_encoder *encoder = > > > intel_attached_encoder(connector); > > > @@ -119,6 +124,9 @@ verify_encoder_state(struct drm_i915_private > > > *dev_priv, struct intel_atomic_stat > > > encoder->base.base.id, > > > encoder->base.name); > > > > > > + if (encoder->type == INTEL_OUTPUT_WD) > > > + continue; > > > + > > > for_each_oldnew_connector_in_state(&state->base, > > > connector, old_conn_state, > > > new_conn_state, i) { > > > if (old_conn_state->best_encoder == &encoder- > > > >base) @@ -177,6 +185,9 @@ verify_crtc_state(struct intel_crtc *crtc, > > > > > > intel_crtc_get_pipe_config(pipe_config); > > > > > > + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) > > > + return; > > > + > > > /* we keep both pipes enabled on 830 */ > > > if (IS_I830(dev_priv) && pipe_config->hw.active) > > > pipe_config->hw.active = new_crtc_state->hw.active; diff -- > > git > > > a/drivers/gpu/drm/i915/display/intel_opregion.c > > > b/drivers/gpu/drm/i915/display/intel_opregion.c > > > index caa07ef34f21..1bcb4b58d992 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > > > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > > > @@ -374,6 +374,9 @@ int intel_opregion_notify_encoder(struct > > > intel_encoder *intel_encoder, > > > if (ret) > > > return ret; > > > > > > + if (intel_encoder->type == INTEL_OUTPUT_WD) > > > + return 0; > > > + > > > if (intel_encoder->type == INTEL_OUTPUT_DSI) > > > port = 0; > > > else > > > diff --git a/drivers/gpu/drm/i915/display/intel_wd.c > > > b/drivers/gpu/drm/i915/display/intel_wd.c > > > new file mode 100644 > > > index 000000000000..e3e990f4f26f > > > --- /dev/null > > > +++ b/drivers/gpu/drm/i915/display/intel_wd.c > > > @@ -0,0 +1,695 @@ > > > +// SPDX-License-Identifier: MIT > > > +/* > > > + * Copyright © 2022 Intel Corporation */ > > > + > > > +#include <drm/drm_atomic_helper.h> > > > +#include <drm/drm_fourcc.h> > > > + > > > +#include "intel_atomic.h" > > > +#include "intel_connector.h" > > > +#include "intel_wd.h" > > > +#include "intel_fb_pin.h" > > > +#include "intel_de.h" > > > + > > > +enum { > > > + WD_CAPTURE_4_PIX, > > > + WD_CAPTURE_2_PIX, > > > +} wd_capture_format; > > > + > > > +struct drm_writeback_job > > > +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd) { > > > + struct drm_writeback_job *job; > > > + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); > > > + struct drm_writeback_connector *wb_conn = > > > + &intel_wd->wb_conn; > > > + unsigned long flags; > > > + > > > + spin_lock_irqsave(&wb_conn->job_lock, flags); > > > + job = list_first_entry_or_null(&wb_conn->job_queue, > > > + struct drm_writeback_job, > > > + list_entry); > > > + spin_unlock_irqrestore(&wb_conn->job_lock, flags); > > > + if (job == NULL) { > > > + drm_dbg_kms(&i915->drm, "job queue is empty\n"); > > > + return NULL; > > > + } > > > + > > > + return job; > > > +} > > > + > > > +static const u32 wd_fmts[] = { > > > + DRM_FORMAT_YUV444, > > > + DRM_FORMAT_XYUV8888, > > > + DRM_FORMAT_XBGR8888, > > > + DRM_FORMAT_XRGB8888, > > > + DRM_FORMAT_Y410, > > > + DRM_FORMAT_YUV422, > > > + DRM_FORMAT_XBGR2101010, > > > + DRM_FORMAT_RGB565, > > > +}; > > > + > > > +static int intel_wd_get_format(int pixel_format) { > > > + int wd_format = -EINVAL; > > > + > > > + switch (pixel_format) { > > > + case DRM_FORMAT_XBGR8888: > > > + case DRM_FORMAT_XRGB8888: > > > + case DRM_FORMAT_XBGR2101010: > > > + case DRM_FORMAT_XYUV8888: > > > + case DRM_FORMAT_YUV444: > > > + wd_format = WD_CAPTURE_4_PIX; > > > + break; > > > + case DRM_FORMAT_YUV422: > > > + case DRM_FORMAT_RGB565: > > > + wd_format = WD_CAPTURE_2_PIX; > > > + break; > > > + default: > > > + DRM_ERROR("unsupported pixel format %x!\n", > > > + pixel_format); > > > + } > > > + > > > + return wd_format; > > > +} > > > + > > > +static int intel_wd_verify_pix_format(int format) { > > > + const struct drm_format_info *info = drm_format_info(format); > > > + int pix_format = info->format; > > > + int i = 0; > > > + > > > + for (i = 0; i < ARRAY_SIZE(wd_fmts); i++) > > > + if (pix_format == wd_fmts[i]) > > > + return 0; > > > + > > > + return true; > > > +} > > > + > > > +static u32 intel_wd_get_stride(const struct intel_crtc_state *crtc_state, > > > + int format) > > > +{ > > > + const struct drm_format_info *info = drm_format_info(format); > > > + int wd_format; > > > + int hactive, pixel_size; > > > + > > > + wd_format = intel_wd_get_format(info->format); > > > + > > > + switch (wd_format) { > > > + case WD_CAPTURE_4_PIX: > > > + pixel_size = 4; > > > + break; > > > + case WD_CAPTURE_2_PIX: > > > + pixel_size = 2; > > > + break; > > > + default: > > > + pixel_size = 1; > > > + break; > > > + } > > > + > > > + hactive = crtc_state->hw.adjusted_mode.crtc_hdisplay; > > > + > > > + return DIV_ROUND_UP(hactive * pixel_size, 64); } > > > + > > > +static int intel_wd_pin_fb(struct intel_wd *intel_wd, > > > + struct drm_framebuffer *fb) > > > +{ > > > + const struct i915_gtt_view view = { > > > + .type = I915_GTT_VIEW_NORMAL, > > > + }; > > > + struct i915_vma *vma; > > > + > > > + vma = intel_pin_and_fence_fb_obj(fb, false, &view, false, > > > + &intel_wd->flags); > > > + > > > + if (IS_ERR(vma)) > > > + return PTR_ERR(vma); > > > + > > > + intel_wd->vma = vma; > > > + return 0; > > > +} > > > + > > > +static void intel_configure_slicing_strategy(struct drm_i915_private > > *i915, > > > + struct intel_wd *intel_wd, > > > + u32 *tmp) > > > +{ > > > + *tmp &= ~WD_STRAT_MASK; > > > + if (intel_wd->slicing_strategy == 1) > > > + *tmp |= WD_SLICING_STRAT_1_1; > > > + else if (intel_wd->slicing_strategy == 2) > > > + *tmp |= WD_SLICING_STRAT_2_1; > > > + else if (intel_wd->slicing_strategy == 3) > > > + *tmp |= WD_SLICING_STRAT_4_1; > > > + else if (intel_wd->slicing_strategy == 4) > > > + *tmp |= WD_SLICING_STRAT_8_1; > > > + > > > + intel_de_write(i915, WD_STREAMCAP_CTL(intel_wd->trans), > > > + *tmp); > > > +} > > > + > > > +static enum drm_mode_status > > > +intel_wd_mode_valid(struct drm_connector *connector, > > > + struct drm_display_mode *mode) > > > +{ > > > + return MODE_OK; > > > +} > > > + > > > +static int intel_wd_get_modes(struct drm_connector *connector) { > > > + return 0; > > > +} > > > + > > > +static void intel_wd_get_config(struct intel_encoder *encoder, > > > + struct intel_crtc_state *pipe_config) { > > > + struct intel_crtc *intel_crtc = > > > + to_intel_crtc(pipe_config->uapi.crtc); > > > + > > > + if (intel_crtc) { > > > + memcpy(pipe_config, intel_crtc->config, > > > + sizeof(*pipe_config)); > > > + pipe_config->output_types |= BIT(INTEL_OUTPUT_WD); > > > + } > > > +} > > > + > > > +static int intel_wd_compute_config(struct intel_encoder *encoder, > > > + struct intel_crtc_state *pipe_config, > > > + struct drm_connector_state *conn_state) { > > > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > > > + struct drm_writeback_job *job; > > > + > > > + job = intel_get_writeback_job_from_queue(intel_wd); > > > + if (job || conn_state->writeback_job) { > > > + /* > > > + * Saving reference of pipe/crtc for later use if > > > + * writeback job is present > > > + */ > > > + intel_wd->wd_crtc = to_intel_crtc(pipe_config->uapi.crtc); > > > + return 0; > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +static void intel_wd_get_power_domains(struct intel_encoder *encoder, > > > + struct intel_crtc_state *crtc_state) { > > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > > > + intel_wakeref_t wakeref; > > > + > > > + wakeref = intel_display_power_get(i915, encoder->power_domain); > > > + > > > + intel_wd->io_wakeref[0] = wakeref; > > > +} > > > + > > > +static bool intel_wd_get_hw_state(struct intel_encoder *encoder, > > > + enum pipe *pipe) > > > +{ > > > + bool ret = false; > > > + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > > + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); > > > + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; > > > + intel_wakeref_t wakeref; > > > + u32 tmp; > > > + > > > + if (wd_crtc) > > > + return false; > > > + > > > + wakeref = intel_display_power_get_if_enabled(dev_priv, > > > + encoder->power_domain); > > > + > > > + if (!wakeref) > > > + goto out; > > > + > > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > > + ret = tmp & WD_TRANS_ACTIVE; > > > + if (ret) { > > > + *pipe = wd_crtc->pipe; > > > + return true; > > > + } > > > + > > > +out: > > > + intel_display_power_put(dev_priv, encoder->power_domain, > > > wakeref); > > > + return false; > > > +} > > > + > > > +static int intel_wd_encoder_atomic_check(struct drm_encoder > *encoder, > > > + struct drm_crtc_state *crtc_st, > > > + struct drm_connector_state > > > *conn_st) { > > > + /* Check for the format and buffers and property validity */ > > > + struct drm_framebuffer *fb; > > > + struct drm_writeback_job *job = conn_st->writeback_job; > > > + struct drm_i915_private *i915 = to_i915(encoder->dev); > > > + const struct drm_display_mode *mode = &crtc_st->mode; > > > + int ret; > > > + > > > + if (!job) { > > > + drm_dbg_kms(&i915->drm, "No writeback job created > > > returning\n"); > > > + return -EINVAL; > > > + } > > > + > > > + fb = job->fb; > > > + if (!fb) { > > > + drm_dbg_kms(&i915->drm, "Invalid framebuffer\n"); > > > + return -EINVAL; > > > + } > > > + > > > + if (fb->width != mode->hdisplay || fb->height != mode->vdisplay) { > > > + drm_dbg_kms(&i915->drm, "Invalid framebuffer size > > > %ux%u\n", > > > + fb->width, fb->height); > > > + return -EINVAL; > > > + } > > > + > > > + ret = intel_wd_verify_pix_format(fb->format->format); > > > + if (ret) { > > > + drm_dbg_kms(&i915->drm, "Unsupported framebuffer > > > format %08x\n", > > > + fb->format->format); > > > + return -EINVAL; > > > + } > > > + > > > + return 0; > > > +} > > > + > > > + > > > +static const struct drm_encoder_helper_funcs > wd_encoder_helper_funcs > > > += > > > { > > > + .atomic_check = intel_wd_encoder_atomic_check, }; > > > + > > > +static void intel_wd_connector_destroy(struct drm_connector > > > +*connector) { > > > + drm_connector_cleanup(connector); > > > +} > > > + > > > +static enum drm_connector_status > > > +intel_wd_connector_detect(struct drm_connector *connector, bool > > > +force) { > > > + return connector_status_connected; > > > +} > > > + > > > +static const struct drm_connector_funcs wb_connector_funcs = { > > > + .detect = intel_wd_connector_detect, > > > + .reset = drm_atomic_helper_connector_reset, > > > + .destroy = intel_wd_connector_destroy, > > > + .fill_modes = drm_helper_probe_single_connector_modes, > > > + .atomic_destroy_state = > > > drm_atomic_helper_connector_destroy_state, > > > + .atomic_duplicate_state = > > > drm_atomic_helper_connector_duplicate_state, > > > +}; > > > + > > > +static const struct drm_connector_helper_funcs > > > wb_connector_helper_funcs = { > > > + .get_modes = intel_wd_get_modes, > > > + .mode_valid = intel_wd_mode_valid, > > > +}; > > > + > > > +static const struct drm_encoder_funcs drm_writeback_encoder_funcs = > { > > > + .destroy = drm_encoder_cleanup, > > > +}; > > > + > > > +static bool intel_fastset_dis(struct intel_encoder *encoder, > > > + struct intel_crtc_state *pipe_config) { > > > + return false; > > > +} > > > + > > > +static void intel_wd_connector_init(struct intel_wd *intel_wd) { > > > + drm_atomic_helper_connector_reset(&intel_wd->wb_conn.base); > > > +} > > > + > > > +static void intel_wd_disable_capture(struct intel_wd *intel_wd) { > > > + struct drm_i915_private *dev_priv = to_i915(intel_wd- > > > >base.base.dev); > > > + u32 tmp; > > > + > > > + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), 0xFF); > > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > > + tmp &= WD_TRANS_DISABLE; > > > + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); > > > + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd- > > > >trans)); > > > +} > > > + > > > +void intel_wd_init(struct drm_i915_private *i915, enum transcoder > > > +trans) { > > > + struct intel_wd *intel_wd; > > > + struct intel_encoder *encoder; > > > + struct drm_writeback_connector *wb_conn; > > > + int n_formats = ARRAY_SIZE(wd_fmts); > > > + struct drm_encoder *drm_enc; > > > + int err, ret; > > > + > > > + intel_wd = kzalloc(sizeof(*intel_wd), GFP_KERNEL); > > > + if (!intel_wd) > > > + return; > > > + > > > + intel_wd_connector_init(intel_wd); > > > + encoder = &intel_wd->base; > > > + drm_enc = &encoder->base; > > > + wb_conn = &intel_wd->wb_conn; > > > + intel_wd->trans = trans; > > > + intel_wd->triggered_cap_mode = 1; > > > + intel_wd->frame_num = 1; > > > + intel_wd->slicing_strategy = 1; > > > + encoder->get_config = intel_wd_get_config; > > > + encoder->compute_config = intel_wd_compute_config; > > > + encoder->get_hw_state = intel_wd_get_hw_state; > > > + encoder->type = INTEL_OUTPUT_WD; > > > + encoder->cloneable = 0; > > > + encoder->pipe_mask = ~0; > > > + encoder->power_domain = POWER_DOMAIN_TRANSCODER_B; > > > + encoder->get_power_domains = intel_wd_get_power_domains; > > > + encoder->initial_fastset_check = intel_fastset_dis; > > > + > > > + drm_encoder_helper_add(drm_enc, > > > + &wd_encoder_helper_funcs); > > > + > > > + drm_enc->possible_crtcs = ~0; > > > + ret = drm_encoder_init(&i915->drm, drm_enc, > > > + &drm_writeback_encoder_funcs, > > > + DRM_MODE_ENCODER_VIRTUAL, NULL); > > > + > > > + if (ret) { > > > + drm_dbg_kms(&i915->drm, > > > + "Writeback drm_encoder init Failed: %d\n", > > > + ret); > > > + goto cleanup; > > > + } > > > + > > > + err = drm_writeback_connector_init_with_encoder(&i915->drm, > > > + wb_conn, drm_enc, &wb_connector_funcs, > > > + wd_fmts, n_formats); > > > + > > > + if (err != 0) { > > > + drm_dbg_kms(&i915->drm, > > > + "drm_writeback_connector_init: Failed: %d\n", > > > + err); > > > + goto cleanup; > > > + } > > > + > > > + wb_conn->base.encoder = drm_enc; > > > + drm_connector_helper_add(&wb_conn->base, > > > &wb_connector_helper_funcs); > > > + wb_conn->base.status = connector_status_connected; > > > + return; > > > + > > > +cleanup: > > > + kfree(intel_wd); > > > + return; > > > +} > > > + > > > +static void intel_wd_writeback_complete(struct intel_wd *intel_wd, > > > + struct drm_writeback_job *job, > > > + int status) > > > +{ > > > + struct drm_writeback_connector *wb_conn = > > > + &intel_wd->wb_conn; > > > + drm_writeback_signal_completion(wb_conn, status); } > > > + > > > +static int intel_wd_setup_transcoder(struct intel_wd *intel_wd, > > > + struct intel_crtc_state *pipe_config, > > > + struct drm_connector_state *conn_state, > > > + struct drm_writeback_job *job) { > > > + struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc); > > > + enum pipe pipe = intel_crtc->pipe; > > > + struct drm_framebuffer *fb; > > > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > > > + struct drm_gem_object *wd_fb_obj; > > > + int ret; > > > + u32 stride, tmp; > > > + u16 hactive, vactive; > > > + > > > + fb = job->fb; > > > + wd_fb_obj = fb->obj[0]; > > > + if (!wd_fb_obj) { > > > + drm_dbg_kms(&dev_priv->drm, "No framebuffer gem object > > > created\n"); > > > + return -EINVAL; > > > + } > > > + > > > + ret = intel_wd_pin_fb(intel_wd, fb); > > > + drm_WARN_ON(&dev_priv->drm, ret != 0); > > > + /* Write stride and surface registers in that particular order */ > > > + stride = intel_wd_get_stride(pipe_config, fb->format->format); > > > + > > > + tmp = intel_de_read(dev_priv, WD_STRIDE(intel_wd->trans)); > > > + tmp &= ~WD_STRIDE_MASK; > > > + tmp |= (stride << WD_STRIDE_SHIFT); > > > + > > > + intel_de_write(dev_priv, WD_STRIDE(intel_wd->trans), tmp); > > > + > > > + tmp = intel_de_read(dev_priv, WD_SURF(intel_wd->trans)); > > > + > > > + intel_de_write(dev_priv, WD_SURF(intel_wd->trans), > > > + i915_ggtt_offset(intel_wd->vma)); > > > + > > > + tmp = intel_de_read_fw(dev_priv, WD_IIR(intel_wd->trans)); > > > + intel_de_write_fw(dev_priv, WD_IIR(intel_wd->trans), tmp); > > > + > > > + tmp = ~(WD_GTT_FAULT_INT | WD_WRITE_COMPLETE_INT | > > > WD_FRAME_COMPLETE_INT | > > > + WD_VBLANK_INT | WD_OVERRUN_INT | > > > WD_CAPTURING_INT); > > > + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), tmp); > > > + > > > + if (intel_wd->stream_cap) { > > > + tmp = intel_de_read(dev_priv, > > > + WD_STREAMCAP_CTL(intel_wd->trans)); > > > + tmp |= WD_STREAM_CAP_MODE_EN; > > > + intel_configure_slicing_strategy(dev_priv, intel_wd, &tmp); > > > + } > > > + > > > + hactive = pipe_config->uapi.mode.hdisplay; > > > + vactive = pipe_config->uapi.mode.vdisplay; > > > + tmp = intel_de_read(dev_priv, HTOTAL(intel_wd->trans)); > > > + tmp = intel_de_read(dev_priv, VTOTAL(intel_wd->trans)); > > > + > > > + /* minimum hactive as per bspec: 64 pixels */ > > > + if (hactive < 64) > > > + drm_err(&dev_priv->drm, "hactive is less then 64 pixels\n"); > > > + > > > + intel_de_write(dev_priv, HTOTAL(intel_wd->trans), hactive - 1); > > > + intel_de_write(dev_priv, VTOTAL(intel_wd->trans), vactive - 1); > > > + > > > + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd- > > > >trans)); > > > + /* select pixel format */ > > > + tmp &= ~WD_PIX_FMT_MASK; > > > + > > > + switch (fb->format->format) { > > > + default: > > > + fallthrough; > > > + case DRM_FORMAT_YUYV: > > > + tmp |= WD_PIX_FMT_YUYV; > > > + break; > > > + case DRM_FORMAT_XYUV8888: > > > + tmp |= WD_PIX_FMT_XYUV8888; > > > + break; > > > + case DRM_FORMAT_XBGR8888: > > > + case DRM_FORMAT_XRGB8888: > > > + tmp |= WD_PIX_FMT_XBGR8888; > > > + break; > > > + case DRM_FORMAT_Y410: > > > + tmp |= WD_PIX_FMT_Y410; > > > + break; > > > + case DRM_FORMAT_YUV422: > > > + tmp |= WD_PIX_FMT_YUV422; > > > + break; > > > + case DRM_FORMAT_XBGR2101010: > > > + tmp |= WD_PIX_FMT_XBGR2101010; > > > + break; > > > + case DRM_FORMAT_RGB565: > > > + tmp |= WD_PIX_FMT_RGB565; > > > + break; > > > + } > > > + > > > + if (intel_wd->triggered_cap_mode) > > > + tmp |= WD_TRIGGERED_CAP_MODE_ENABLE; > > > + > > > + if (intel_wd->stream_cap) > > > + tmp |= WD_CTL_POINTER_DTDH; > > > + > > > + /* select input pipe */ > > > + tmp &= ~WD_INPUT_SELECT_MASK; > > > + switch (pipe) { > > > + default: > > > + fallthrough; > > > + case PIPE_A: > > > + tmp |= WD_INPUT_PIPE_A; > > > + break; > > > + case PIPE_B: > > > + tmp |= WD_INPUT_PIPE_B; > > > + break; > > > + case PIPE_C: > > > + tmp |= WD_INPUT_PIPE_C; > > > + break; > > > + case PIPE_D: > > > + tmp |= WD_INPUT_PIPE_D; > > > + break; > > > + } > > > + > > > + /* enable DDI buffer */ > > > + if (!(tmp & TRANS_WD_FUNC_ENABLE)) > > > + tmp |= TRANS_WD_FUNC_ENABLE; > > > + > > > + intel_de_write(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans), > > > tmp); > > > + > > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > > + ret = tmp & WD_TRANS_ACTIVE; > > > + if (!ret) { > > > + /* enable the transcoder */ > > > + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > > > + tmp |= WD_TRANS_ENABLE; > > > + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); > > > + > > > + /* wait for transcoder to be enabled */ > > > + if (intel_de_wait_for_set(dev_priv, PIPECONF(intel_wd- > > > >trans), > > > + WD_TRANS_ACTIVE, 10)) > > > + drm_err(&dev_priv->drm, "WD transcoder could not > > > be enabled\n"); > > > + } > > > + > > > + return 0; > > > +} > > > + > > > +static int intel_wd_capture(struct intel_wd *intel_wd, > > > + struct intel_crtc_state *pipe_config, > > > + struct drm_connector_state *conn_state, > > > + struct drm_writeback_job *job) { > > > + u32 tmp; > > > + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); > > > + int ret = 0, status = 0; > > > + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; > > > + unsigned long flags; > > > + > > > + if (!job->out_fence) > > > + drm_dbg_kms(&i915->drm, "Not able to get out_fence for > > > job\n"); > > > + > > > + ret = intel_wd_setup_transcoder(intel_wd, pipe_config, > > > + conn_state, job); > > > + > > > + if (ret < 0) { > > > + drm_dbg_kms(&i915->drm, > > > + "WD transcoder setup not completed aborting > > > capture\n"); > > > + return -1; > > > + } > > > + > > > + if (!wd_crtc) { > > > + drm_err(&i915->drm, "CRTC not attached\n"); > > > + return -1; > > > + } > > > + > > > + tmp = intel_de_read_fw(i915, WD_TRANS_FUNC_CTL(intel_wd- > > > >trans)); > > > + tmp |= START_TRIGGER_FRAME; > > > + tmp &= ~WD_FRAME_NUMBER_MASK; > > > + tmp |= intel_wd->frame_num; > > > + intel_de_write_fw(i915, WD_TRANS_FUNC_CTL(intel_wd- > > > >trans), tmp); > > Why this tab space? > Have not given a tab space here > > > > > + > > > + if (!intel_de_wait_for_set(i915, WD_IIR(intel_wd->trans), > > > + WD_FRAME_COMPLETE_INT, 100)){ > > > + drm_dbg_kms(&i915->drm, "frame captured\n"); > > > + status = 0; > > > + } else { > > > + drm_dbg_kms(&i915->drm, "frame not captured triggering > > > stop frame\n"); > > > + tmp = intel_de_read(i915, WD_TRANS_FUNC_CTL(intel_wd- > > > >trans)); > > > + tmp |= STOP_TRIGGER_FRAME; > > > + intel_de_write(i915, WD_TRANS_FUNC_CTL(intel_wd- > > >trans), > > > tmp); > > > + status = -1; > > > + } > > > + > > > + intel_wd_writeback_complete(intel_wd, job, status); > > > + if (wd_crtc->wd.e) { > > > + spin_lock_irqsave(&i915->drm.event_lock, flags); > > > + drm_dbg_kms(&i915->drm, "send %p\n", wd_crtc->wd.e); > > Can this debug print be moved outside the spin_lock_irqsave.? > > > Causes an error to be thrown if I do as wd.e needs to be locked. > > > + drm_crtc_send_vblank_event(&wd_crtc->base, > > > + wd_crtc->wd.e); > > > + spin_unlock_irqrestore(&i915->drm.event_lock, flags); > > > + wd_crtc->wd.e = NULL; > > > + } else { > > > + drm_err(&i915->drm, "Event NULL! %p, %p\n", &i915->drm, > > > + wd_crtc); > > > + } > > > + if (!intel_get_writeback_job_from_queue(intel_wd)) > > > + intel_wd_disable_capture(intel_wd); > > > + return 0; > > > +} > > > + > > > +void intel_wd_enable_capture(struct intel_crtc_state *pipe_config, > > > + struct drm_connector_state *conn_state) { > > > + struct drm_i915_private *i915 = > > > + to_i915(conn_state->connector->dev); > > > + struct drm_writeback_connector *wb_conn = > > > + drm_connector_to_writeback(conn_state->connector); > > > + struct intel_wd *intel_wd = wb_conn_to_intel_wd(wb_conn); > > > + struct drm_writeback_job *job; > > > + > > > + job = intel_get_writeback_job_from_queue(intel_wd); > > > + if (!job) { > > > + drm_dbg_kms(&i915->drm, > > > + "job queue is empty not capturing any frame\n"); > > > + return; > > > + } > > > + > > > + intel_wd_capture(intel_wd, pipe_config, > > > + conn_state, job); > > > + intel_wd->frame_num += 1; > > > +} > > > + > > > +void intel_wd_set_vblank_event(struct intel_atomic_state *state, > > > +struct > > > intel_crtc *intel_crtc, > > > + struct intel_crtc_state *intel_crtc_state) { > > > + struct drm_i915_private *i915 = to_i915(intel_crtc->base.dev); > > > + struct drm_crtc_state *crtc_state = &intel_crtc_state->uapi; > > > + struct intel_encoder *encoder; > > > + struct intel_wd *intel_wd; > > > + struct drm_connector_state *conn_state; > > > + struct drm_connector *connector; > > > + int i; > > > + > > > + for_each_intel_encoder(&i915->drm, encoder) { > > > + if (encoder->type != INTEL_OUTPUT_WD) > > > + continue; > > > + > > > + intel_wd = enc_to_intel_wd(encoder); > > > + if (!intel_wd->wd_crtc) > > > + return; > > > + } > > > + > > > + if (intel_wd && intel_crtc == intel_wd->wd_crtc) { > > > + for_each_new_connector_in_state(&state->base, connector, > > > conn_state, > > > + i) { > > > + if (!conn_state->writeback_job) > > > + continue; > > > + > > > + intel_crtc->wd.e = crtc_state->event; > > > + crtc_state->event = NULL; > > > + } > > > + } > > > +} > > > + > > > +void intel_wd_handle_isr(struct drm_i915_private *i915) { > > > + u32 iir_value = 0; > > > + struct intel_encoder *encoder; > > > + struct intel_wd *intel_wd; > > > + > > > + iir_value = intel_de_read(i915, WD_IIR(TRANSCODER_WD_0)); > > > + > > > + for_each_intel_encoder(&i915->drm, encoder) { > > > + > > > + if (encoder->type != INTEL_OUTPUT_WD) > > > + continue; > > > + > > > + intel_wd = enc_to_intel_wd(encoder); > > > + if (!intel_wd->wd_crtc) { > > > + drm_err(&i915->drm, "NO CRTC attached with > > > WD\n"); > > > + goto clear_iir; > > > + } > > > + } > > > + > > > + if (iir_value & WD_FRAME_COMPLETE_INT) > > > + return; > > > + > > > +clear_iir: > > > + intel_de_write(i915, WD_IIR(TRANSCODER_WD_0), iir_value); } > > > diff --git a/drivers/gpu/drm/i915/display/intel_wd.h > > > b/drivers/gpu/drm/i915/display/intel_wd.h > > > new file mode 100644 > > > index 000000000000..0fcd1a746593 > > > --- /dev/null > > > +++ b/drivers/gpu/drm/i915/display/intel_wd.h > > > @@ -0,0 +1,48 @@ > > > +/* SPDX-License-Identifier: MIT*/ > > > +/* > > > + * Copyright © 2022 Intel Corporation */ > > > + > > > +#ifndef _INTEL_WD_H > > > +#define _INTEL_WD_H > > > + > > > +#include <drm/drm_crtc.h> > > > + > > > +#include "intel_display_types.h" > > > + > > > +#define I915_MAX_WD_TANSCODERS 2 > > > + > > > +struct intel_wd { > > > + struct intel_encoder base; > > > + struct drm_writeback_connector wb_conn; > > > + struct intel_crtc *wd_crtc; > > > + intel_wakeref_t io_wakeref[I915_MAX_WD_TANSCODERS]; > > > + enum transcoder trans; > > > + struct i915_vma *vma; > > > + unsigned long flags; > > > + struct drm_writeback_job *job; > > > + int triggered_cap_mode; > > > + int frame_num; > > > + bool stream_cap; > > > + bool start_capture; > > > + int slicing_strategy; > > > +}; > > > + > > > +static inline struct intel_wd *enc_to_intel_wd(struct intel_encoder > > > +*encoder) { > > > + return container_of(&encoder->base, struct intel_wd, base.base); } > > > + > > > +static inline struct intel_wd *wb_conn_to_intel_wd(struct > > > +drm_writeback_connector *wb_conn) { > > > + return container_of(wb_conn, struct intel_wd, wb_conn); } > > > + > > > +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder > > > +trans); void intel_wd_enable_capture(struct intel_crtc_state > > *pipe_config, > > > + struct drm_connector_state *conn_state); void > > > +intel_wd_handle_isr(struct drm_i915_private *dev_priv); void > > > +intel_wd_set_vblank_event(struct intel_atomic_state *state, struct > > > intel_crtc *crtc, > > > + struct intel_crtc_state *crtc_state); struct > > > drm_writeback_job > > > +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd); > > > +#endif/* _INTEL_WD_H */ > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h > > > b/drivers/gpu/drm/i915/i915_drv.h index 55794b87a6c1..503a21c77d14 > > > 100644 > > > --- a/drivers/gpu/drm/i915/i915_drv.h > > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > > @@ -34,6 +34,7 @@ > > > > > > #include <linux/pm_qos.h> > > > > > > +#include <drm/drm_writeback.h> > > > #include <drm/ttm/ttm_device.h> > > > > > > #include "display/intel_display.h" > > > diff --git a/drivers/gpu/drm/i915/i915_irq.c > > > b/drivers/gpu/drm/i915/i915_irq.c index 86a42d9e8041..ee0255d9eb64 > > > 100644 > > > --- a/drivers/gpu/drm/i915/i915_irq.c > > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > > @@ -42,6 +42,7 @@ > > > #include "display/intel_hotplug.h" > > > #include "display/intel_lpe_audio.h" > > > #include "display/intel_psr.h" > > > +#include "display/intel_wd.h" > > > > > > #include "gt/intel_breadcrumbs.h" > > > #include "gt/intel_gt.h" > > > @@ -2342,6 +2343,11 @@ gen8_de_misc_irq_handler(struct > > > drm_i915_private *dev_priv, u32 iir) > > > found = true; > > > } > > > > > > + if (iir & GEN8_DE_MISC_WD0) { > > > + intel_wd_handle_isr(dev_priv); > > > + found = true; > > > + } > > > + > > > if (iir & GEN8_DE_EDP_PSR) { > > > struct intel_encoder *encoder; > > > u32 psr_iir; > > > @@ -3767,7 +3773,7 @@ static void gen8_de_irq_postinstall(struct > > > drm_i915_private *dev_priv) > > > u32 de_pipe_enables; > > > u32 de_port_masked = gen8_de_port_aux_mask(dev_priv); > > > u32 de_port_enables; > > > - u32 de_misc_masked = GEN8_DE_EDP_PSR; > > > + u32 de_misc_masked = GEN8_DE_EDP_PSR | GEN8_DE_MISC_WD0; > > > u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | > > > BIT(TRANSCODER_C) | BIT(TRANSCODER_D); > > > enum pipe pipe; > > > diff --git a/drivers/gpu/drm/i915/i915_pci.c > > > b/drivers/gpu/drm/i915/i915_pci.c index 19fc00bcd7b9..d6eb63aefc47 > > > 100644 > > > --- a/drivers/gpu/drm/i915/i915_pci.c > > > +++ b/drivers/gpu/drm/i915/i915_pci.c > > > @@ -868,7 +868,8 @@ static const struct intel_device_info jsl_info = { > > > .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | > > > BIT(PIPE_D), \ > > > .__runtime.cpu_transcoder_mask = BIT(TRANSCODER_A) | > > > BIT(TRANSCODER_B) | \ > > > BIT(TRANSCODER_C) | BIT(TRANSCODER_D) | \ > > > - BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1), \ > > > + BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1) | \ > > > + BIT(TRANSCODER_WD_0), \ > > > .display.pipe_offsets = { \ > > > [TRANSCODER_A] = PIPE_A_OFFSET, \ > > > [TRANSCODER_B] = PIPE_B_OFFSET, \ > > > @@ -876,6 +877,8 @@ static const struct intel_device_info jsl_info = { > > > [TRANSCODER_D] = PIPE_D_OFFSET, \ > > > [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ > > > [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ > > > + [TRANSCODER_WD_0] = PIPE_WD0_OFFSET, \ > > > + [TRANSCODER_WD_1] = PIPE_WD1_OFFSET, \ > > > }, \ > > > .display.trans_offsets = { \ > > > [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ @@ -884,6 > > > +887,8 @@ static const struct intel_device_info jsl_info = { > > > [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ > > > [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ > > > [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ > > > + [TRANSCODER_WD_0] = TRANSCODER_WD0_OFFSET, \ > > > + [TRANSCODER_WD_1] = TRANSCODER_WD1_OFFSET, \ > > > }, \ > > > TGL_CURSOR_OFFSETS, \ > > > .has_global_mocs = 1, \ > > > -- > > > 2.25.1 > > > > Thanks and Regards, > > Arun R Murthy > > --------------------
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index a26edcdadc21..f34db43cf58d 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -304,6 +304,7 @@ i915-y += \ display/intel_tv.o \ display/intel_vdsc.o \ display/intel_vrr.o \ + display/intel_wd.o \ display/vlv_dsi.o \ display/vlv_dsi_pll.o diff --git a/drivers/gpu/drm/i915/display/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c index e78430001f07..ae08db164f73 100644 --- a/drivers/gpu/drm/i915/display/intel_acpi.c +++ b/drivers/gpu/drm/i915/display/intel_acpi.c @@ -247,6 +247,7 @@ static u32 acpi_display_type(struct intel_connector *connector) case DRM_MODE_CONNECTOR_LVDS: case DRM_MODE_CONNECTOR_eDP: case DRM_MODE_CONNECTOR_DSI: + case DRM_MODE_CONNECTOR_WRITEBACK: display_type = ACPI_DISPLAY_TYPE_INTERNAL_DIGITAL; break; case DRM_MODE_CONNECTOR_Unknown: diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c index 6792a9056f46..66d552758720 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc.c +++ b/drivers/gpu/drm/i915/display/intel_crtc.c @@ -491,6 +491,9 @@ void intel_pipe_update_start(struct intel_crtc_state *new_crtc_state) if (new_crtc_state->do_async_flip) return; + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) + return; + if (intel_crtc_needs_vblank_work(new_crtc_state)) intel_crtc_vblank_work_init(new_crtc_state); @@ -638,6 +641,9 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state) if (new_crtc_state->do_async_flip) return; + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) + return; + trace_intel_pipe_update_end(crtc, end_vbl_count, scanline_end); /* diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c index e9212f69c360..8435065f3b7d 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c @@ -71,6 +71,7 @@ static const char * const output_type_str[] = { OUTPUT_TYPE(DSI), OUTPUT_TYPE(DDI), OUTPUT_TYPE(DP_MST), + OUTPUT_TYPE(WD), }; #undef OUTPUT_TYPE diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 643832d55c28..ea8e07a957ab 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1953,6 +1953,12 @@ void intel_ddi_sanitize_encoder_pll_mapping(struct intel_encoder *encoder) */ if (encoder->type == INTEL_OUTPUT_DP_MST) return; + /* + * WD transcoder is a virtual encoder hence sanization + * is not required for it + */ + if (encoder->type == INTEL_OUTPUT_WD) + return; if (!encoder->base.crtc && intel_encoder_is_dp(encoder)) { u8 pipe_mask; diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 2d0018ae34b1..15b2b7a6a110 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -115,6 +115,7 @@ #include "intel_sprite.h" #include "intel_tc.h" #include "intel_vga.h" +#include "intel_wd.h" #include "i9xx_plane.h" #include "skl_scaler.h" #include "skl_universal_plane.h" @@ -1511,6 +1512,10 @@ static void intel_encoders_update_prepare(struct intel_atomic_state *state) continue; intel_connector = to_intel_connector(connector); + /* intel_connector instance is not created for WD transcoder */ + if (!intel_connector) + continue; + encoder = intel_connector_primary_encoder(intel_connector); if (!encoder->update_prepare) continue; @@ -1540,6 +1545,10 @@ static void intel_encoders_update_complete(struct intel_atomic_state *state) continue; intel_connector = to_intel_connector(connector); + /* intel_connector instance is not created for WD transcoder */ + if (!intel_connector) + continue; + encoder = intel_connector_primary_encoder(intel_connector); if (!encoder->update_complete) continue; @@ -1550,6 +1559,37 @@ static void intel_encoders_update_complete(struct intel_atomic_state *state) } } +static void intel_queue_writeback_job(struct intel_atomic_state *state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + struct drm_writeback_connector *wb_conn; + int i; + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + if (!new_conn_state->writeback_job) + continue; + + wb_conn = drm_connector_to_writeback(connector); + drm_writeback_queue_job(wb_conn, new_conn_state); + } +} + +static void intel_enable_writeback_capture(struct intel_atomic_state *state,struct intel_crtc_state *crtc_state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + int i; + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) + continue; + intel_wd_enable_capture(crtc_state, new_conn_state); + } +} + static void intel_encoders_pre_pll_enable(struct intel_atomic_state *state, struct intel_crtc *crtc) { @@ -1650,8 +1690,12 @@ static void intel_encoders_post_disable(struct intel_atomic_state *state, int i; for_each_old_connector_in_state(&state->base, conn, old_conn_state, i) { - struct intel_encoder *encoder = - to_intel_encoder(old_conn_state->best_encoder); + struct intel_encoder *encoder; + + if (conn->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) + continue; + + encoder = to_intel_encoder(old_conn_state->best_encoder); if (old_conn_state->crtc != &crtc->base) continue; @@ -1928,7 +1972,8 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, bdw_set_pipemisc(new_crtc_state); if (!intel_crtc_is_bigjoiner_slave(new_crtc_state) && - !transcoder_is_dsi(cpu_transcoder)) + !transcoder_is_dsi(cpu_transcoder) && + !transcoder_is_wd(cpu_transcoder)) hsw_configure_cpu_transcoder(new_crtc_state); crtc->active = true; @@ -7528,6 +7573,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) } } + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { + if ((new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD))) + intel_wd_set_vblank_event(state, crtc, new_crtc_state); + } + intel_encoders_update_prepare(state); intel_dbuf_pre_plane_update(state); @@ -7538,6 +7588,14 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) intel_crtc_enable_flip_done(state, crtc); } + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { + if ((new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD))) + { + intel_queue_writeback_job(state); + intel_enable_writeback_capture(state, new_crtc_state); + } + } + /* Now enable the clocks, plane, pipe, and connectors that we set up. */ dev_priv->display.funcs.display->commit_modeset_enables(state); @@ -7892,6 +7950,10 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) if (!HAS_DISPLAY(dev_priv)) return; + /* Initializing WD transcoder */ + if (DISPLAY_VER(dev_priv) >= 12) + intel_wd_init(dev_priv, TRANSCODER_WD_0); + if (IS_DG2(dev_priv)) { intel_ddi_init(dev_priv, PORT_A); intel_ddi_init(dev_priv, PORT_B); diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 102bf7d47ccc..1ee5e8600809 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -158,6 +158,11 @@ static inline bool transcoder_is_dsi(enum transcoder transcoder) return transcoder == TRANSCODER_DSI_A || transcoder == TRANSCODER_DSI_C; } +static inline bool transcoder_is_wd(enum transcoder transcoder) +{ + return transcoder == TRANSCODER_WD_0 || transcoder == TRANSCODER_WD_1; +} + /* * Global legacy plane identifier. Valid only for primary/sprite * planes on pre-g4x, and only for primary planes on g4x-bdw. diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index fe40e2a226d6..3ec11c937dbc 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -550,7 +550,7 @@ static void intel_hdmi_info(struct seq_file *m, static void intel_connector_info(struct seq_file *m, struct drm_connector *connector) { - struct intel_connector *intel_connector = to_intel_connector(connector); + struct intel_connector *intel_connector; const struct drm_connector_state *conn_state = connector->state; struct intel_encoder *encoder = to_intel_encoder(conn_state->best_encoder); @@ -573,6 +573,8 @@ static void intel_connector_info(struct seq_file *m, if (!encoder) return; + intel_connector = to_intel_connector(connector); + switch (connector->connector_type) { case DRM_MODE_CONNECTOR_DisplayPort: case DRM_MODE_CONNECTOR_eDP: @@ -590,12 +592,15 @@ static void intel_connector_info(struct seq_file *m, break; } - seq_puts(m, "\tHDCP version: "); - intel_hdcp_info(m, intel_connector); + if (intel_connector) { + seq_puts(m, "\tHDCP version: "); + intel_hdcp_info(m, intel_connector); + } seq_printf(m, "\tmax bpc: %u\n", connector->display_info.bpc); - intel_panel_info(m, intel_connector); + if (intel_connector) + intel_panel_info(m, intel_connector); seq_printf(m, "\tmodes:\n"); list_for_each_entry(mode, &connector->modes, head) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 8eacb9133fce..7931dbacaba7 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -44,6 +44,7 @@ #include <drm/drm_vblank.h> #include <drm/drm_vblank_work.h> #include <drm/i915_mei_hdcp_interface.h> +#include <drm/drm_writeback.h> #include <media/cec-notifier.h> #include "i915_vma.h" @@ -1371,6 +1372,11 @@ struct intel_crtc { bool cpu_fifo_underrun_disabled; bool pch_fifo_underrun_disabled; + struct { + struct drm_pending_vblank_event *e; + atomic_t work_busy; + wait_queue_head_t wd_wait; + } wd; /* per-pipe watermark state */ struct { /* watermarks currently being used */ @@ -1498,7 +1504,6 @@ struct cxsr_latency { #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base) #define to_intel_crtc(x) container_of(x, struct intel_crtc, base) #define to_intel_crtc_state(x) container_of(x, struct intel_crtc_state, uapi) -#define to_intel_wb_connector(x) container_of(x, struct intel_wb_connector, base) #define to_intel_encoder(x) container_of(x, struct intel_encoder, base) #define to_intel_framebuffer(x) container_of(x, struct intel_framebuffer, base) #define to_intel_plane(x) container_of(x, struct intel_plane, base) @@ -2077,8 +2082,8 @@ intel_connector_list_iter_next(struct drm_connector_list_iter *iter) struct drm_connector *connector; bool flag = true; /* - * Skipping connector that are Writeback connector as they will - * not be embedded in intel connector + * An intel_connector entity is not created for a writeback + * connector hence decoupling. */ while (flag) { connector = drm_connector_list_iter_next(iter); diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c index 52f2fe1735da..411f3366b9de 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll.c +++ b/drivers/gpu/drm/i915/display/intel_dpll.c @@ -940,6 +940,9 @@ static int hsw_crtc_compute_clock(struct intel_atomic_state *state, intel_get_crtc_new_encoder(state, crtc_state); int ret; + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) + return 0; + if (DISPLAY_VER(dev_priv) < 11 && intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) return 0; @@ -968,6 +971,9 @@ static int hsw_crtc_get_shared_dpll(struct intel_atomic_state *state, struct intel_encoder *encoder = intel_get_crtc_new_encoder(state, crtc_state); + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) + return 0; + if (DISPLAY_VER(dev_priv) < 11 && intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI)) return 0; diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c b/drivers/gpu/drm/i915/display/intel_modeset_setup.c index e1a90331c230..15792a5dd04c 100644 --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c @@ -24,6 +24,7 @@ #include "intel_pch_display.h" #include "intel_pm.h" #include "skl_watermark.h" +#include "intel_wd.h" static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, struct drm_modeset_acquire_ctx *ctx) @@ -111,17 +112,17 @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, static void intel_modeset_update_connector_atomic_state(struct drm_i915_private *i915) { - struct intel_connector *connector; + struct drm_connector *connector; struct drm_connector_list_iter conn_iter; drm_connector_list_iter_begin(&i915->drm, &conn_iter); - for_each_intel_connector_iter(connector, &conn_iter) { - struct drm_connector_state *conn_state = connector->base.state; + drm_for_each_connector_iter(connector, &conn_iter) { + struct drm_connector_state *conn_state = connector->state; struct intel_encoder *encoder = - to_intel_encoder(connector->base.encoder); + to_intel_encoder(connector->encoder); if (conn_state->crtc) - drm_connector_put(&connector->base); + drm_connector_put(connector); if (encoder) { struct intel_crtc *crtc = @@ -133,7 +134,7 @@ static void intel_modeset_update_connector_atomic_state(struct drm_i915_private conn_state->crtc = &crtc->base; conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3; - drm_connector_get(&connector->base); + drm_connector_get(connector); } else { conn_state->best_encoder = NULL; conn_state->crtc = NULL; @@ -433,6 +434,8 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915) struct intel_crtc *crtc; struct intel_encoder *encoder; struct intel_connector *connector; + struct drm_connector *_connector; + struct drm_encoder *_encoder; struct drm_connector_list_iter conn_iter; u8 active_pipes = 0; @@ -509,38 +512,70 @@ static void intel_modeset_readout_hw_state(struct drm_i915_private *i915) intel_dpll_readout_hw_state(i915); drm_connector_list_iter_begin(&i915->drm, &conn_iter); - for_each_intel_connector_iter(connector, &conn_iter) { - if (connector->get_hw_state(connector)) { - struct intel_crtc_state *crtc_state; - struct intel_crtc *crtc; - - connector->base.dpms = DRM_MODE_DPMS_ON; - - encoder = intel_attached_encoder(connector); - connector->base.encoder = &encoder->base; - - crtc = to_intel_crtc(encoder->base.crtc); - crtc_state = crtc ? to_intel_crtc_state(crtc->base.state) : NULL; - - if (crtc_state && crtc_state->hw.active) { - /* - * This has to be done during hardware readout - * because anything calling .crtc_disable may - * rely on the connector_mask being accurate. - */ - crtc_state->uapi.connector_mask |= - drm_connector_mask(&connector->base); - crtc_state->uapi.encoder_mask |= - drm_encoder_mask(&encoder->base); + drm_for_each_connector_iter(_connector, &conn_iter) { + struct intel_crtc_state *crtc_state; + struct intel_crtc *crtc; + struct drm_writeback_connector *wb_conn; + struct intel_wd *intel_wd; + + connector = to_intel_connector(_connector); + if (!connector) { + wb_conn = drm_connector_to_writeback(_connector); + intel_wd = wb_conn_to_intel_wd(wb_conn); + _encoder = &intel_wd->base.base; + _connector->encoder = _encoder; + encoder = to_intel_encoder(_encoder); + pipe = 0; + if (encoder->get_hw_state(encoder, &pipe)) { + _connector->dpms = DRM_MODE_DPMS_ON; + crtc = to_intel_crtc(_encoder->crtc); + crtc_state = crtc ? to_intel_crtc_state(crtc->base.state) : NULL; + + if (crtc_state && crtc_state->hw.active) { + /* + * This has to be done during hardware readout + * because anything calling .crtc_disable may + * rely on the connector_mask being accurate. + */ + crtc_state->uapi.connector_mask |= + drm_connector_mask(&connector->base); + crtc_state->uapi.encoder_mask |= + drm_encoder_mask(&encoder->base); + } + } else { + _connector->dpms = DRM_MODE_DPMS_OFF; + _connector->encoder = NULL; } } else { - connector->base.dpms = DRM_MODE_DPMS_OFF; - connector->base.encoder = NULL; + if (connector->get_hw_state(connector)) { + connector->base.dpms = DRM_MODE_DPMS_OFF; + encoder = intel_attached_encoder(connector); + connector->base.encoder = &encoder->base; + + crtc = to_intel_crtc(encoder->base.crtc); + crtc_state = crtc ? to_intel_crtc_state(crtc->base.state) : NULL; + + if (crtc_state && crtc_state->hw.active) { + /* + * This has to be done during hardware readout + * because anything calling .crtc_disable may + * rely on the connector_mask being accurate. + */ + crtc_state->uapi.connector_mask |= + drm_connector_mask(&connector->base); + crtc_state->uapi.encoder_mask |= + drm_encoder_mask(&encoder->base); + } + } else { + connector->base.dpms = DRM_MODE_DPMS_OFF; + connector->base.encoder = NULL; + } } drm_dbg_kms(&i915->drm, - "[CONNECTOR:%d:%s] hw state readout: %s\n", - connector->base.base.id, connector->base.name, - str_enabled_disabled(connector->base.encoder)); + "[CONNECTOR:%d:%s] hw state readout: %s\n", + _connector->base.id, _connector->name, + str_enabled_disabled(_connector->encoder)); + } drm_connector_list_iter_end(&conn_iter); diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c index 0fdcf2e6d57f..80e9840e2e5f 100644 --- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c +++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c @@ -25,11 +25,16 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state) { - struct intel_connector *connector = to_intel_connector(conn_state->connector); - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct drm_connector *_connector = conn_state->connector; + struct intel_connector *connector; + struct drm_i915_private *i915 = to_i915(_connector->dev); drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s]\n", - connector->base.base.id, connector->base.name); + _connector->base.id, _connector->name); + + connector = to_intel_connector(_connector); + if (!connector) + return; if (connector->get_hw_state(connector)) { struct intel_encoder *encoder = intel_attached_encoder(connector); @@ -119,6 +124,9 @@ verify_encoder_state(struct drm_i915_private *dev_priv, struct intel_atomic_stat encoder->base.base.id, encoder->base.name); + if (encoder->type == INTEL_OUTPUT_WD) + continue; + for_each_oldnew_connector_in_state(&state->base, connector, old_conn_state, new_conn_state, i) { if (old_conn_state->best_encoder == &encoder->base) @@ -177,6 +185,9 @@ verify_crtc_state(struct intel_crtc *crtc, intel_crtc_get_pipe_config(pipe_config); + if (new_crtc_state->output_types & BIT(INTEL_OUTPUT_WD)) + return; + /* we keep both pipes enabled on 830 */ if (IS_I830(dev_priv) && pipe_config->hw.active) pipe_config->hw.active = new_crtc_state->hw.active; diff --git a/drivers/gpu/drm/i915/display/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index caa07ef34f21..1bcb4b58d992 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.c +++ b/drivers/gpu/drm/i915/display/intel_opregion.c @@ -374,6 +374,9 @@ int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder, if (ret) return ret; + if (intel_encoder->type == INTEL_OUTPUT_WD) + return 0; + if (intel_encoder->type == INTEL_OUTPUT_DSI) port = 0; else diff --git a/drivers/gpu/drm/i915/display/intel_wd.c b/drivers/gpu/drm/i915/display/intel_wd.c new file mode 100644 index 000000000000..e3e990f4f26f --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wd.c @@ -0,0 +1,695 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2022 Intel Corporation + */ + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> + +#include "intel_atomic.h" +#include "intel_connector.h" +#include "intel_wd.h" +#include "intel_fb_pin.h" +#include "intel_de.h" + +enum { + WD_CAPTURE_4_PIX, + WD_CAPTURE_2_PIX, +} wd_capture_format; + +struct drm_writeback_job +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd) +{ + struct drm_writeback_job *job; + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); + struct drm_writeback_connector *wb_conn = + &intel_wd->wb_conn; + unsigned long flags; + + spin_lock_irqsave(&wb_conn->job_lock, flags); + job = list_first_entry_or_null(&wb_conn->job_queue, + struct drm_writeback_job, + list_entry); + spin_unlock_irqrestore(&wb_conn->job_lock, flags); + if (job == NULL) { + drm_dbg_kms(&i915->drm, "job queue is empty\n"); + return NULL; + } + + return job; +} + +static const u32 wd_fmts[] = { + DRM_FORMAT_YUV444, + DRM_FORMAT_XYUV8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_XRGB8888, + DRM_FORMAT_Y410, + DRM_FORMAT_YUV422, + DRM_FORMAT_XBGR2101010, + DRM_FORMAT_RGB565, +}; + +static int intel_wd_get_format(int pixel_format) +{ + int wd_format = -EINVAL; + + switch (pixel_format) { + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_XRGB8888: + case DRM_FORMAT_XBGR2101010: + case DRM_FORMAT_XYUV8888: + case DRM_FORMAT_YUV444: + wd_format = WD_CAPTURE_4_PIX; + break; + case DRM_FORMAT_YUV422: + case DRM_FORMAT_RGB565: + wd_format = WD_CAPTURE_2_PIX; + break; + default: + DRM_ERROR("unsupported pixel format %x!\n", + pixel_format); + } + + return wd_format; +} + +static int intel_wd_verify_pix_format(int format) +{ + const struct drm_format_info *info = drm_format_info(format); + int pix_format = info->format; + int i = 0; + + for (i = 0; i < ARRAY_SIZE(wd_fmts); i++) + if (pix_format == wd_fmts[i]) + return 0; + + return true; +} + +static u32 intel_wd_get_stride(const struct intel_crtc_state *crtc_state, + int format) +{ + const struct drm_format_info *info = drm_format_info(format); + int wd_format; + int hactive, pixel_size; + + wd_format = intel_wd_get_format(info->format); + + switch (wd_format) { + case WD_CAPTURE_4_PIX: + pixel_size = 4; + break; + case WD_CAPTURE_2_PIX: + pixel_size = 2; + break; + default: + pixel_size = 1; + break; + } + + hactive = crtc_state->hw.adjusted_mode.crtc_hdisplay; + + return DIV_ROUND_UP(hactive * pixel_size, 64); +} + +static int intel_wd_pin_fb(struct intel_wd *intel_wd, + struct drm_framebuffer *fb) +{ + const struct i915_gtt_view view = { + .type = I915_GTT_VIEW_NORMAL, + }; + struct i915_vma *vma; + + vma = intel_pin_and_fence_fb_obj(fb, false, &view, false, + &intel_wd->flags); + + if (IS_ERR(vma)) + return PTR_ERR(vma); + + intel_wd->vma = vma; + return 0; +} + +static void intel_configure_slicing_strategy(struct drm_i915_private *i915, + struct intel_wd *intel_wd, + u32 *tmp) +{ + *tmp &= ~WD_STRAT_MASK; + if (intel_wd->slicing_strategy == 1) + *tmp |= WD_SLICING_STRAT_1_1; + else if (intel_wd->slicing_strategy == 2) + *tmp |= WD_SLICING_STRAT_2_1; + else if (intel_wd->slicing_strategy == 3) + *tmp |= WD_SLICING_STRAT_4_1; + else if (intel_wd->slicing_strategy == 4) + *tmp |= WD_SLICING_STRAT_8_1; + + intel_de_write(i915, WD_STREAMCAP_CTL(intel_wd->trans), + *tmp); +} + +static enum drm_mode_status +intel_wd_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) +{ + return MODE_OK; +} + +static int intel_wd_get_modes(struct drm_connector *connector) +{ + return 0; +} + +static void intel_wd_get_config(struct intel_encoder *encoder, + struct intel_crtc_state *pipe_config) +{ + struct intel_crtc *intel_crtc = + to_intel_crtc(pipe_config->uapi.crtc); + + if (intel_crtc) { + memcpy(pipe_config, intel_crtc->config, + sizeof(*pipe_config)); + pipe_config->output_types |= BIT(INTEL_OUTPUT_WD); + } +} + +static int intel_wd_compute_config(struct intel_encoder *encoder, + struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state) +{ + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); + struct drm_writeback_job *job; + + job = intel_get_writeback_job_from_queue(intel_wd); + if (job || conn_state->writeback_job) { + /* + * Saving reference of pipe/crtc for later use if + * writeback job is present + */ + intel_wd->wd_crtc = to_intel_crtc(pipe_config->uapi.crtc); + return 0; + } + + return 0; +} + +static void intel_wd_get_power_domains(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); + intel_wakeref_t wakeref; + + wakeref = intel_display_power_get(i915, encoder->power_domain); + + intel_wd->io_wakeref[0] = wakeref; +} + +static bool intel_wd_get_hw_state(struct intel_encoder *encoder, + enum pipe *pipe) +{ + bool ret = false; + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; + intel_wakeref_t wakeref; + u32 tmp; + + if (wd_crtc) + return false; + + wakeref = intel_display_power_get_if_enabled(dev_priv, + encoder->power_domain); + + if (!wakeref) + goto out; + + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); + ret = tmp & WD_TRANS_ACTIVE; + if (ret) { + *pipe = wd_crtc->pipe; + return true; + } + +out: + intel_display_power_put(dev_priv, encoder->power_domain, wakeref); + return false; +} + +static int intel_wd_encoder_atomic_check(struct drm_encoder *encoder, + struct drm_crtc_state *crtc_st, + struct drm_connector_state *conn_st) +{ + /* Check for the format and buffers and property validity */ + struct drm_framebuffer *fb; + struct drm_writeback_job *job = conn_st->writeback_job; + struct drm_i915_private *i915 = to_i915(encoder->dev); + const struct drm_display_mode *mode = &crtc_st->mode; + int ret; + + if (!job) { + drm_dbg_kms(&i915->drm, "No writeback job created returning\n"); + return -EINVAL; + } + + fb = job->fb; + if (!fb) { + drm_dbg_kms(&i915->drm, "Invalid framebuffer\n"); + return -EINVAL; + } + + if (fb->width != mode->hdisplay || fb->height != mode->vdisplay) { + drm_dbg_kms(&i915->drm, "Invalid framebuffer size %ux%u\n", + fb->width, fb->height); + return -EINVAL; + } + + ret = intel_wd_verify_pix_format(fb->format->format); + if (ret) { + drm_dbg_kms(&i915->drm, "Unsupported framebuffer format %08x\n", + fb->format->format); + return -EINVAL; + } + + return 0; +} + + +static const struct drm_encoder_helper_funcs wd_encoder_helper_funcs = { + .atomic_check = intel_wd_encoder_atomic_check, +}; + +static void intel_wd_connector_destroy(struct drm_connector *connector) +{ + drm_connector_cleanup(connector); +} + +static enum drm_connector_status +intel_wd_connector_detect(struct drm_connector *connector, bool force) +{ + return connector_status_connected; +} + +static const struct drm_connector_funcs wb_connector_funcs = { + .detect = intel_wd_connector_detect, + .reset = drm_atomic_helper_connector_reset, + .destroy = intel_wd_connector_destroy, + .fill_modes = drm_helper_probe_single_connector_modes, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, +}; + +static const struct drm_connector_helper_funcs wb_connector_helper_funcs = { + .get_modes = intel_wd_get_modes, + .mode_valid = intel_wd_mode_valid, +}; + +static const struct drm_encoder_funcs drm_writeback_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static bool intel_fastset_dis(struct intel_encoder *encoder, + struct intel_crtc_state *pipe_config) +{ + return false; +} + +static void intel_wd_connector_init(struct intel_wd *intel_wd) +{ + drm_atomic_helper_connector_reset(&intel_wd->wb_conn.base); +} + +static void intel_wd_disable_capture(struct intel_wd *intel_wd) +{ + struct drm_i915_private *dev_priv = to_i915(intel_wd->base.base.dev); + u32 tmp; + + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), 0xFF); + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); + tmp &= WD_TRANS_DISABLE; + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans)); +} + +void intel_wd_init(struct drm_i915_private *i915, enum transcoder trans) +{ + struct intel_wd *intel_wd; + struct intel_encoder *encoder; + struct drm_writeback_connector *wb_conn; + int n_formats = ARRAY_SIZE(wd_fmts); + struct drm_encoder *drm_enc; + int err, ret; + + intel_wd = kzalloc(sizeof(*intel_wd), GFP_KERNEL); + if (!intel_wd) + return; + + intel_wd_connector_init(intel_wd); + encoder = &intel_wd->base; + drm_enc = &encoder->base; + wb_conn = &intel_wd->wb_conn; + intel_wd->trans = trans; + intel_wd->triggered_cap_mode = 1; + intel_wd->frame_num = 1; + intel_wd->slicing_strategy = 1; + encoder->get_config = intel_wd_get_config; + encoder->compute_config = intel_wd_compute_config; + encoder->get_hw_state = intel_wd_get_hw_state; + encoder->type = INTEL_OUTPUT_WD; + encoder->cloneable = 0; + encoder->pipe_mask = ~0; + encoder->power_domain = POWER_DOMAIN_TRANSCODER_B; + encoder->get_power_domains = intel_wd_get_power_domains; + encoder->initial_fastset_check = intel_fastset_dis; + + drm_encoder_helper_add(drm_enc, + &wd_encoder_helper_funcs); + + drm_enc->possible_crtcs = ~0; + ret = drm_encoder_init(&i915->drm, drm_enc, + &drm_writeback_encoder_funcs, + DRM_MODE_ENCODER_VIRTUAL, NULL); + + if (ret) { + drm_dbg_kms(&i915->drm, + "Writeback drm_encoder init Failed: %d\n", + ret); + goto cleanup; + } + + err = drm_writeback_connector_init_with_encoder(&i915->drm, + wb_conn, drm_enc, &wb_connector_funcs, + wd_fmts, n_formats); + + if (err != 0) { + drm_dbg_kms(&i915->drm, + "drm_writeback_connector_init: Failed: %d\n", + err); + goto cleanup; + } + + wb_conn->base.encoder = drm_enc; + drm_connector_helper_add(&wb_conn->base, &wb_connector_helper_funcs); + wb_conn->base.status = connector_status_connected; + return; + +cleanup: + kfree(intel_wd); + return; +} + +static void intel_wd_writeback_complete(struct intel_wd *intel_wd, + struct drm_writeback_job *job, + int status) +{ + struct drm_writeback_connector *wb_conn = + &intel_wd->wb_conn; + drm_writeback_signal_completion(wb_conn, status); +} + +static int intel_wd_setup_transcoder(struct intel_wd *intel_wd, + struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state, + struct drm_writeback_job *job) +{ + struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc); + enum pipe pipe = intel_crtc->pipe; + struct drm_framebuffer *fb; + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct drm_gem_object *wd_fb_obj; + int ret; + u32 stride, tmp; + u16 hactive, vactive; + + fb = job->fb; + wd_fb_obj = fb->obj[0]; + if (!wd_fb_obj) { + drm_dbg_kms(&dev_priv->drm, "No framebuffer gem object created\n"); + return -EINVAL; + } + + ret = intel_wd_pin_fb(intel_wd, fb); + drm_WARN_ON(&dev_priv->drm, ret != 0); + /* Write stride and surface registers in that particular order */ + stride = intel_wd_get_stride(pipe_config, fb->format->format); + + tmp = intel_de_read(dev_priv, WD_STRIDE(intel_wd->trans)); + tmp &= ~WD_STRIDE_MASK; + tmp |= (stride << WD_STRIDE_SHIFT); + + intel_de_write(dev_priv, WD_STRIDE(intel_wd->trans), tmp); + + tmp = intel_de_read(dev_priv, WD_SURF(intel_wd->trans)); + + intel_de_write(dev_priv, WD_SURF(intel_wd->trans), + i915_ggtt_offset(intel_wd->vma)); + + tmp = intel_de_read_fw(dev_priv, WD_IIR(intel_wd->trans)); + intel_de_write_fw(dev_priv, WD_IIR(intel_wd->trans), tmp); + + tmp = ~(WD_GTT_FAULT_INT | WD_WRITE_COMPLETE_INT | WD_FRAME_COMPLETE_INT | + WD_VBLANK_INT | WD_OVERRUN_INT | WD_CAPTURING_INT); + intel_de_write_fw(dev_priv, WD_IMR(intel_wd->trans), tmp); + + if (intel_wd->stream_cap) { + tmp = intel_de_read(dev_priv, + WD_STREAMCAP_CTL(intel_wd->trans)); + tmp |= WD_STREAM_CAP_MODE_EN; + intel_configure_slicing_strategy(dev_priv, intel_wd, &tmp); + } + + hactive = pipe_config->uapi.mode.hdisplay; + vactive = pipe_config->uapi.mode.vdisplay; + tmp = intel_de_read(dev_priv, HTOTAL(intel_wd->trans)); + tmp = intel_de_read(dev_priv, VTOTAL(intel_wd->trans)); + + /* minimum hactive as per bspec: 64 pixels */ + if (hactive < 64) + drm_err(&dev_priv->drm, "hactive is less then 64 pixels\n"); + + intel_de_write(dev_priv, HTOTAL(intel_wd->trans), hactive - 1); + intel_de_write(dev_priv, VTOTAL(intel_wd->trans), vactive - 1); + + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans)); + /* select pixel format */ + tmp &= ~WD_PIX_FMT_MASK; + + switch (fb->format->format) { + default: + fallthrough; + case DRM_FORMAT_YUYV: + tmp |= WD_PIX_FMT_YUYV; + break; + case DRM_FORMAT_XYUV8888: + tmp |= WD_PIX_FMT_XYUV8888; + break; + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_XRGB8888: + tmp |= WD_PIX_FMT_XBGR8888; + break; + case DRM_FORMAT_Y410: + tmp |= WD_PIX_FMT_Y410; + break; + case DRM_FORMAT_YUV422: + tmp |= WD_PIX_FMT_YUV422; + break; + case DRM_FORMAT_XBGR2101010: + tmp |= WD_PIX_FMT_XBGR2101010; + break; + case DRM_FORMAT_RGB565: + tmp |= WD_PIX_FMT_RGB565; + break; + } + + if (intel_wd->triggered_cap_mode) + tmp |= WD_TRIGGERED_CAP_MODE_ENABLE; + + if (intel_wd->stream_cap) + tmp |= WD_CTL_POINTER_DTDH; + + /* select input pipe */ + tmp &= ~WD_INPUT_SELECT_MASK; + switch (pipe) { + default: + fallthrough; + case PIPE_A: + tmp |= WD_INPUT_PIPE_A; + break; + case PIPE_B: + tmp |= WD_INPUT_PIPE_B; + break; + case PIPE_C: + tmp |= WD_INPUT_PIPE_C; + break; + case PIPE_D: + tmp |= WD_INPUT_PIPE_D; + break; + } + + /* enable DDI buffer */ + if (!(tmp & TRANS_WD_FUNC_ENABLE)) + tmp |= TRANS_WD_FUNC_ENABLE; + + intel_de_write(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); + + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); + ret = tmp & WD_TRANS_ACTIVE; + if (!ret) { + /* enable the transcoder */ + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); + tmp |= WD_TRANS_ENABLE; + intel_de_write(dev_priv, PIPECONF(intel_wd->trans), tmp); + + /* wait for transcoder to be enabled */ + if (intel_de_wait_for_set(dev_priv, PIPECONF(intel_wd->trans), + WD_TRANS_ACTIVE, 10)) + drm_err(&dev_priv->drm, "WD transcoder could not be enabled\n"); + } + + return 0; +} + +static int intel_wd_capture(struct intel_wd *intel_wd, + struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state, + struct drm_writeback_job *job) +{ + u32 tmp; + struct drm_i915_private *i915 = to_i915(intel_wd->base.base.dev); + int ret = 0, status = 0; + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; + unsigned long flags; + + if (!job->out_fence) + drm_dbg_kms(&i915->drm, "Not able to get out_fence for job\n"); + + ret = intel_wd_setup_transcoder(intel_wd, pipe_config, + conn_state, job); + + if (ret < 0) { + drm_dbg_kms(&i915->drm, + "WD transcoder setup not completed aborting capture\n"); + return -1; + } + + if (!wd_crtc) { + drm_err(&i915->drm, "CRTC not attached\n"); + return -1; + } + + tmp = intel_de_read_fw(i915, WD_TRANS_FUNC_CTL(intel_wd->trans)); + tmp |= START_TRIGGER_FRAME; + tmp &= ~WD_FRAME_NUMBER_MASK; + tmp |= intel_wd->frame_num; + intel_de_write_fw(i915, WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); + + if (!intel_de_wait_for_set(i915, WD_IIR(intel_wd->trans), + WD_FRAME_COMPLETE_INT, 100)){ + drm_dbg_kms(&i915->drm, "frame captured\n"); + status = 0; + } else { + drm_dbg_kms(&i915->drm, "frame not captured triggering stop frame\n"); + tmp = intel_de_read(i915, WD_TRANS_FUNC_CTL(intel_wd->trans)); + tmp |= STOP_TRIGGER_FRAME; + intel_de_write(i915, WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); + status = -1; + } + + intel_wd_writeback_complete(intel_wd, job, status); + if (wd_crtc->wd.e) { + spin_lock_irqsave(&i915->drm.event_lock, flags); + drm_dbg_kms(&i915->drm, "send %p\n", wd_crtc->wd.e); + drm_crtc_send_vblank_event(&wd_crtc->base, + wd_crtc->wd.e); + spin_unlock_irqrestore(&i915->drm.event_lock, flags); + wd_crtc->wd.e = NULL; + } else { + drm_err(&i915->drm, "Event NULL! %p, %p\n", &i915->drm, + wd_crtc); + } + if (!intel_get_writeback_job_from_queue(intel_wd)) + intel_wd_disable_capture(intel_wd); + return 0; +} + +void intel_wd_enable_capture(struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state) +{ + struct drm_i915_private *i915 = + to_i915(conn_state->connector->dev); + struct drm_writeback_connector *wb_conn = + drm_connector_to_writeback(conn_state->connector); + struct intel_wd *intel_wd = wb_conn_to_intel_wd(wb_conn); + struct drm_writeback_job *job; + + job = intel_get_writeback_job_from_queue(intel_wd); + if (!job) { + drm_dbg_kms(&i915->drm, + "job queue is empty not capturing any frame\n"); + return; + } + + intel_wd_capture(intel_wd, pipe_config, + conn_state, job); + intel_wd->frame_num += 1; +} + +void intel_wd_set_vblank_event(struct intel_atomic_state *state, struct intel_crtc *intel_crtc, + struct intel_crtc_state *intel_crtc_state) +{ + struct drm_i915_private *i915 = to_i915(intel_crtc->base.dev); + struct drm_crtc_state *crtc_state = &intel_crtc_state->uapi; + struct intel_encoder *encoder; + struct intel_wd *intel_wd; + struct drm_connector_state *conn_state; + struct drm_connector *connector; + int i; + + for_each_intel_encoder(&i915->drm, encoder) { + if (encoder->type != INTEL_OUTPUT_WD) + continue; + + intel_wd = enc_to_intel_wd(encoder); + if (!intel_wd->wd_crtc) + return; + } + + if (intel_wd && intel_crtc == intel_wd->wd_crtc) { + for_each_new_connector_in_state(&state->base, connector, conn_state, + i) { + if (!conn_state->writeback_job) + continue; + + intel_crtc->wd.e = crtc_state->event; + crtc_state->event = NULL; + } + } +} + +void intel_wd_handle_isr(struct drm_i915_private *i915) +{ + u32 iir_value = 0; + struct intel_encoder *encoder; + struct intel_wd *intel_wd; + + iir_value = intel_de_read(i915, WD_IIR(TRANSCODER_WD_0)); + + for_each_intel_encoder(&i915->drm, encoder) { + + if (encoder->type != INTEL_OUTPUT_WD) + continue; + + intel_wd = enc_to_intel_wd(encoder); + if (!intel_wd->wd_crtc) { + drm_err(&i915->drm, "NO CRTC attached with WD\n"); + goto clear_iir; + } + } + + if (iir_value & WD_FRAME_COMPLETE_INT) + return; + +clear_iir: + intel_de_write(i915, WD_IIR(TRANSCODER_WD_0), iir_value); +} diff --git a/drivers/gpu/drm/i915/display/intel_wd.h b/drivers/gpu/drm/i915/display/intel_wd.h new file mode 100644 index 000000000000..0fcd1a746593 --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wd.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: MIT*/ +/* + * Copyright © 2022 Intel Corporation + */ + +#ifndef _INTEL_WD_H +#define _INTEL_WD_H + +#include <drm/drm_crtc.h> + +#include "intel_display_types.h" + +#define I915_MAX_WD_TANSCODERS 2 + +struct intel_wd { + struct intel_encoder base; + struct drm_writeback_connector wb_conn; + struct intel_crtc *wd_crtc; + intel_wakeref_t io_wakeref[I915_MAX_WD_TANSCODERS]; + enum transcoder trans; + struct i915_vma *vma; + unsigned long flags; + struct drm_writeback_job *job; + int triggered_cap_mode; + int frame_num; + bool stream_cap; + bool start_capture; + int slicing_strategy; +}; + +static inline struct intel_wd *enc_to_intel_wd(struct intel_encoder *encoder) +{ + return container_of(&encoder->base, struct intel_wd, base.base); +} + +static inline struct intel_wd *wb_conn_to_intel_wd(struct drm_writeback_connector *wb_conn) +{ + return container_of(wb_conn, struct intel_wd, wb_conn); +} + +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder trans); +void intel_wd_enable_capture(struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state); +void intel_wd_handle_isr(struct drm_i915_private *dev_priv); +void intel_wd_set_vblank_event(struct intel_atomic_state *state, struct intel_crtc *crtc, + struct intel_crtc_state *crtc_state); +struct drm_writeback_job *intel_get_writeback_job_from_queue(struct intel_wd *intel_wd); +#endif/* _INTEL_WD_H */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 55794b87a6c1..503a21c77d14 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -34,6 +34,7 @@ #include <linux/pm_qos.h> +#include <drm/drm_writeback.h> #include <drm/ttm/ttm_device.h> #include "display/intel_display.h" diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 86a42d9e8041..ee0255d9eb64 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -42,6 +42,7 @@ #include "display/intel_hotplug.h" #include "display/intel_lpe_audio.h" #include "display/intel_psr.h" +#include "display/intel_wd.h" #include "gt/intel_breadcrumbs.h" #include "gt/intel_gt.h" @@ -2342,6 +2343,11 @@ gen8_de_misc_irq_handler(struct drm_i915_private *dev_priv, u32 iir) found = true; } + if (iir & GEN8_DE_MISC_WD0) { + intel_wd_handle_isr(dev_priv); + found = true; + } + if (iir & GEN8_DE_EDP_PSR) { struct intel_encoder *encoder; u32 psr_iir; @@ -3767,7 +3773,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) u32 de_pipe_enables; u32 de_port_masked = gen8_de_port_aux_mask(dev_priv); u32 de_port_enables; - u32 de_misc_masked = GEN8_DE_EDP_PSR; + u32 de_misc_masked = GEN8_DE_EDP_PSR | GEN8_DE_MISC_WD0; u32 trans_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | BIT(TRANSCODER_C) | BIT(TRANSCODER_D); enum pipe pipe; diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 19fc00bcd7b9..d6eb63aefc47 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -868,7 +868,8 @@ static const struct intel_device_info jsl_info = { .__runtime.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \ .__runtime.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \ BIT(TRANSCODER_C) | BIT(TRANSCODER_D) | \ - BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1), \ + BIT(TRANSCODER_DSI_0) | BIT(TRANSCODER_DSI_1) | \ + BIT(TRANSCODER_WD_0), \ .display.pipe_offsets = { \ [TRANSCODER_A] = PIPE_A_OFFSET, \ [TRANSCODER_B] = PIPE_B_OFFSET, \ @@ -876,6 +877,8 @@ static const struct intel_device_info jsl_info = { [TRANSCODER_D] = PIPE_D_OFFSET, \ [TRANSCODER_DSI_0] = PIPE_DSI0_OFFSET, \ [TRANSCODER_DSI_1] = PIPE_DSI1_OFFSET, \ + [TRANSCODER_WD_0] = PIPE_WD0_OFFSET, \ + [TRANSCODER_WD_1] = PIPE_WD1_OFFSET, \ }, \ .display.trans_offsets = { \ [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ @@ -884,6 +887,8 @@ static const struct intel_device_info jsl_info = { [TRANSCODER_D] = TRANSCODER_D_OFFSET, \ [TRANSCODER_DSI_0] = TRANSCODER_DSI0_OFFSET, \ [TRANSCODER_DSI_1] = TRANSCODER_DSI1_OFFSET, \ + [TRANSCODER_WD_0] = TRANSCODER_WD0_OFFSET, \ + [TRANSCODER_WD_1] = TRANSCODER_WD1_OFFSET, \ }, \ TGL_CURSOR_OFFSETS, \ .has_global_mocs = 1, \