* [Intel-gfx] [RFC PATCH 0/2] Patches to enable writeback in i915
@ 2022-02-23 6:20 Suraj Kandpal
2022-02-23 6:20 ` [Intel-gfx] [RFC PATCH 1/2] drm/i915: Define WD trancoder for i915 Suraj Kandpal
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Suraj Kandpal @ 2022-02-23 6:20 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
These patches introduce the set of definitions and functions to
enable writeback functionality using the interrupt mechanism in
i915 driver.
They work on top of the previous set of patch series floated by me which
is still in review and can be found below
https://patchwork.freedesktop.org/series/99610/
Suraj Kandpal (2):
drm/i915: Define WD trancoder for i915
drm/i915: Enabling WD Transcoder
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/display/intel_acpi.c | 1 +
drivers/gpu/drm/i915/display/intel_display.c | 78 +-
drivers/gpu/drm/i915/display/intel_display.h | 15 +
.../drm/i915/display/intel_display_types.h | 17 +
drivers/gpu/drm/i915/display/intel_dpll.c | 6 +
drivers/gpu/drm/i915/display/intel_opregion.c | 3 +
.../gpu/drm/i915/display/intel_wb_connector.h | 20 +
drivers/gpu/drm/i915/display/intel_wd.c | 769 ++++++++++++++++++
drivers/gpu/drm/i915/display/intel_wd.h | 70 ++
drivers/gpu/drm/i915/i915_drv.h | 2 +
drivers/gpu/drm/i915/i915_irq.c | 8 +-
drivers/gpu/drm/i915/i915_pci.c | 7 +-
drivers/gpu/drm/i915/i915_reg.h | 133 +++
14 files changed, 1127 insertions(+), 3 deletions(-)
create mode 100644 drivers/gpu/drm/i915/display/intel_wb_connector.h
create mode 100644 drivers/gpu/drm/i915/display/intel_wd.c
create mode 100644 drivers/gpu/drm/i915/display/intel_wd.h
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [Intel-gfx] [RFC PATCH 1/2] drm/i915: Define WD trancoder for i915 2022-02-23 6:20 [Intel-gfx] [RFC PATCH 0/2] Patches to enable writeback in i915 Suraj Kandpal @ 2022-02-23 6:20 ` Suraj Kandpal 2022-02-23 6:20 ` [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder Suraj Kandpal 2022-02-23 8:39 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Patches to enable writeback in i915 Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Suraj Kandpal @ 2022-02-23 6:20 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula Adding WD Types, WD transcoder to enum list and WD Transcoder offsets Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com> --- drivers/gpu/drm/i915/display/intel_display.h | 6 ++++++ drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 11d6134c53c8..30b639051e64 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -119,6 +119,8 @@ enum transcoder { TRANSCODER_DSI_1, TRANSCODER_DSI_A = TRANSCODER_DSI_0, /* legacy DSI */ TRANSCODER_DSI_C = TRANSCODER_DSI_1, /* legacy DSI */ + TRANSCODER_WD_0, + TRANSCODER_WD_1, I915_MAX_TRANSCODERS }; @@ -140,6 +142,10 @@ static inline const char *transcoder_name(enum transcoder transcoder) return "DSI A"; case TRANSCODER_DSI_C: return "DSI C"; + case TRANSCODER_WD_0: + return "WD 0"; + case TRANSCODER_WD_1: + return "WD 1"; default: return "<invalid>"; } diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index b50d0e6efe21..2b137909e0ab 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -78,6 +78,7 @@ enum intel_output_type { INTEL_OUTPUT_DSI = 9, INTEL_OUTPUT_DDI = 10, INTEL_OUTPUT_DP_MST = 11, + INTEL_OUTPUT_WD = 12, }; enum hdmi_force_audio { diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 2b8a3086ed35..912384eee068 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2019,6 +2019,8 @@ #define TRANSCODER_EDP_OFFSET 0x6f000 #define TRANSCODER_DSI0_OFFSET 0x6b000 #define TRANSCODER_DSI1_OFFSET 0x6b800 +#define TRANSCODER_WD0_OFFSET 0x6e000 +#define TRANSCODER_WD1_OFFSET 0x6e800 #define HTOTAL(trans) _MMIO_TRANS2(trans, _HTOTAL_A) #define HBLANK(trans) _MMIO_TRANS2(trans, _HBLANK_A) -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder 2022-02-23 6:20 [Intel-gfx] [RFC PATCH 0/2] Patches to enable writeback in i915 Suraj Kandpal 2022-02-23 6:20 ` [Intel-gfx] [RFC PATCH 1/2] drm/i915: Define WD trancoder for i915 Suraj Kandpal @ 2022-02-23 6:20 ` Suraj Kandpal 2022-02-23 8:39 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Patches to enable writeback in i915 Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Suraj Kandpal @ 2022-02-23 6:20 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula 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_display.c | 78 +- drivers/gpu/drm/i915/display/intel_display.h | 9 + .../drm/i915/display/intel_display_types.h | 16 + drivers/gpu/drm/i915/display/intel_dpll.c | 6 + drivers/gpu/drm/i915/display/intel_opregion.c | 3 + .../gpu/drm/i915/display/intel_wb_connector.h | 20 + drivers/gpu/drm/i915/display/intel_wd.c | 769 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wd.h | 70 ++ drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_irq.c | 8 +- drivers/gpu/drm/i915/i915_pci.c | 7 +- drivers/gpu/drm/i915/i915_reg.h | 131 +++ 14 files changed, 1118 insertions(+), 3 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_wb_connector.h 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 9d588d936e3d..3e2e0162115b 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -285,6 +285,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_display.c b/drivers/gpu/drm/i915/display/intel_display.c index e2ca70696c05..f7297da7c375 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -110,6 +110,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" @@ -1548,6 +1549,69 @@ static void intel_encoders_update_complete(struct intel_atomic_state *state) } } +static void intel_queue_writeback_job(struct intel_atomic_state *state, + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct intel_wd *intel_wd; + struct intel_encoder *encoder; + int i; + + for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { + intel_wd = enc_to_intel_wd(encoder); + + if (intel_wd->wd_crtc != intel_crtc) + return; + + } + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + if (!new_conn_state->writeback_job) + continue; + + drm_writeback_queue_job(connector->wb_connector, new_conn_state); + drm_dbg_kms(&dev_priv->drm, "queueing writeback job\n"); + } +} + +static void intel_find_writeback_connector(struct intel_atomic_state *state, + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct intel_wd *intel_wd; + struct intel_encoder *encoder; + int i; + + for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { + intel_wd = enc_to_intel_wd(encoder); + + if (intel_wd->wd_crtc != intel_crtc) + return; + + } + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + struct intel_connector *intel_connector; + + intel_connector = to_intel_connector(connector); + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", + connector->base.id, connector->name, + drm_get_connector_status_name(connector->status)); + encoder = intel_connector_primary_encoder(intel_connector); + if (encoder->type == INTEL_OUTPUT_WD) { + drm_dbg_kms(&dev_priv->drm, "encoder intel_output_wd found\n"); + intel_wd_enable_capture(encoder, crtc_state, new_conn_state); + } + } + +} + static void intel_encoders_pre_pll_enable(struct intel_atomic_state *state, struct intel_crtc *crtc) { @@ -1948,7 +2012,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; @@ -5169,6 +5234,7 @@ static const char * const output_type_str[] = { OUTPUT_TYPE(DSI), OUTPUT_TYPE(DDI), OUTPUT_TYPE(DP_MST), + OUTPUT_TYPE(WD), }; #undef OUTPUT_TYPE @@ -8390,6 +8456,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) } } + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { + intel_wd_set_vblank_event(crtc, new_crtc_state); + } + intel_encoders_update_prepare(state); intel_dbuf_pre_plane_update(state); @@ -8475,6 +8545,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) intel_sagv_post_plane_update(state); + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { + intel_queue_writeback_job(state, crtc, new_crtc_state); + intel_find_writeback_connector(state, crtc, new_crtc_state); + } + drm_atomic_helper_commit_hw_done(&state->base); if (state->modeset) { @@ -8779,6 +8854,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) intel_ddi_init(dev_priv, PORT_TC1); intel_ddi_init(dev_priv, PORT_TC2); } else if (DISPLAY_VER(dev_priv) >= 12) { + intel_wd_init(dev_priv, TRANSCODER_WD_0); intel_ddi_init(dev_priv, PORT_A); intel_ddi_init(dev_priv, PORT_B); intel_ddi_init(dev_priv, PORT_TC1); diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 30b639051e64..a8d167eb7242 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -156,6 +156,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. @@ -467,6 +472,10 @@ enum hpd_pin { for_each_intel_encoder((dev), (intel_encoder)) \ for_each_if(intel_encoder_can_psr(intel_encoder)) +#define for_each_intel_encoder_with_wd(dev, intel_encoder) \ + for_each_intel_encoder(dev, intel_encoder) \ + for_each_if(intel_encoder_is_wd(intel_encoder)) + #define for_each_intel_connector_iter(intel_connector, iter) \ while ((intel_connector = to_intel_connector(drm_connector_list_iter_next(iter)))) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 2b137909e0ab..3afc87590990 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -43,6 +43,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" @@ -539,6 +540,8 @@ struct intel_connector { struct work_struct modeset_retry_work; struct intel_hdcp hdcp; + + struct drm_writeback_connector wb_conn; }; struct intel_digital_connector_state { @@ -1285,6 +1288,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 */ @@ -1403,6 +1411,7 @@ struct cxsr_latency { #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_connector(x) container_of(x, struct intel_connector, base) +#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) @@ -1834,6 +1843,13 @@ static inline bool intel_encoder_is_dp(struct intel_encoder *encoder) } } +static inline bool intel_encoder_is_wd(struct intel_encoder *encoder) +{ + if (encoder->type == INTEL_OUTPUT_WD) + return true; + return false; +} + static inline struct intel_lspcon * enc_to_intel_lspcon(struct intel_encoder *encoder) { diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c index 14f5ffe27d05..dabedf2a34ff 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll.c +++ b/drivers/gpu/drm/i915/display/intel_dpll.c @@ -947,6 +947,12 @@ static int hsw_crtc_compute_clock(struct intel_crtc_state *crtc_state) if (IS_DG2(dev_priv)) return intel_mpllb_calc_state(crtc_state, encoder); + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_WD)) { + pr_alert("%s: %d: output type: 0x%x", + __func__, __LINE__, crtc_state->output_types); + 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_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index f31e8c3f8ce0..b7a0ac9bad05 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.c +++ b/drivers/gpu/drm/i915/display/intel_opregion.c @@ -370,6 +370,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_wb_connector.h b/drivers/gpu/drm/i915/display/intel_wb_connector.h new file mode 100644 index 000000000000..8063a9273bc7 --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wb_connector.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2020 Intel Corporation + */ + +#ifndef __INTEL_WB_CONNECTOR_H__ +#define __INTEL_WB_CONNECTOR_H__ + +#include "intel_display.h" + +struct intel_wb_connector *intel_wb_connector_alloc(void); +void intel_wb_connector_free(struct intel_wb_connector *connector); +void intel_wb_connector_destroy(struct drm_connector *connector); +bool intel_wb_connector_get_hw_state(struct intel_wb_connector *connector); +enum pipe intel_wb_connector_get_pipe(struct intel_wb_connector *connector); +void intel_wb_connector_attach_encoder(struct intel_wb_connector *connector, + struct intel_encoder *encoder); + +#endif /* __INTEL_WB_CONNECTOR_H__ */ + 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..ac9b4560c0f3 --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wd.c @@ -0,0 +1,769 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright © 2021 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Suraj Kandpal <suraj.kandpal@intel.com> + * Arun Murthy <arun.r.murthy@intel.com> + * + */ + +#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; + +static struct drm_writeback_job +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd) +{ + struct drm_writeback_job *job; + struct drm_i915_private *dev_priv = to_i915(intel_wd->base.base.dev); + struct drm_writeback_connector *wb_conn = + intel_wd->attached_connector->base.wb_connector; + 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(&dev_priv->drm, "job queue is empty\n"); + return NULL; + } + + return job; +} + +void print_connectors(struct drm_i915_private *dev_priv) +{ + struct drm_connector *connector; + struct drm_connector_list_iter conn_iter; + struct intel_connector *intel_connector; + + drm_modeset_lock_all(&dev_priv->drm); + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + intel_connector = to_intel_connector(connector); + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", + connector->base.id, connector->name, + drm_get_connector_status_name(connector->status)); + } + drm_connector_list_iter_end(&conn_iter); + drm_modeset_unlock_all(&dev_priv->drm); +} + +/*Check with Spec*/ +static const u32 wb_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(wb_fmts); i++) + if (pix_format == wb_fmts[i]) + return 0; + + return 1; +} + +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_ggtt_view view = { + .type = I915_GGTT_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 *dev_priv, + 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(dev_priv, 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) +{ + drm_dbg_kms(connector->dev, ":"); + 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 drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_crtc *intel_crtc = + to_intel_crtc(pipe_config->uapi.crtc); + + drm_dbg_kms(&dev_priv->drm, "\n"); + if (intel_crtc) { + memcpy(pipe_config, intel_crtc->config, + sizeof(*pipe_config)); + pipe_config->output_types |= BIT(INTEL_OUTPUT_WD); + drm_dbg_kms(&dev_priv->drm, "crtc found\n"); + } + +} + +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_i915_private *dev_priv = to_i915(encoder->base.dev); + struct drm_writeback_job *job; + + drm_dbg_kms(&dev_priv->drm, "\n"); + job = intel_get_writeback_job_from_queue(intel_wd); + if (job || conn_state->writeback_job) { + intel_wd->wd_crtc = to_intel_crtc(pipe_config->uapi.crtc); + return 0; + } + drm_dbg_kms(&dev_priv->drm, "No writebackjob in queue\n"); + + return 0; +} + +static void intel_wd_get_power_domains(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state) +{ + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); + intel_wakeref_t wakeref; + + wakeref = intel_display_power_get(dev_priv, + encoder->power_domain); + + intel_wd->io_wakeref[0] = wakeref; + drm_dbg_kms(encoder->base.dev, "\n"); +} + +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); + drm_dbg_kms(encoder->base.dev, "power enabled : %s\n", + !wakeref ? "false":"true"); + + if (!wakeref) + return false; + + tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); + ret = tmp & WD_TRANS_ACTIVE; + drm_dbg_kms(encoder->base.dev, "trancoder enabled: %s\n", + ret ? "true":"false"); + if (ret) { + *pipe = wd_crtc->pipe; + drm_dbg_kms(encoder->base.dev, "pipe selected is %d\n", + wd_crtc->pipe); + } + return true; +} + +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 *dev_priv = to_i915(encoder->dev); + const struct drm_display_mode *mode = &crtc_st->mode; + int ret; + + drm_dbg_kms(&dev_priv->drm, "\n"); + + if (!job) { + drm_dbg_kms(&dev_priv->drm, "No writeback job created returning\n"); + return -EINVAL; + } + + fb = job->fb; + + if (!fb) { + drm_dbg_kms(&dev_priv->drm, "Invalid framebuffer\n"); + return -EINVAL; + } + + if (fb->width != mode->hdisplay || fb->height != mode->vdisplay) { + drm_dbg_kms(&dev_priv->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(&dev_priv->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_dbg_kms(connector->dev, "\n"); + drm_connector_cleanup(connector); + kfree(connector); +} + +static enum drm_connector_status +intel_wb_connector_detect(struct drm_connector *connector, bool force) +{ + drm_dbg_kms(connector->dev, "Writeback connector connected\n"); + return connector_status_connected; +} + + +static const struct drm_connector_funcs wd_connector_funcs = { + .detect = intel_wb_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 = intel_digital_connector_duplicate_state, +}; + +static const struct drm_connector_helper_funcs wd_connector_helper_funcs = { + .get_modes = intel_wd_get_modes, + .mode_valid = intel_wd_mode_valid, +}; + +static bool intel_fastset_dis(struct intel_encoder *encoder, + struct intel_crtc_state *pipe_config) +{ + pipe_config->uapi.mode_changed = true; + drm_dbg_kms(encoder->base.dev, "\n"); + return false; +} + +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder trans) +{ + struct intel_wd *intel_wd; + struct intel_encoder *encoder; + struct intel_connector *intel_connector; + struct drm_writeback_connector *wb_conn; + int n_formats = ARRAY_SIZE(wb_fmts); + int err; + + drm_dbg_kms(&dev_priv->drm, "\n"); + intel_wd = kzalloc(sizeof(*intel_wd), GFP_KERNEL); + if (!intel_wd) + return; + + intel_connector = intel_connector_alloc(); + if (!intel_connector) { + kfree(intel_wd); + return; + } + + wb_conn = &intel_connector->wb_conn; + wb_conn->base = &intel_connector->base; + wb_conn->encoder = &intel_wd->base.base; + + encoder = &intel_wd->base; + intel_wd->attached_connector = intel_connector; + 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; + intel_connector->get_hw_state = + intel_connector_get_hw_state; + + err = drm_writeback_connector_init(&dev_priv->drm, wb_conn, + &wd_connector_funcs, + &wd_encoder_helper_funcs, + wb_fmts, n_formats); + + if (err != 0) { + drm_dbg_kms(&dev_priv->drm, + "drm_writeback_connector_init: Failed: %d\n", + err); + goto cleanup; + } + + drm_connector_helper_add(wb_conn->base, &wd_connector_helper_funcs); + intel_connector_attach_encoder(intel_connector, encoder); + wb_conn->base->status = connector_status_connected; + return; + +cleanup: + kfree(intel_wd); + intel_connector_free(intel_connector); +} + +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->attached_connector->base.wb_connector; + drm_writeback_signal_completion(wb_conn, status); +} + +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 -1; + } + 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)); + drm_dbg_kms(&dev_priv->drm, "%d is the surface address\n", tmp); + + 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; + + drm_dbg_kms(&dev_priv->drm, "hactive : %d, vactive: %d\n", hactive, vactive); + + tmp = intel_de_read(dev_priv, HTOTAL(intel_wd->trans)); + drm_dbg_kms(&dev_priv->drm, "hactive_reg : %d\n", tmp); + tmp = intel_de_read(dev_priv, VTOTAL(intel_wd->trans)); + drm_dbg_kms(&dev_priv->drm, "vactive_reg : %d\n", tmp); + /* 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: + 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; + drm_dbg_kms(&dev_priv->drm, "Selected pipe is %d\n", pipe); + 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; + drm_dbg_kms(&dev_priv->drm, "Trancoder enabled: %s\n", ret ? "true":"false"); + + 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 not enabled\n"); + } + + return 0; +} + +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); + + drm_dbg_kms(&dev_priv->drm, "WD Trans_Conf value after disable = 0x%08x\n", + intel_de_read(dev_priv, PIPECONF(intel_wd->trans))); + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans)); + tmp |= ~TRANS_WD_FUNC_ENABLE; +} + +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 *dev_priv = to_i915(intel_wd->base.base.dev); + int ret = 0, status = 0; + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; + unsigned long flags; + + drm_dbg_kms(&dev_priv->drm, "\n"); + + if (!job->out_fence) + drm_dbg_kms(&dev_priv->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(&dev_priv->drm, + "wd transcoder setup not completed aborting capture\n"); + return -1; + } + + if (wd_crtc == NULL) { + DRM_ERROR("CRTC not attached\n"); + return -1; + } + + tmp = intel_de_read_fw(dev_priv, + 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(dev_priv, + WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); + + if (!intel_de_wait_for_set(dev_priv, WD_IIR(intel_wd->trans), + WD_FRAME_COMPLETE_INT, 100)){ + drm_dbg_kms(&dev_priv->drm, "frame captured\n"); + tmp = intel_de_read(dev_priv, WD_IIR(intel_wd->trans)); + drm_dbg_kms(&dev_priv->drm, "iir value : %d\n", tmp); + status = 0; + } else { + drm_dbg_kms(&dev_priv->drm, "frame not captured triggering stop frame\n"); + tmp = intel_de_read(dev_priv, + WD_TRANS_FUNC_CTL(intel_wd->trans)); + tmp |= STOP_TRIGGER_FRAME; + intel_de_write(dev_priv, + WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); + status = -1; + } + + intel_de_write(dev_priv, WD_IIR(intel_wd->trans), tmp); + intel_wd_writeback_complete(intel_wd, job, status); + if (intel_get_writeback_job_from_queue(intel_wd) == NULL) + intel_wd_disable_capture(intel_wd); + if (wd_crtc->wd.e) { + spin_lock_irqsave(&dev_priv->drm.event_lock, flags); + drm_dbg_kms(&dev_priv->drm, "send %p\n", wd_crtc->wd.e); + drm_crtc_send_vblank_event(&wd_crtc->base, + wd_crtc->wd.e); + spin_unlock_irqrestore(&dev_priv->drm.event_lock, flags); + wd_crtc->wd.e = NULL; + } else { + DRM_ERROR("Event NULL! %p, %p\n", &dev_priv->drm, + wd_crtc); + } + return 0; + +} + +void intel_wd_enable_capture(struct intel_encoder *encoder, + struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state) +{ + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_wd *intel_wd = enc_to_intel_wd(encoder); + struct drm_writeback_job *job; + + drm_dbg_kms(&dev_priv->drm, "\n"); + + job = intel_get_writeback_job_from_queue(intel_wd); + if (job == NULL) { + drm_dbg_kms(&dev_priv->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_crtc *intel_crtc, + struct intel_crtc_state *intel_crtc_state) +{ + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct drm_crtc_state *state = &intel_crtc_state->uapi; + struct intel_encoder *encoder; + struct intel_wd *intel_wd; + + for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { + intel_wd = enc_to_intel_wd(encoder); + + if (!intel_wd->wd_crtc) { + drm_dbg_kms(&dev_priv->drm, "wd crtc not found\n"); + return; + } + } + + if (intel_crtc == intel_wd->wd_crtc) { + intel_crtc->wd.e = state->event; + state->event = NULL; + if (intel_crtc->wd.e) + drm_dbg_kms(&dev_priv->drm, "WD event:%p\n", + intel_crtc->wd.e); + else + drm_dbg_kms(&dev_priv->drm, "WD no event\n"); + } +} + +void intel_wd_handle_isr(struct drm_i915_private *dev_priv) +{ + u32 iir_value = 0; + struct intel_encoder *encoder; + struct intel_wd *intel_wd; + + iir_value = intel_de_read(dev_priv, WD_IIR(TRANSCODER_WD_0)); + drm_dbg_kms(&dev_priv->drm, "\n"); + + for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { + intel_wd = enc_to_intel_wd(encoder); + + if (!intel_wd->wd_crtc) { + DRM_ERROR("NO CRTC attached with WD\n"); + goto clear_iir; + } + } + + if (iir_value & WD_VBLANK_INT) + drm_dbg_kms(&dev_priv->drm, "vblank interrupt for wd transcoder\n"); + if (iir_value & WD_WRITE_COMPLETE_INT) + drm_dbg_kms(&dev_priv->drm, + "wd write complete interrupt encountered\n"); + else + DRM_INFO("iir: %x\n", iir_value); + if (iir_value & WD_FRAME_COMPLETE_INT) { + drm_dbg_kms(&dev_priv->drm, + "frame complete interrupt for wd transcoder\n"); + return; + } +clear_iir: + intel_de_write(dev_priv, 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..d3370c392f1d --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wd.h @@ -0,0 +1,70 @@ +/* SPDX-License-Identifier: GPL-2.0 + * Copyright © 2021 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author : + * Suraj Kandpal<suraj.kandpal@intel.com> + * Arun Murthy<arun.r.murthy@intel.com> + */ + +#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 intel_crtc *wd_crtc; + intel_wakeref_t io_wakeref[I915_MAX_WD_TANSCODERS]; + struct intel_connector *attached_connector; + 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; +}; + +struct intel_wd_clk_vals { + u32 cdclk; + u16 link_m; + u16 link_n; +}; + +static inline struct intel_wd *enc_to_intel_wd(struct intel_encoder *encoder) +{ + return container_of(&encoder->base, struct intel_wd, base.base); +} +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder trans); +void intel_wd_enable_capture(struct intel_encoder *encoder, + 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_crtc *crtc, + struct intel_crtc_state *state); +#endif/* _INTEL_WD_H */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 1c2f4ae4ebf9..a90226b0dcd8 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -40,6 +40,8 @@ #include <linux/pm_qos.h> #include <drm/drm_connector.h> +#include <drm/drm_writeback.h> +#include <drm/i915_mei_hdcp_interface.h> #include <drm/ttm/ttm_device.h> #include "display/intel_bios.h" diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 73cebc6aa650..95a6a8f7a911 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 f449c454b6f8..36bbdc08fb7c 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -853,7 +853,8 @@ static const struct intel_device_info jsl_info = { .display.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \ .display.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), \ .pipe_offsets = { \ [TRANSCODER_A] = PIPE_A_OFFSET, \ [TRANSCODER_B] = PIPE_B_OFFSET, \ @@ -861,6 +862,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, \ }, \ .trans_offsets = { \ [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ @@ -869,6 +872,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, \ diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 912384eee068..7b07b61a934b 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -3790,6 +3790,11 @@ #define PIPE_DSI0_OFFSET 0x7b000 #define PIPE_DSI1_OFFSET 0x7b800 +/* WD 0 and 1 */ +#define PIPE_WD0_OFFSET 0x7e000 +#define PIPE_WD1_OFFSET 0x7d000 + + #define PIPECONF(pipe) _MMIO_PIPE2(pipe, _PIPEACONF) #define PIPEDSL(pipe) _MMIO_PIPE2(pipe, _PIPEADSL) #define PIPEFRAME(pipe) _MMIO_PIPE2(pipe, _PIPEAFRAMEHIGH) @@ -4454,6 +4459,10 @@ #define _PIPEDSI0CONF 0x7b008 #define _PIPEDSI1CONF 0x7b808 +/* WD 0 and 1 */ +#define _PIPEWD0CONF 0x7e008 +#define _PIPEWD1CONF 0x7d008 + /* Sprite A control */ #define _DVSACNTR 0x72180 #define DVS_ENABLE REG_BIT(31) @@ -5699,6 +5708,7 @@ #define GEN8_DE_MISC_IER _MMIO(0x4446c) #define GEN8_DE_MISC_GSE (1 << 27) #define GEN8_DE_EDP_PSR (1 << 19) +#define GEN8_DE_MISC_WD0 (1 << 23) #define GEN8_PCU_ISR _MMIO(0x444e0) #define GEN8_PCU_IMR _MMIO(0x444e4) @@ -8831,6 +8841,127 @@ enum skl_power_gate { #define TGL_ROOT_DEVICE_SKU_ULX 0x2 #define TGL_ROOT_DEVICE_SKU_ULT 0x4 +/* Gen12 WD */ +#define _MMIO_WD(tc, wd0, wd1) _MMIO_TRANS((tc) - TRANSCODER_WD_0, \ + wd0, wd1) + +#define WD_TRANS_ENABLE (1 << 31) +#define WD_TRANS_DISABLE 0 +#define WD_TRANS_ACTIVE (1 << 30) + +/* WD transcoder control */ +#define _WD_TRANS_FUNC_CTL_0 0x6e400 +#define _WD_TRANS_FUNC_CTL_1 0x6ec00 +#define WD_TRANS_FUNC_CTL(tc) _MMIO_WD(tc,\ + _WD_TRANS_FUNC_CTL_0,\ + _WD_TRANS_FUNC_CTL_1) + +#define TRANS_WD_FUNC_ENABLE (1 << 31) +#define WD_TRIGGERED_CAP_MODE_ENABLE (1 << 30) +#define START_TRIGGER_FRAME (1 << 29) +#define STOP_TRIGGER_FRAME (1 << 28) +#define WD_CTL_POINTER_ETEH (0 << 18) +#define WD_CTL_POINTER_ETDH (1 << 18) +#define WD_CTL_POINTER_DTDH (2 << 18) +#define WD_INPUT_SELECT_MASK (7 << 12) +#define WD_INPUT_PIPE_A (0 << 12) +#define WD_INPUT_PIPE_B (5 << 12) +#define WD_INPUT_PIPE_C (6 << 12) +#define WD_INPUT_PIPE_D (7 << 12) + +#define WD_PIX_FMT_MASK (0x3 << 20) +#define WD_PIX_FMT_YUYV (0x1 << 20) +#define WD_PIX_FMT_XYUV8888 (0x2 << 20) +#define WD_PIX_FMT_XBGR8888 (0x3 << 20) +#define WD_PIX_FMT_Y410 (0x4 << 20) +#define WD_PIX_FMT_YUV422 (0x5 << 20) +#define WD_PIX_FMT_XBGR2101010 (0x6 << 20) +#define WD_PIX_FMT_RGB565 (0x7 << 20) + +#define WD_FRAME_NUMBER_MASK 15 + +#define _WD_STRIDE_0 0x6e510 +#define _WD_STRIDE_1 0x6ed10 +#define WD_STRIDE(tc) _MMIO_WD(tc,\ + _WD_STRIDE_0,\ + _WD_STRIDE_1) +#define WD_STRIDE_SHIFT 6 +#define WD_STRIDE_MASK (0x3ff << WD_STRIDE_SHIFT) + +#define _WD_STREAMCAP_CTL0 0x6e590 +#define _WD_STREAMCAP_CTL1 0x6ed90 +#define WD_STREAMCAP_CTL(tc) _MMIO_WD(tc,\ + _WD_STREAMCAP_CTL0,\ + _WD_STREAMCAP_CTL1) + +#define WD_STREAM_CAP_MODE_EN (1 << 31) +#define WD_STRAT_MASK (3 << 24) +#define WD_SLICING_STRAT_1_1 (0 << 24) +#define WD_SLICING_STRAT_2_1 (1 << 24) +#define WD_SLICING_STRAT_4_1 (2 << 24) +#define WD_SLICING_STRAT_8_1 (3 << 24) +#define WD_STREAM_OVERRUN_STATUS 1 + +#define _WD_SURF_0 0x6e514 +#define _WD_SURF_1 0x6ed14 +#define WD_SURF(tc) _MMIO_WD(tc,\ + _WD_SURF_0,\ + _WD_SURF_1) + +#define _WD_IMR_0 0x6e560 +#define _WD_IMR_1 0x6ed60 +#define WD_IMR(tc) _MMIO_WD(tc,\ + _WD_IMR_0,\ + _WD_IMR_1) +#define WD_FRAME_COMPLETE_INT (1 << 7) +#define WD_GTT_FAULT_INT (1 << 6) +#define WD_VBLANK_INT (1 << 5) +#define WD_OVERRUN_INT (1 << 4) +#define WD_CAPTURING_INT (1 << 3) +#define WD_WRITE_COMPLETE_INT (1 << 2) + +#define _WD_IIR_0 0x6e564 +#define _WD_IIR_1 0x6ed64 +#define WD_IIR(tc) _MMIO_WD(tc,\ + _WD_IIR_0,\ + _WD_IIR_1) + +#define _WD_FRAME_STATUS_0 0x6e56b +#define _WD_FRAME_STATUS_1 0x6ed6b +#define WD_FRAME_STATUS(tc) _MMIO_WD(tc,\ + _WD_FRAME_STATUS_0,\ + _WD_FRAME_STATUS_1) + +#define WD_FRAME_COMPLETE (1 << 31) +#define WD_STATE_IDLE (0 << 24) +#define WD_STATE_CAPSTART (1 << 24) +#define WD_STATE_FRAME_START (2 << 24) +#define WD_STATE_CAPACITIVE (3 << 24) +#define WD_STATE_TG_DONE (4 << 24) +#define WD_STATE_WDX_DONE (5 << 24) +#define WD_STATE_QUICK_CAP (6 << 24) + +#define _WD_27_M_0 0x6e524 +#define _WD_27_M_1 0x6ed24 +#define WD_27_M(tc) _MMIO_WD(tc,\ + _WD_27_M_0,\ + _WD_27_M_1) + +#define _WD_27_N_0 0x6e528 + +//Address looks wrong in bspec: +#define _WD_27_N_1 0x6ec28 +#define WD_27_N(tc) _MMIO_WD(tc,\ + _WD_27_N_0,\ + _WD_27_N_1) + +#define _WD_TAIL_CFG_0 0x6e520 +#define _WD_TAIL_CFG_1 0x6ed20 + +#define WD_TAIL_CFG(tc) _MMIO_WD(tc,\ + _WD_TAIL_CFG_0,\ + _WD_TAIL_CFG_1) + #define CLKREQ_POLICY _MMIO(0x101038) #define CLKREQ_POLICY_MEM_UP_OVRD REG_BIT(1) -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for Patches to enable writeback in i915 2022-02-23 6:20 [Intel-gfx] [RFC PATCH 0/2] Patches to enable writeback in i915 Suraj Kandpal 2022-02-23 6:20 ` [Intel-gfx] [RFC PATCH 1/2] drm/i915: Define WD trancoder for i915 Suraj Kandpal 2022-02-23 6:20 ` [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder Suraj Kandpal @ 2022-02-23 8:39 ` Patchwork 2 siblings, 0 replies; 6+ messages in thread From: Patchwork @ 2022-02-23 8:39 UTC (permalink / raw) To: Kandpal, Suraj; +Cc: intel-gfx == Series Details == Series: Patches to enable writeback in i915 URL : https://patchwork.freedesktop.org/series/100617/ State : failure == Summary == CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh DESCEND objtool CHK include/generated/compile.h CC [M] drivers/gpu/drm/i915/display/intel_display.o drivers/gpu/drm/i915/display/intel_display.c: In function ‘intel_queue_writeback_job’: drivers/gpu/drm/i915/display/intel_display.c:1575:36: error: ‘struct drm_connector’ has no member named ‘wb_connector’ drm_writeback_queue_job(connector->wb_connector, new_conn_state); ^~ scripts/Makefile.build:288: recipe for target 'drivers/gpu/drm/i915/display/intel_display.o' failed make[4]: *** [drivers/gpu/drm/i915/display/intel_display.o] Error 1 scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:550: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:550: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2 Makefile:1831: recipe for target 'drivers' failed make: *** [drivers] Error 2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] [RFC PATCH 0/2] i915 writeback enablement @ 2022-06-01 8:21 Suraj Kandpal 2022-06-01 8:22 ` [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder Suraj Kandpal 0 siblings, 1 reply; 6+ messages in thread From: Suraj Kandpal @ 2022-06-01 8:21 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula With this we try to enable writeback feature keeping with the drm_core drm_writeback framework but to do this we have to create a drm_encoder and drm_connector which is not present in intel_connector and intel_encoder which causes all our iterators to bug out as they assume any drm_encoder and drm_connector will naturally be embedded in the intel_ counterpart structures but this cannot be acheived from drm_writeback_connector as the drm_encoder and drm_connector fields in the structure are pointers which does not allow us to embed them in our intel_ structures.I have tried to change some iterators and show what further changes may look like but this will happen any and every place for_each_intel_encoder or for_each_intel_connector_ is going to be used.I would like suggestions on if moving forward with this approach would be useful or if the private i915 framework mentioned below sounds more practical. We previously tried to change the drm_connector and drm_encoder fields into pointer in the drm_writeback_connector structure but faced a huge backlash from community. Other than this approach we have another solution which won't be as much of a work and will require minimal changes is where we take the whole drm_writeback framework that is being used pull it into i915 making it private and change the encoder and connector fields to pointers. The approach has been floated in below series [1] https://patchwork.freedesktop.org/series/103417/ Suraj Kandpal (2): drm/i915: Define WD trancoder for i915 drm/i915: Enabling WD Transcoder drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_acpi.c | 1 + drivers/gpu/drm/i915/display/intel_display.c | 369 +++++++-- drivers/gpu/drm/i915/display/intel_display.h | 23 + .../drm/i915/display/intel_display_types.h | 30 + drivers/gpu/drm/i915/display/intel_dpll.c | 6 + drivers/gpu/drm/i915/display/intel_opregion.c | 3 + .../gpu/drm/i915/display/intel_wb_connector.h | 20 + drivers/gpu/drm/i915/display/intel_wd.c | 748 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wd.h | 84 ++ drivers/gpu/drm/i915/i915_drv.h | 4 + drivers/gpu/drm/i915/i915_irq.c | 8 +- drivers/gpu/drm/i915/i915_pci.c | 7 +- drivers/gpu/drm/i915/i915_reg.h | 139 ++++ 14 files changed, 1395 insertions(+), 48 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_wb_connector.h create mode 100644 drivers/gpu/drm/i915/display/intel_wd.c create mode 100644 drivers/gpu/drm/i915/display/intel_wd.h -- 2.35.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder 2022-06-01 8:21 [Intel-gfx] [RFC PATCH 0/2] i915 writeback enablement Suraj Kandpal @ 2022-06-01 8:22 ` Suraj Kandpal 2022-06-29 9:52 ` Jani Nikula 0 siblings, 1 reply; 6+ messages in thread From: Suraj Kandpal @ 2022-06-01 8:22 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula 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_display.c | 369 +++++++-- drivers/gpu/drm/i915/display/intel_display.h | 17 + .../drm/i915/display/intel_display_types.h | 29 + drivers/gpu/drm/i915/display/intel_dpll.c | 6 + drivers/gpu/drm/i915/display/intel_opregion.c | 3 + .../gpu/drm/i915/display/intel_wb_connector.h | 20 + drivers/gpu/drm/i915/display/intel_wd.c | 748 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_wd.h | 84 ++ drivers/gpu/drm/i915/i915_drv.h | 4 + drivers/gpu/drm/i915/i915_irq.c | 8 +- drivers/gpu/drm/i915/i915_pci.c | 7 +- drivers/gpu/drm/i915/i915_reg.h | 137 ++++ 14 files changed, 1386 insertions(+), 48 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_wb_connector.h 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 d2b18f03a33c..8f1ef2bbb851 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -298,6 +298,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_display.c b/drivers/gpu/drm/i915/display/intel_display.c index e71b69425309..bebc8caa9596 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -113,6 +113,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" @@ -1551,6 +1552,141 @@ static void intel_encoders_update_complete(struct intel_atomic_state *state) } } +static void intel_queue_writeback_job(struct intel_atomic_state *state, + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct intel_wd *intel_wd; + //struct intel_encoder *encoder; + int i; + + //for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { + // intel_wd = enc_to_intel_wd(encoder); + + // if (intel_wd->wd_crtc != intel_crtc) + // return; + + //} + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); + + if (intel_wd->wd_crtc != intel_crtc) + return; + + if (!new_conn_state->writeback_job) + continue; + + drm_writeback_queue_job(&intel_wd->wb_conn, new_conn_state); + drm_dbg_kms(&dev_priv->drm, "queueing writeback job\n"); + } +} + +static void intel_wd_encoder_funcs(struct intel_atomic_state *state, + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct intel_wd *intel_wd; + //struct intel_encoder *encoder; + int i; + + //for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { + // intel_wd = enc_to_intel_wd(encoder); + + // if (intel_wd->wd_crtc != intel_crtc) + // return; + + //} + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + //struct intel_connector *intel_connector; + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); + if (intel_wd->wd_crtc != intel_crtc) + return; + //intel_connector = to_intel_connector(connector); + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", + connector->base.id, connector->name, + drm_get_connector_status_name(connector->status)); + //encoder = intel_connector_primary_encoder(intel_connector); + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) { + drm_dbg_kms(&dev_priv->drm, "connector writeback found\n"); + //intel_wd_enable_capture(encoder, crtc_state, new_conn_state); + intel_wd_get_config(crtc_state); + intel_wd_compute_config(connector, crtc_state, new_conn_state); + } + } + +} +static void intel_find_writeback_connector(struct intel_atomic_state *state, + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct intel_wd *intel_wd; + //struct intel_encoder *encoder; + int i; + + //for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { + // intel_wd = enc_to_intel_wd(encoder); + + // if (intel_wd->wd_crtc != intel_crtc) + // return; + + //} + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + //struct intel_connector *intel_connector; + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); + if (intel_wd->wd_crtc != intel_crtc) + return; + //intel_connector = to_intel_connector(connector); + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", + connector->base.id, connector->name, + drm_get_connector_status_name(connector->status)); + //encoder = intel_connector_primary_encoder(intel_connector); + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) { + drm_dbg_kms(&dev_priv->drm, "connector writeback found\n"); + //intel_wd_enable_capture(encoder, crtc_state, new_conn_state); + intel_wd_enable_capture(connector, crtc_state, new_conn_state); + } + } + +} + +static void intel_writeback_set_event(struct intel_atomic_state *state, + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) +{ + struct drm_connector_state *new_conn_state; + struct drm_connector *connector; + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + //struct intel_wd *intel_wd; + //struct intel_encoder *encoder; + int i; + + + for_each_new_connector_in_state(&state->base, connector, new_conn_state, + i) { + + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", + connector->base.id, connector->name, + drm_get_connector_status_name(connector->status)); + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) { + drm_dbg_kms(&dev_priv->drm, "connector writeback found\n"); + intel_wd_set_vblank_event(connector, intel_crtc, crtc_state); + } + } + +} + + static void intel_encoders_pre_pll_enable(struct intel_atomic_state *state, struct intel_crtc *crtc) { @@ -1929,7 +2065,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; @@ -2716,6 +2853,14 @@ static void intel_encoder_get_config(struct intel_encoder *encoder, intel_crtc_readout_derived_state(crtc_state); } +static void intel_wd_encoder_get_config(struct intel_crtc_state *crtc_state) +{ + intel_wd_get_config(crtc_state); + + intel_crtc_readout_derived_state(crtc_state); +} + + static void intel_bigjoiner_compute_pipe_src(struct intel_crtc_state *crtc_state) { int num_pipes = intel_bigjoiner_num_pipes(crtc_state); @@ -4985,32 +5130,57 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, static void intel_modeset_update_connector_atomic_state(struct drm_device *dev) { struct intel_connector *connector; + struct drm_connector *drm_conn; struct drm_connector_list_iter conn_iter; drm_connector_list_iter_begin(dev, &conn_iter); - for_each_intel_connector_iter(connector, &conn_iter) { - struct drm_connector_state *conn_state = connector->base.state; - struct intel_encoder *encoder = - to_intel_encoder(connector->base.encoder); - - if (conn_state->crtc) - drm_connector_put(&connector->base); - - if (encoder) { - struct intel_crtc *crtc = - to_intel_crtc(encoder->base.crtc); - const struct intel_crtc_state *crtc_state = - to_intel_crtc_state(crtc->base.state); - - conn_state->best_encoder = &encoder->base; - conn_state->crtc = &crtc->base; - conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3; - - drm_connector_get(&connector->base); + for_each_intel_connector_iter_wb(drm_conn, &conn_iter) { + struct drm_connector_state *conn_state = drm_conn->state; + struct intel_encoder *encoder; + struct drm_encoder *drm_enc; + if(connector_is_writeback(drm_conn)) { + if (conn_state->crtc) + drm_connector_put(drm_conn); + + drm_enc = drm_conn->encoder; + if (drm_enc) { + struct intel_crtc *crtc = + to_intel_crtc(drm_enc->crtc); + const struct intel_crtc_state *crtc_state = + to_intel_crtc_state(crtc->base.state); + + conn_state->best_encoder = drm_enc; + conn_state->crtc = &crtc->base; + conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3; + + drm_connector_get(drm_conn); + } else { + conn_state->best_encoder = NULL; + conn_state->crtc = NULL; + } } else { - conn_state->best_encoder = NULL; - conn_state->crtc = NULL; - } + connector = to_intel_connector(drm_conn); + encoder = to_intel_encoder(connector->base.encoder); + + if (conn_state->crtc) + drm_connector_put(&connector->base); + + if (encoder) { + struct intel_crtc *crtc = + to_intel_crtc(encoder->base.crtc); + const struct intel_crtc_state *crtc_state = + to_intel_crtc_state(crtc->base.state); + + conn_state->best_encoder = &encoder->base; + conn_state->crtc = &crtc->base; + conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3; + + drm_connector_get(&connector->base); + } else { + conn_state->best_encoder = NULL; + conn_state->crtc = NULL; + } + } } drm_connector_list_iter_end(&conn_iter); } @@ -5155,6 +5325,7 @@ static const char * const output_type_str[] = { OUTPUT_TYPE(DSI), OUTPUT_TYPE(DDI), OUTPUT_TYPE(DP_MST), + OUTPUT_TYPE(WD), }; #undef OUTPUT_TYPE @@ -8473,6 +8644,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) intel_sagv_pre_plane_update(state); + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { + intel_wd_encoder_funcs(state, crtc, new_crtc_state); + } + /* Complete the events for pipes that have now been disabled */ for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { bool modeset = intel_crtc_needs_modeset(new_crtc_state); @@ -8488,6 +8663,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) } } + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { + intel_writeback_set_event(state, crtc, new_crtc_state); + } + intel_encoders_update_prepare(state); intel_dbuf_pre_plane_update(state); @@ -8574,6 +8753,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) intel_sagv_post_plane_update(state); + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { + intel_queue_writeback_job(state, crtc, new_crtc_state); + intel_find_writeback_connector(state, crtc, new_crtc_state); + } + drm_atomic_helper_commit_hw_done(&state->base); if (state->modeset) { @@ -8878,6 +9062,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) intel_ddi_init(dev_priv, PORT_TC1); intel_ddi_init(dev_priv, PORT_TC2); } else if (DISPLAY_VER(dev_priv) >= 12) { + intel_wd_init(dev_priv, TRANSCODER_WD_0); intel_ddi_init(dev_priv, PORT_A); intel_ddi_init(dev_priv, PORT_B); intel_ddi_init(dev_priv, PORT_TC1); @@ -10091,6 +10276,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) struct intel_encoder *encoder; struct intel_connector *connector; struct drm_connector_list_iter conn_iter; + struct drm_encoder *drm_enc; + struct drm_connector *drm_conn; u8 active_pipes = 0; for_each_intel_crtc(dev, crtc) { @@ -10121,37 +10308,58 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) readout_plane_state(dev_priv); - for_each_intel_encoder(dev, encoder) { + + drm_dbg_kms(&dev_priv->drm, "SK8 reached here after plane readout\n"); + + for_each_drm_encoder(dev, drm_enc) { struct intel_crtc_state *crtc_state = NULL; pipe = 0; - - if (encoder->get_hw_state(encoder, &pipe)) { + if (drm_enc->encoder_type == DRM_MODE_ENCODER_VIRTUAL && dev_priv->writeback_enabled) { + drm_dbg_kms(&dev_priv->drm, "encoder is virtual\n"); crtc = intel_crtc_for_pipe(dev_priv, pipe); crtc_state = to_intel_crtc_state(crtc->base.state); - encoder->base.crtc = &crtc->base; - intel_encoder_get_config(encoder, crtc_state); + drm_enc->crtc = &crtc->base; + intel_wd_encoder_get_config(crtc_state); + + + drm_dbg_kms(&dev_priv->drm, + "[ENCODER:%d:%s] hw stat readout: %s, pipe %c\n", + drm_enc->base.id, drm_enc->name, + str_enabled_disabled(drm_enc->crtc), + pipe_name(pipe)); + + drm_dbg_kms(&dev_priv->drm, "encoder is present but not in intel_encoder\n"); - /* read out to slave crtc as well for bigjoiner */ - if (crtc_state->bigjoiner_pipes) { - struct intel_crtc *slave_crtc; + } else { + encoder = to_intel_encoder(drm_enc); + if (encoder->get_hw_state(encoder, &pipe)) { + crtc = intel_crtc_for_pipe(dev_priv, pipe); + crtc_state = to_intel_crtc_state(crtc->base.state); - /* encoder should read be linked to bigjoiner master */ - WARN_ON(intel_crtc_is_bigjoiner_slave(crtc_state)); + encoder->base.crtc = &crtc->base; + intel_encoder_get_config(encoder, crtc_state); - for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc, - intel_crtc_bigjoiner_slave_pipes(crtc_state)) { - struct intel_crtc_state *slave_crtc_state; + /* read out to slave crtc as well for bigjoiner */ + if (crtc_state->bigjoiner_pipes) { + struct intel_crtc *slave_crtc; - slave_crtc_state = to_intel_crtc_state(slave_crtc->base.state); - intel_encoder_get_config(encoder, slave_crtc_state); + /* encoder should read be linked to bigjoiner master */ + WARN_ON(intel_crtc_is_bigjoiner_slave(crtc_state)); + + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc, + intel_crtc_bigjoiner_slave_pipes(crtc_state)) { + struct intel_crtc_state *slave_crtc_state; + + slave_crtc_state = to_intel_crtc_state(slave_crtc->base.state); + intel_encoder_get_config(encoder, slave_crtc_state); + } } + } else { + encoder->base.crtc = NULL; } - } else { - encoder->base.crtc = NULL; - } - + if (encoder->sync_state) encoder->sync_state(encoder, crtc_state); @@ -10160,12 +10368,60 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) encoder->base.base.id, encoder->base.name, str_enabled_disabled(encoder->base.crtc), pipe_name(pipe)); + } } intel_dpll_readout_hw_state(dev_priv); + drm_dbg_kms(&dev_priv->drm, "SK8 reached here after encoder and dpll readout\n"); drm_connector_list_iter_begin(dev, &conn_iter); - for_each_intel_connector_iter(connector, &conn_iter) { + for_each_intel_connector_iter_wb(drm_conn, &conn_iter) { + struct intel_crtc_state *crtc_state; + struct intel_crtc *crtc; + struct drm_writeback_connector *wb_conn; + drm_dbg_kms(&dev_priv->drm, "SK8 reached inside connector iterator\n"); + if(connector_is_writeback(drm_conn)) { + drm_dbg_kms(&dev_priv->drm, "SK8 encounterd wb _connectori\n"); + + drm_conn->dpms = DRM_MODE_DPMS_ON; + + wb_conn = drm_connector_to_writeback(drm_conn); + drm_enc = &wb_conn->encoder; + drm_conn->encoder = drm_enc; + + if(drm_enc) + drm_dbg_kms(&dev_priv->drm, "SK8 drm encoder present\n"); + else + drm_dbg_kms(&dev_priv->drm, "SK8 drm not encoder present\n"); + + crtc = to_intel_crtc(drm_enc->crtc); + + if(crtc) + drm_dbg_kms(&dev_priv->drm, "SK8 intel crtc present\n"); + + crtc_state = crtc ? to_intel_crtc_state(crtc->base.state) : NULL; + + drm_dbg_kms(&dev_priv->drm, "SK8 crtc state created\n"); + 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(drm_conn); + crtc_state->uapi.encoder_mask |= + drm_encoder_mask(drm_enc); + crtc_state->intel_wd = conn_to_intel_wd(wb_conn); + } + drm_dbg_kms(&dev_priv->drm, + "[CONNECTOR:%d:%s] hw state readout: %s\n", + drm_conn->base.id, drm_conn->name, + str_enabled_disabled(drm_conn->encoder)); + continue; + } + else { + connector = to_intel_connector(drm_conn); if (connector->get_hw_state(connector)) { struct intel_crtc_state *crtc_state; struct intel_crtc *crtc; @@ -10193,6 +10449,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) connector->base.dpms = DRM_MODE_DPMS_OFF; connector->base.encoder = NULL; } + } drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s] hw state readout: %s\n", connector->base.base.id, connector->base.name, @@ -10274,10 +10531,19 @@ static void get_encoder_power_domains(struct drm_i915_private *dev_priv) { struct intel_encoder *encoder; + struct drm_encoder *drm_enc; - for_each_intel_encoder(&dev_priv->drm, encoder) { + for_each_drm_encoder(&dev_priv->drm, drm_enc) { struct intel_crtc_state *crtc_state; + if(drm_enc->encoder_type == DRM_MODE_ENCODER_VIRTUAL + && dev_priv->writeback_enabled) + { + crtc_state = to_intel_crtc_state(drm_enc->crtc->state); + intel_wd_get_power_domains(drm_enc,crtc_state); + } else { + encoder = to_intel_encoder(drm_enc); + if (!encoder->get_power_domains) continue; @@ -10290,6 +10556,7 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) crtc_state = to_intel_crtc_state(encoder->base.crtc->state); encoder->get_power_domains(encoder, crtc_state); + } } } @@ -10333,6 +10600,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev, struct drm_i915_private *dev_priv = to_i915(dev); struct intel_encoder *encoder; struct intel_crtc *crtc; + struct drm_encoder *drm_enc; intel_wakeref_t wakeref; wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_INIT); @@ -10363,8 +10631,17 @@ intel_modeset_setup_hw_state(struct drm_device *dev, intel_sanitize_plane_mapping(dev_priv); - for_each_intel_encoder(dev, encoder) - intel_sanitize_encoder(encoder); + for_each_drm_encoder(dev, drm_enc) { + if(drm_enc->encoder_type == DRM_MODE_ENCODER_VIRTUAL + && dev_priv->writeback_enabled) + { + drm_dbg_kms(dev, + "SK8 not sanitization not required for wd encoder\n"); + } else { + encoder = to_intel_encoder(drm_enc); + intel_sanitize_encoder(encoder); + } + } for_each_intel_crtc(&dev_priv->drm, crtc) { struct intel_crtc_state *crtc_state = diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h index 62dc26b3bf76..30e145abaf4d 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h @@ -156,6 +156,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. @@ -447,6 +452,11 @@ enum hpd_pin { &(dev)->mode_config.encoder_list, \ base.head) +#define for_each_drm_encoder(dev, drm_encoder) \ + list_for_each_entry(drm_encoder, \ + &(dev)->mode_config.encoder_list, \ + head) + #define for_each_intel_encoder_mask(dev, intel_encoder, encoder_mask) \ list_for_each_entry(intel_encoder, \ &(dev)->mode_config.encoder_list, \ @@ -467,9 +477,16 @@ enum hpd_pin { for_each_intel_encoder((dev), (intel_encoder)) \ for_each_if(intel_encoder_can_psr(intel_encoder)) +#define for_each_intel_encoder_with_wd(dev, intel_encoder) \ + for_each_intel_encoder(dev, intel_encoder) \ + for_each_if(intel_encoder_is_wd(intel_encoder)) + #define for_each_intel_connector_iter(intel_connector, iter) \ while ((intel_connector = to_intel_connector(drm_connector_list_iter_next(iter)))) +#define for_each_intel_connector_iter_wb(drm_connector, iter) \ + while ((drm_connector = drm_connector_list_iter_next(iter))) + #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \ list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ for_each_if((intel_encoder)->base.crtc == (__crtc)) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index eeadf5c160ac..bb5f2816ad1b 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -43,6 +43,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" @@ -52,6 +53,7 @@ #include "intel_display_power.h" #include "intel_dpll_mgr.h" #include "intel_pm_types.h" +#include "intel_wd.h" struct drm_printer; struct __intel_global_objs_state; @@ -607,6 +609,8 @@ struct intel_connector { struct work_struct modeset_retry_work; struct intel_hdcp hdcp; + + struct drm_writeback_connector wb_conn; }; struct intel_digital_connector_state { @@ -1308,6 +1312,8 @@ struct intel_crtc_state { /* for loading single buffered registers during vblank */ struct drm_vblank_work vblank_work; + + struct intel_wd *intel_wd; }; enum intel_pipe_crc_source { @@ -1366,6 +1372,12 @@ 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 */ @@ -1494,6 +1506,7 @@ struct cxsr_latency { #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_connector(x) container_of(x, struct intel_connector, base) +#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) @@ -1928,6 +1941,22 @@ static inline bool intel_encoder_is_dp(struct intel_encoder *encoder) } } +static inline bool intel_encoder_is_wd(struct intel_encoder *encoder) +{ + if (encoder->type == INTEL_OUTPUT_WD) + return true; + return false; +} + +static inline bool connector_is_writeback(struct drm_connector *drm_connector) +{ + if(drm_connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) + { + return true; + } + return false; +} + static inline struct intel_lspcon * enc_to_intel_lspcon(struct intel_encoder *encoder) { diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c index 5262f16b45ac..ef2ba51d84bb 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll.c +++ b/drivers/gpu/drm/i915/display/intel_dpll.c @@ -955,6 +955,12 @@ 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)) { + pr_alert("%s: %d: output type: 0x%x", + __func__, __LINE__, crtc_state->output_types); + 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_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c index f31e8c3f8ce0..b7a0ac9bad05 100644 --- a/drivers/gpu/drm/i915/display/intel_opregion.c +++ b/drivers/gpu/drm/i915/display/intel_opregion.c @@ -370,6 +370,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_wb_connector.h b/drivers/gpu/drm/i915/display/intel_wb_connector.h new file mode 100644 index 000000000000..8063a9273bc7 --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wb_connector.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright © 2020 Intel Corporation + */ + +#ifndef __INTEL_WB_CONNECTOR_H__ +#define __INTEL_WB_CONNECTOR_H__ + +#include "intel_display.h" + +struct intel_wb_connector *intel_wb_connector_alloc(void); +void intel_wb_connector_free(struct intel_wb_connector *connector); +void intel_wb_connector_destroy(struct drm_connector *connector); +bool intel_wb_connector_get_hw_state(struct intel_wb_connector *connector); +enum pipe intel_wb_connector_get_pipe(struct intel_wb_connector *connector); +void intel_wb_connector_attach_encoder(struct intel_wb_connector *connector, + struct intel_encoder *encoder); + +#endif /* __INTEL_WB_CONNECTOR_H__ */ + 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..4458544e5d3f --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wd.c @@ -0,0 +1,748 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright © 2021 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Suraj Kandpal <suraj.kandpal@intel.com> + * Arun Murthy <arun.r.murthy@intel.com> + * + */ + +#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; + +static struct drm_writeback_job +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd) +{ + struct drm_writeback_job *job; + struct drm_i915_private *dev_priv = to_i915(intel_wd->wb_conn.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(&dev_priv->drm, "job queue is empty\n"); + return NULL; + } + + return job; +} + +void print_connectors(struct drm_i915_private *dev_priv) +{ + struct drm_connector *connector; + struct drm_connector_list_iter conn_iter; + struct intel_connector *intel_connector; + + drm_modeset_lock_all(&dev_priv->drm); + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + intel_connector = to_intel_connector(connector); + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", + connector->base.id, connector->name, + drm_get_connector_status_name(connector->status)); + } + drm_connector_list_iter_end(&conn_iter); + drm_modeset_unlock_all(&dev_priv->drm); +} + +/*Check with Spec*/ +static const u32 wb_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(wb_fmts); i++) + if (pix_format == wb_fmts[i]) + return 0; + + return 1; +} + +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_ggtt_view view = { + .type = I915_GGTT_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 *dev_priv, + 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(dev_priv, 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) +{ + drm_dbg_kms(connector->dev, ":"); + return MODE_OK; +} + +static int intel_wd_get_modes(struct drm_connector *connector) +{ + return 0; +} + +void intel_wd_get_config(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); + } + +} + +int intel_wd_compute_config(struct drm_connector *connector, + struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state) +{ + struct intel_wd *intel_wd; + struct drm_i915_private *dev_priv = to_i915(connector->dev); + struct drm_writeback_job *job; + struct drm_writeback_connector *wb_conn; + + drm_dbg_kms(&dev_priv->drm, "\n"); + + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) + { + wb_conn = drm_connector_to_writeback(conn_state->connector); + intel_wd = conn_to_intel_wd(wb_conn); + job = intel_get_writeback_job_from_queue(intel_wd); + if (job || conn_state->writeback_job) { + intel_wd->wd_crtc = to_intel_crtc(pipe_config->uapi.crtc); + return 0; + } + drm_dbg_kms(&dev_priv->drm, "No writebackjob in queue\n"); + } + + return 0; +} + +void intel_wd_get_power_domains(struct drm_encoder *encoder, + struct intel_crtc_state *crtc_state) +{ + struct drm_i915_private *dev_priv = to_i915(encoder->dev); + struct intel_wd *intel_wd = crtc_state->intel_wd; + intel_wakeref_t wakeref; + + wakeref = intel_display_power_get(dev_priv, + intel_wd->power_domain); + + intel_wd->io_wakeref[0] = wakeref; + drm_dbg_kms(encoder->dev, "\n"); +} + +//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); +// drm_dbg_kms(encoder->base.dev, "power enabled : %s\n", +// !wakeref ? "false":"true"); +// +// if (!wakeref) +// return false; +// +// tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); +// ret = tmp & WD_TRANS_ACTIVE; +// drm_dbg_kms(encoder->base.dev, "trancoder enabled: %s\n", +// ret ? "true":"false"); +// if (ret) { +// *pipe = wd_crtc->pipe; +// drm_dbg_kms(encoder->base.dev, "pipe selected is %d\n", +// wd_crtc->pipe); +// } +// return true; +//} + +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 *dev_priv = to_i915(encoder->dev); + const struct drm_display_mode *mode = &crtc_st->mode; + int ret; + + drm_dbg_kms(&dev_priv->drm, "\n"); + + if (!job) { + drm_dbg_kms(&dev_priv->drm, "No writeback job created returning\n"); + return -EINVAL; + } + + fb = job->fb; + + if (!fb) { + drm_dbg_kms(&dev_priv->drm, "Invalid framebuffer\n"); + return -EINVAL; + } + + if (fb->width != mode->hdisplay || fb->height != mode->vdisplay) { + drm_dbg_kms(&dev_priv->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(&dev_priv->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_dbg_kms(connector->dev, "\n"); + drm_connector_cleanup(connector); + kfree(connector); +} + +static enum drm_connector_status +intel_wb_connector_detect(struct drm_connector *connector, bool force) +{ + drm_dbg_kms(connector->dev, "Writeback connector connected\n"); + return connector_status_connected; +} + + +static const struct drm_connector_funcs wd_connector_funcs = { + .detect = intel_wb_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 = intel_digital_connector_duplicate_state, +}; + +static const struct drm_connector_helper_funcs wd_connector_helper_funcs = { + .get_modes = intel_wd_get_modes, + .mode_valid = intel_wd_mode_valid, +}; + +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder trans) +{ + struct intel_wd *intel_wd; + struct drm_writeback_connector *wb_conn; + int n_formats = ARRAY_SIZE(wb_fmts); + int err; + u32 possible_crtcs = ~0; + + drm_dbg_kms(&dev_priv->drm, "\n"); + intel_wd = kzalloc(sizeof(*intel_wd), GFP_KERNEL); + if (!intel_wd) { + kfree(intel_wd); + return; + } + + 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; + intel_wd->power_domain = POWER_DOMAIN_TRANSCODER_B; + + err = drm_writeback_connector_init(&dev_priv->drm, wb_conn, + &wd_connector_funcs, + &wd_encoder_helper_funcs, + wb_fmts, n_formats, possible_crtcs); + + if (err != 0) { + drm_dbg_kms(&dev_priv->drm, + "drm_writeback_connector_init: Failed: %d\n", + err); + goto cleanup; + } + + dev_priv->writeback_enabled = true; + drm_connector_helper_add(&wb_conn->base, &wd_connector_helper_funcs); + wb_conn->base.status = connector_status_connected; + return; + +cleanup: + kfree(intel_wd); +} + +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); +} + +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 -1; + } + 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)); + drm_dbg_kms(&dev_priv->drm, "%d is the surface address\n", tmp); + + 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; + + drm_dbg_kms(&dev_priv->drm, "hactive : %d, vactive: %d\n", hactive, vactive); + + tmp = intel_de_read(dev_priv, HTOTAL(intel_wd->trans)); + drm_dbg_kms(&dev_priv->drm, "hactive_reg : %d\n", tmp); + tmp = intel_de_read(dev_priv, VTOTAL(intel_wd->trans)); + drm_dbg_kms(&dev_priv->drm, "vactive_reg : %d\n", tmp); + /* 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: + 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; + drm_dbg_kms(&dev_priv->drm, "Selected pipe is %d\n", pipe); + 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; + drm_dbg_kms(&dev_priv->drm, "Trancoder enabled: %s\n", ret ? "true":"false"); + + 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 not enabled\n"); + } + + return 0; +} + +static void intel_wd_disable_capture(struct intel_wd *intel_wd) +{ + struct drm_i915_private *dev_priv = to_i915(intel_wd->wb_conn.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); + + drm_dbg_kms(&dev_priv->drm, "WD Trans_Conf value after disable = 0x%08x\n", + intel_de_read(dev_priv, PIPECONF(intel_wd->trans))); + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans)); + tmp |= ~TRANS_WD_FUNC_ENABLE; +} + +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 *dev_priv = to_i915(intel_wd->wb_conn.base.dev); + int ret = 0, status = 0; + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; + unsigned long flags; + + drm_dbg_kms(&dev_priv->drm, "\n"); + + if (!job->out_fence) + drm_dbg_kms(&dev_priv->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(&dev_priv->drm, + "wd transcoder setup not completed aborting capture\n"); + return -1; + } + + if (wd_crtc == NULL) { + DRM_ERROR("CRTC not attached\n"); + return -1; + } + + tmp = intel_de_read_fw(dev_priv, + 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(dev_priv, + WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); + + if (!intel_de_wait_for_set(dev_priv, WD_IIR(intel_wd->trans), + WD_FRAME_COMPLETE_INT, 100)){ + drm_dbg_kms(&dev_priv->drm, "frame captured\n"); + tmp = intel_de_read(dev_priv, WD_IIR(intel_wd->trans)); + drm_dbg_kms(&dev_priv->drm, "iir value : %d\n", tmp); + status = 0; + } else { + drm_dbg_kms(&dev_priv->drm, "frame not captured triggering stop frame\n"); + tmp = intel_de_read(dev_priv, + WD_TRANS_FUNC_CTL(intel_wd->trans)); + tmp |= STOP_TRIGGER_FRAME; + intel_de_write(dev_priv, + WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); + status = -1; + } + + intel_de_write(dev_priv, WD_IIR(intel_wd->trans), tmp); + intel_wd_writeback_complete(intel_wd, job, status); + if (intel_get_writeback_job_from_queue(intel_wd) == NULL) + intel_wd_disable_capture(intel_wd); + if (wd_crtc->wd.e) { + spin_lock_irqsave(&dev_priv->drm.event_lock, flags); + drm_dbg_kms(&dev_priv->drm, "send %p\n", wd_crtc->wd.e); + drm_crtc_send_vblank_event(&wd_crtc->base, + wd_crtc->wd.e); + spin_unlock_irqrestore(&dev_priv->drm.event_lock, flags); + wd_crtc->wd.e = NULL; + } else { + DRM_ERROR("Event NULL! %p, %p\n", &dev_priv->drm, + wd_crtc); + } + return 0; + +} + +void intel_wd_enable_capture(struct drm_connector *connector, + struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state) +{ + struct drm_i915_private *dev_priv = to_i915(connector->dev); + struct drm_writeback_connector *wb_conn = + drm_connector_to_writeback(connector); + struct intel_wd *intel_wd = conn_to_intel_wd(wb_conn); + struct drm_writeback_job *job; + + drm_dbg_kms(&dev_priv->drm, "\n"); + + job = intel_get_writeback_job_from_queue(intel_wd); + if (job == NULL) { + drm_dbg_kms(&dev_priv->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 drm_connector *connector, + struct intel_crtc *intel_crtc, + struct intel_crtc_state *intel_crtc_state) +{ + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); + struct drm_crtc_state *state = &intel_crtc_state->uapi; + struct drm_writeback_connector *wb_conn = drm_connector_to_writeback(connector); + struct intel_wd *intel_wd = conn_to_intel_wd(wb_conn); + + if (!intel_wd->wd_crtc) { + drm_dbg_kms(&dev_priv->drm, "wd crtc not found\n"); + return; + } + + if (intel_crtc == intel_wd->wd_crtc) { + intel_crtc->wd.e = state->event; + state->event = NULL; + if (intel_crtc->wd.e) + drm_dbg_kms(&dev_priv->drm, "WD event:%p\n", + intel_crtc->wd.e); + else + drm_dbg_kms(&dev_priv->drm, "WD no event\n"); + } +} + +void intel_wd_handle_isr(struct drm_i915_private *dev_priv) +{ + u32 iir_value = 0; + struct intel_wd *intel_wd; + struct drm_connector *connector; + struct drm_connector_list_iter conn_iter; + + iir_value = intel_de_read(dev_priv, WD_IIR(TRANSCODER_WD_0)); + drm_dbg_kms(&dev_priv->drm, "\n"); + + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); + for_each_intel_connector_iter_wb(connector, &conn_iter) { + if(connector_is_writeback(connector)) { + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); + if (!intel_wd->wd_crtc) { + DRM_ERROR("NO CRTC attached with WD\n"); + goto clear_iir; + } + } + } + drm_connector_list_iter_end(&conn_iter); + + if (iir_value & WD_VBLANK_INT) + drm_dbg_kms(&dev_priv->drm, "vblank interrupt for wd transcoder\n"); + if (iir_value & WD_WRITE_COMPLETE_INT) + drm_dbg_kms(&dev_priv->drm, + "wd write complete interrupt encountered\n"); + else + DRM_INFO("iir: %x\n", iir_value); + if (iir_value & WD_FRAME_COMPLETE_INT) { + drm_dbg_kms(&dev_priv->drm, + "frame complete interrupt for wd transcoder\n"); + return; + } + + intel_de_write(dev_priv, WD_IIR(TRANSCODER_WD_0), iir_value); +clear_iir: + intel_de_write(dev_priv, 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..377bc827bfb6 --- /dev/null +++ b/drivers/gpu/drm/i915/display/intel_wd.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0 + * Copyright © 2021 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author : + * Suraj Kandpal<suraj.kandpal@intel.com> + * Arun Murthy<arun.r.murthy@intel.com> + */ + +#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]; + //struct intel_connector *attached_connector; + 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; + enum intel_display_power_domain power_domain; +}; + +struct intel_wd_clk_vals { + u32 cdclk; + u16 link_m; + u16 link_n; +}; + +//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 *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 drm_connector *connector, + 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 drm_connector *connector, + struct intel_crtc *crtc, + struct intel_crtc_state *state); +void intel_wd_get_config(struct intel_crtc_state *pipe_config); +int intel_wd_compute_config(struct drm_connector *connector, + struct intel_crtc_state *pipe_config, + struct drm_connector_state *conn_state); +void intel_wd_get_power_domains(struct drm_encoder *encoder, + struct intel_crtc_state *crtc_state); +#endif/* _INTEL_WD_H */ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index bc1a7ff19463..ef0d3f6c2661 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -35,6 +35,8 @@ #include <linux/pm_qos.h> #include <drm/drm_connector.h> +#include <drm/drm_writeback.h> +#include <drm/i915_mei_hdcp_interface.h> #include <drm/ttm/ttm_device.h> #include "display/intel_bios.h" @@ -772,6 +774,8 @@ struct drm_i915_private { /* The TTM device structure. */ struct ttm_device bdev; + bool writeback_enabled; + I915_SELFTEST_DECLARE(struct i915_selftest_stash selftest;) /* diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 73cebc6aa650..95a6a8f7a911 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 61386d1bb07b..850a94adbc63 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -861,7 +861,8 @@ static const struct intel_device_info jsl_info = { .display.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \ .display.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), \ .pipe_offsets = { \ [TRANSCODER_A] = PIPE_A_OFFSET, \ [TRANSCODER_B] = PIPE_B_OFFSET, \ @@ -869,6 +870,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, \ }, \ .trans_offsets = { \ [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ @@ -877,6 +880,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, \ diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index cfd0a0c13703..579b9abcf50e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -3827,6 +3827,11 @@ #define PIPE_DSI0_OFFSET 0x7b000 #define PIPE_DSI1_OFFSET 0x7b800 +/* WD 0 and 1 */ +#define PIPE_WD0_OFFSET 0x7e000 +#define PIPE_WD1_OFFSET 0x7d000 + + #define PIPECONF(pipe) _MMIO_PIPE2(pipe, _PIPEACONF) #define PIPEDSL(pipe) _MMIO_PIPE2(pipe, _PIPEADSL) #define PIPEFRAME(pipe) _MMIO_PIPE2(pipe, _PIPEAFRAMEHIGH) @@ -4491,6 +4496,10 @@ #define _PIPEDSI0CONF 0x7b008 #define _PIPEDSI1CONF 0x7b808 +/* WD 0 and 1 */ +#define _PIPEWD0CONF 0x7e008 +#define _PIPEWD1CONF 0x7d008 + /* Sprite A control */ #define _DVSACNTR 0x72180 #define DVS_ENABLE REG_BIT(31) @@ -5753,6 +5762,7 @@ #define GEN8_DE_MISC_IER _MMIO(0x4446c) #define GEN8_DE_MISC_GSE (1 << 27) #define GEN8_DE_EDP_PSR (1 << 19) +#define GEN8_DE_MISC_WD0 (1 << 23) #define GEN8_PCU_ISR _MMIO(0x444e0) #define GEN8_PCU_IMR _MMIO(0x444e4) @@ -8915,6 +8925,133 @@ enum skl_power_gate { #define DSB_ENABLE (1 << 31) #define DSB_STATUS (1 << 0) +#define TGL_ROOT_DEVICE_ID 0x9A00 +#define TGL_ROOT_DEVICE_MASK 0xFF00 +#define TGL_ROOT_DEVICE_SKU_MASK 0xF +#define TGL_ROOT_DEVICE_SKU_ULX 0x2 +#define TGL_ROOT_DEVICE_SKU_ULT 0x4 + +/* Gen12 WD */ +#define _MMIO_WD(tc, wd0, wd1) _MMIO_TRANS((tc) - TRANSCODER_WD_0, \ + wd0, wd1) + +#define WD_TRANS_ENABLE (1 << 31) +#define WD_TRANS_DISABLE 0 +#define WD_TRANS_ACTIVE (1 << 30) + +/* WD transcoder control */ +#define _WD_TRANS_FUNC_CTL_0 0x6e400 +#define _WD_TRANS_FUNC_CTL_1 0x6ec00 +#define WD_TRANS_FUNC_CTL(tc) _MMIO_WD(tc,\ + _WD_TRANS_FUNC_CTL_0,\ + _WD_TRANS_FUNC_CTL_1) + +#define TRANS_WD_FUNC_ENABLE (1 << 31) +#define WD_TRIGGERED_CAP_MODE_ENABLE (1 << 30) +#define START_TRIGGER_FRAME (1 << 29) +#define STOP_TRIGGER_FRAME (1 << 28) +#define WD_CTL_POINTER_ETEH (0 << 18) +#define WD_CTL_POINTER_ETDH (1 << 18) +#define WD_CTL_POINTER_DTDH (2 << 18) +#define WD_INPUT_SELECT_MASK (7 << 12) +#define WD_INPUT_PIPE_A (0 << 12) +#define WD_INPUT_PIPE_B (5 << 12) +#define WD_INPUT_PIPE_C (6 << 12) +#define WD_INPUT_PIPE_D (7 << 12) + +#define WD_PIX_FMT_MASK (0x3 << 20) +#define WD_PIX_FMT_YUYV (0x1 << 20) +#define WD_PIX_FMT_XYUV8888 (0x2 << 20) +#define WD_PIX_FMT_XBGR8888 (0x3 << 20) +#define WD_PIX_FMT_Y410 (0x4 << 20) +#define WD_PIX_FMT_YUV422 (0x5 << 20) +#define WD_PIX_FMT_XBGR2101010 (0x6 << 20) +#define WD_PIX_FMT_RGB565 (0x7 << 20) + +#define WD_FRAME_NUMBER_MASK 15 + +#define _WD_STRIDE_0 0x6e510 +#define _WD_STRIDE_1 0x6ed10 +#define WD_STRIDE(tc) _MMIO_WD(tc,\ + _WD_STRIDE_0,\ + _WD_STRIDE_1) +#define WD_STRIDE_SHIFT 6 +#define WD_STRIDE_MASK (0x3ff << WD_STRIDE_SHIFT) + +#define _WD_STREAMCAP_CTL0 0x6e590 +#define _WD_STREAMCAP_CTL1 0x6ed90 +#define WD_STREAMCAP_CTL(tc) _MMIO_WD(tc,\ + _WD_STREAMCAP_CTL0,\ + _WD_STREAMCAP_CTL1) + +#define WD_STREAM_CAP_MODE_EN (1 << 31) +#define WD_STRAT_MASK (3 << 24) +#define WD_SLICING_STRAT_1_1 (0 << 24) +#define WD_SLICING_STRAT_2_1 (1 << 24) +#define WD_SLICING_STRAT_4_1 (2 << 24) +#define WD_SLICING_STRAT_8_1 (3 << 24) +#define WD_STREAM_OVERRUN_STATUS 1 + +#define _WD_SURF_0 0x6e514 +#define _WD_SURF_1 0x6ed14 +#define WD_SURF(tc) _MMIO_WD(tc,\ + _WD_SURF_0,\ + _WD_SURF_1) + +#define _WD_IMR_0 0x6e560 +#define _WD_IMR_1 0x6ed60 +#define WD_IMR(tc) _MMIO_WD(tc,\ + _WD_IMR_0,\ + _WD_IMR_1) +#define WD_FRAME_COMPLETE_INT (1 << 7) +#define WD_GTT_FAULT_INT (1 << 6) +#define WD_VBLANK_INT (1 << 5) +#define WD_OVERRUN_INT (1 << 4) +#define WD_CAPTURING_INT (1 << 3) +#define WD_WRITE_COMPLETE_INT (1 << 2) + +#define _WD_IIR_0 0x6e564 +#define _WD_IIR_1 0x6ed64 +#define WD_IIR(tc) _MMIO_WD(tc,\ + _WD_IIR_0,\ + _WD_IIR_1) + +#define _WD_FRAME_STATUS_0 0x6e56b +#define _WD_FRAME_STATUS_1 0x6ed6b +#define WD_FRAME_STATUS(tc) _MMIO_WD(tc,\ + _WD_FRAME_STATUS_0,\ + _WD_FRAME_STATUS_1) + +#define WD_FRAME_COMPLETE (1 << 31) +#define WD_STATE_IDLE (0 << 24) +#define WD_STATE_CAPSTART (1 << 24) +#define WD_STATE_FRAME_START (2 << 24) +#define WD_STATE_CAPACITIVE (3 << 24) +#define WD_STATE_TG_DONE (4 << 24) +#define WD_STATE_WDX_DONE (5 << 24) +#define WD_STATE_QUICK_CAP (6 << 24) + +#define _WD_27_M_0 0x6e524 +#define _WD_27_M_1 0x6ed24 +#define WD_27_M(tc) _MMIO_WD(tc,\ + _WD_27_M_0,\ + _WD_27_M_1) + +#define _WD_27_N_0 0x6e528 + +//Address looks wrong in bspec: +#define _WD_27_N_1 0x6ec28 +#define WD_27_N(tc) _MMIO_WD(tc,\ + _WD_27_N_0,\ + _WD_27_N_1) + +#define _WD_TAIL_CFG_0 0x6e520 +#define _WD_TAIL_CFG_1 0x6ed20 + +#define WD_TAIL_CFG(tc) _MMIO_WD(tc,\ + _WD_TAIL_CFG_0,\ + _WD_TAIL_CFG_1) + #define CLKREQ_POLICY _MMIO(0x101038) #define CLKREQ_POLICY_MEM_UP_OVRD REG_BIT(1) -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder 2022-06-01 8:22 ` [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder Suraj Kandpal @ 2022-06-29 9:52 ` Jani Nikula 0 siblings, 0 replies; 6+ messages in thread From: Jani Nikula @ 2022-06-29 9:52 UTC (permalink / raw) To: Suraj Kandpal, intel-gfx On Wed, 01 Jun 2022, Suraj Kandpal <suraj.kandpal@intel.com> wrote: > Adding support for writeback transcoder to start capturing frames using > interrupt mechanism. Some notes inline based on our discussion off-list. > > 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_display.c | 369 +++++++-- > drivers/gpu/drm/i915/display/intel_display.h | 17 + > .../drm/i915/display/intel_display_types.h | 29 + > drivers/gpu/drm/i915/display/intel_dpll.c | 6 + > drivers/gpu/drm/i915/display/intel_opregion.c | 3 + > .../gpu/drm/i915/display/intel_wb_connector.h | 20 + > drivers/gpu/drm/i915/display/intel_wd.c | 748 ++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_wd.h | 84 ++ > drivers/gpu/drm/i915/i915_drv.h | 4 + > drivers/gpu/drm/i915/i915_irq.c | 8 +- > drivers/gpu/drm/i915/i915_pci.c | 7 +- > drivers/gpu/drm/i915/i915_reg.h | 137 ++++ > 14 files changed, 1386 insertions(+), 48 deletions(-) > create mode 100644 drivers/gpu/drm/i915/display/intel_wb_connector.h > 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 d2b18f03a33c..8f1ef2bbb851 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -298,6 +298,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_display.c b/drivers/gpu/drm/i915/display/intel_display.c > index e71b69425309..bebc8caa9596 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -113,6 +113,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" > @@ -1551,6 +1552,141 @@ static void intel_encoders_update_complete(struct intel_atomic_state *state) > } > } > > +static void intel_queue_writeback_job(struct intel_atomic_state *state, > + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) > +{ > + struct drm_connector_state *new_conn_state; > + struct drm_connector *connector; > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > + struct intel_wd *intel_wd; > + //struct intel_encoder *encoder; > + int i; > + > + //for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { > + // intel_wd = enc_to_intel_wd(encoder); > + > + // if (intel_wd->wd_crtc != intel_crtc) > + // return; > + > + //} Please remove commented out code, even for RFC patches. > + > + for_each_new_connector_in_state(&state->base, connector, new_conn_state, > + i) { > + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); > + > + if (intel_wd->wd_crtc != intel_crtc) > + return; > + > + if (!new_conn_state->writeback_job) > + continue; > + > + drm_writeback_queue_job(&intel_wd->wb_conn, new_conn_state); > + drm_dbg_kms(&dev_priv->drm, "queueing writeback job\n"); > + } > +} > + > +static void intel_wd_encoder_funcs(struct intel_atomic_state *state, > + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) > +{ > + struct drm_connector_state *new_conn_state; > + struct drm_connector *connector; > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > + struct intel_wd *intel_wd; > + //struct intel_encoder *encoder; > + int i; > + > + //for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { > + // intel_wd = enc_to_intel_wd(encoder); > + > + // if (intel_wd->wd_crtc != intel_crtc) > + // return; > + > + //} > + > + for_each_new_connector_in_state(&state->base, connector, new_conn_state, > + i) { > + //struct intel_connector *intel_connector; > + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); > + if (intel_wd->wd_crtc != intel_crtc) > + return; > + //intel_connector = to_intel_connector(connector); > + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", > + connector->base.id, connector->name, > + drm_get_connector_status_name(connector->status)); > + //encoder = intel_connector_primary_encoder(intel_connector); > + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) { > + drm_dbg_kms(&dev_priv->drm, "connector writeback found\n"); > + //intel_wd_enable_capture(encoder, crtc_state, new_conn_state); > + intel_wd_get_config(crtc_state); > + intel_wd_compute_config(connector, crtc_state, new_conn_state); > + } > + } > + > +} > +static void intel_find_writeback_connector(struct intel_atomic_state *state, > + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) > +{ > + struct drm_connector_state *new_conn_state; > + struct drm_connector *connector; > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > + struct intel_wd *intel_wd; > + //struct intel_encoder *encoder; > + int i; > + > + //for_each_intel_encoder_with_wd(&dev_priv->drm, encoder) { > + // intel_wd = enc_to_intel_wd(encoder); > + > + // if (intel_wd->wd_crtc != intel_crtc) > + // return; > + > + //} > + > + for_each_new_connector_in_state(&state->base, connector, new_conn_state, > + i) { > + //struct intel_connector *intel_connector; > + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); > + if (intel_wd->wd_crtc != intel_crtc) > + return; > + //intel_connector = to_intel_connector(connector); > + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", > + connector->base.id, connector->name, > + drm_get_connector_status_name(connector->status)); > + //encoder = intel_connector_primary_encoder(intel_connector); > + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) { > + drm_dbg_kms(&dev_priv->drm, "connector writeback found\n"); > + //intel_wd_enable_capture(encoder, crtc_state, new_conn_state); > + intel_wd_enable_capture(connector, crtc_state, new_conn_state); > + } > + } > + > +} > + > +static void intel_writeback_set_event(struct intel_atomic_state *state, > + struct intel_crtc *intel_crtc, struct intel_crtc_state *crtc_state) > +{ > + struct drm_connector_state *new_conn_state; > + struct drm_connector *connector; > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > + //struct intel_wd *intel_wd; > + //struct intel_encoder *encoder; > + int i; > + > + > + for_each_new_connector_in_state(&state->base, connector, new_conn_state, > + i) { > + > + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", > + connector->base.id, connector->name, > + drm_get_connector_status_name(connector->status)); > + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) { > + drm_dbg_kms(&dev_priv->drm, "connector writeback found\n"); > + intel_wd_set_vblank_event(connector, intel_crtc, crtc_state); > + } > + } > + > +} > + > + > static void intel_encoders_pre_pll_enable(struct intel_atomic_state *state, > struct intel_crtc *crtc) > { > @@ -1929,7 +2065,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; > @@ -2716,6 +2853,14 @@ static void intel_encoder_get_config(struct intel_encoder *encoder, > intel_crtc_readout_derived_state(crtc_state); > } > > +static void intel_wd_encoder_get_config(struct intel_crtc_state *crtc_state) > +{ > + intel_wd_get_config(crtc_state); > + > + intel_crtc_readout_derived_state(crtc_state); > +} > + > + > static void intel_bigjoiner_compute_pipe_src(struct intel_crtc_state *crtc_state) > { > int num_pipes = intel_bigjoiner_num_pipes(crtc_state); > @@ -4985,32 +5130,57 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, > static void intel_modeset_update_connector_atomic_state(struct drm_device *dev) > { > struct intel_connector *connector; > + struct drm_connector *drm_conn; > struct drm_connector_list_iter conn_iter; > > drm_connector_list_iter_begin(dev, &conn_iter); > - for_each_intel_connector_iter(connector, &conn_iter) { > - struct drm_connector_state *conn_state = connector->base.state; > - struct intel_encoder *encoder = > - to_intel_encoder(connector->base.encoder); > - > - if (conn_state->crtc) > - drm_connector_put(&connector->base); > - > - if (encoder) { > - struct intel_crtc *crtc = > - to_intel_crtc(encoder->base.crtc); > - const struct intel_crtc_state *crtc_state = > - to_intel_crtc_state(crtc->base.state); > - > - conn_state->best_encoder = &encoder->base; > - conn_state->crtc = &crtc->base; > - conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3; > - > - drm_connector_get(&connector->base); > + for_each_intel_connector_iter_wb(drm_conn, &conn_iter) { > + struct drm_connector_state *conn_state = drm_conn->state; > + struct intel_encoder *encoder; > + struct drm_encoder *drm_enc; > + if(connector_is_writeback(drm_conn)) { > + if (conn_state->crtc) > + drm_connector_put(drm_conn); > + > + drm_enc = drm_conn->encoder; > + if (drm_enc) { > + struct intel_crtc *crtc = > + to_intel_crtc(drm_enc->crtc); > + const struct intel_crtc_state *crtc_state = > + to_intel_crtc_state(crtc->base.state); > + > + conn_state->best_encoder = drm_enc; > + conn_state->crtc = &crtc->base; > + conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3; > + > + drm_connector_get(drm_conn); > + } else { > + conn_state->best_encoder = NULL; > + conn_state->crtc = NULL; > + } > } else { > - conn_state->best_encoder = NULL; > - conn_state->crtc = NULL; > - } > + connector = to_intel_connector(drm_conn); > + encoder = to_intel_encoder(connector->base.encoder); > + > + if (conn_state->crtc) > + drm_connector_put(&connector->base); > + > + if (encoder) { > + struct intel_crtc *crtc = > + to_intel_crtc(encoder->base.crtc); > + const struct intel_crtc_state *crtc_state = > + to_intel_crtc_state(crtc->base.state); > + > + conn_state->best_encoder = &encoder->base; > + conn_state->crtc = &crtc->base; > + conn_state->max_bpc = (crtc_state->pipe_bpp ?: 24) / 3; > + > + drm_connector_get(&connector->base); > + } else { > + conn_state->best_encoder = NULL; > + conn_state->crtc = NULL; > + } > + } > } > drm_connector_list_iter_end(&conn_iter); > } > @@ -5155,6 +5325,7 @@ static const char * const output_type_str[] = { > OUTPUT_TYPE(DSI), > OUTPUT_TYPE(DDI), > OUTPUT_TYPE(DP_MST), > + OUTPUT_TYPE(WD), > }; > > #undef OUTPUT_TYPE > @@ -8473,6 +8644,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) > > intel_sagv_pre_plane_update(state); > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > + intel_wd_encoder_funcs(state, crtc, new_crtc_state); > + } > + > /* Complete the events for pipes that have now been disabled */ > for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > bool modeset = intel_crtc_needs_modeset(new_crtc_state); > @@ -8488,6 +8663,10 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) > } > } > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > + intel_writeback_set_event(state, crtc, new_crtc_state); > + } > + > intel_encoders_update_prepare(state); > > intel_dbuf_pre_plane_update(state); > @@ -8574,6 +8753,11 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) > > intel_sagv_post_plane_update(state); > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { > + intel_queue_writeback_job(state, crtc, new_crtc_state); > + intel_find_writeback_connector(state, crtc, new_crtc_state); > + } > + > drm_atomic_helper_commit_hw_done(&state->base); > > if (state->modeset) { > @@ -8878,6 +9062,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) > intel_ddi_init(dev_priv, PORT_TC1); > intel_ddi_init(dev_priv, PORT_TC2); > } else if (DISPLAY_VER(dev_priv) >= 12) { > + intel_wd_init(dev_priv, TRANSCODER_WD_0); > intel_ddi_init(dev_priv, PORT_A); > intel_ddi_init(dev_priv, PORT_B); > intel_ddi_init(dev_priv, PORT_TC1); > @@ -10091,6 +10276,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) > struct intel_encoder *encoder; > struct intel_connector *connector; > struct drm_connector_list_iter conn_iter; > + struct drm_encoder *drm_enc; > + struct drm_connector *drm_conn; > u8 active_pipes = 0; > > for_each_intel_crtc(dev, crtc) { > @@ -10121,37 +10308,58 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) > > readout_plane_state(dev_priv); > > - for_each_intel_encoder(dev, encoder) { > + > + drm_dbg_kms(&dev_priv->drm, "SK8 reached here after plane readout\n"); Please remove your personal debug logging stuff, even for RFC patches. > + > + for_each_drm_encoder(dev, drm_enc) { > struct intel_crtc_state *crtc_state = NULL; > > pipe = 0; > - > - if (encoder->get_hw_state(encoder, &pipe)) { > + if (drm_enc->encoder_type == DRM_MODE_ENCODER_VIRTUAL && dev_priv->writeback_enabled) { > + drm_dbg_kms(&dev_priv->drm, "encoder is virtual\n"); > crtc = intel_crtc_for_pipe(dev_priv, pipe); > crtc_state = to_intel_crtc_state(crtc->base.state); > > - encoder->base.crtc = &crtc->base; > - intel_encoder_get_config(encoder, crtc_state); > + drm_enc->crtc = &crtc->base; > + intel_wd_encoder_get_config(crtc_state); > + > + > + drm_dbg_kms(&dev_priv->drm, > + "[ENCODER:%d:%s] hw stat readout: %s, pipe %c\n", > + drm_enc->base.id, drm_enc->name, > + str_enabled_disabled(drm_enc->crtc), > + pipe_name(pipe)); > + > + drm_dbg_kms(&dev_priv->drm, "encoder is present but not in intel_encoder\n"); > > - /* read out to slave crtc as well for bigjoiner */ > - if (crtc_state->bigjoiner_pipes) { > - struct intel_crtc *slave_crtc; > + } else { > + encoder = to_intel_encoder(drm_enc); > + if (encoder->get_hw_state(encoder, &pipe)) { > + crtc = intel_crtc_for_pipe(dev_priv, pipe); > + crtc_state = to_intel_crtc_state(crtc->base.state); > > - /* encoder should read be linked to bigjoiner master */ > - WARN_ON(intel_crtc_is_bigjoiner_slave(crtc_state)); > + encoder->base.crtc = &crtc->base; > + intel_encoder_get_config(encoder, crtc_state); > > - for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc, > - intel_crtc_bigjoiner_slave_pipes(crtc_state)) { > - struct intel_crtc_state *slave_crtc_state; > + /* read out to slave crtc as well for bigjoiner */ > + if (crtc_state->bigjoiner_pipes) { > + struct intel_crtc *slave_crtc; > > - slave_crtc_state = to_intel_crtc_state(slave_crtc->base.state); > - intel_encoder_get_config(encoder, slave_crtc_state); > + /* encoder should read be linked to bigjoiner master */ > + WARN_ON(intel_crtc_is_bigjoiner_slave(crtc_state)); > + > + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc, > + intel_crtc_bigjoiner_slave_pipes(crtc_state)) { > + struct intel_crtc_state *slave_crtc_state; > + > + slave_crtc_state = to_intel_crtc_state(slave_crtc->base.state); > + intel_encoder_get_config(encoder, slave_crtc_state); > + } > } > + } else { > + encoder->base.crtc = NULL; > } > - } else { > - encoder->base.crtc = NULL; > - } > - > + > if (encoder->sync_state) > encoder->sync_state(encoder, crtc_state); > > @@ -10160,12 +10368,60 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) > encoder->base.base.id, encoder->base.name, > str_enabled_disabled(encoder->base.crtc), > pipe_name(pipe)); > + } > } > > intel_dpll_readout_hw_state(dev_priv); > > + drm_dbg_kms(&dev_priv->drm, "SK8 reached here after encoder and dpll readout\n"); > drm_connector_list_iter_begin(dev, &conn_iter); > - for_each_intel_connector_iter(connector, &conn_iter) { > + for_each_intel_connector_iter_wb(drm_conn, &conn_iter) { > + struct intel_crtc_state *crtc_state; > + struct intel_crtc *crtc; > + struct drm_writeback_connector *wb_conn; > + drm_dbg_kms(&dev_priv->drm, "SK8 reached inside connector iterator\n"); > + if(connector_is_writeback(drm_conn)) { > + drm_dbg_kms(&dev_priv->drm, "SK8 encounterd wb _connectori\n"); > + > + drm_conn->dpms = DRM_MODE_DPMS_ON; > + > + wb_conn = drm_connector_to_writeback(drm_conn); > + drm_enc = &wb_conn->encoder; > + drm_conn->encoder = drm_enc; > + > + if(drm_enc) > + drm_dbg_kms(&dev_priv->drm, "SK8 drm encoder present\n"); > + else > + drm_dbg_kms(&dev_priv->drm, "SK8 drm not encoder present\n"); > + > + crtc = to_intel_crtc(drm_enc->crtc); > + > + if(crtc) > + drm_dbg_kms(&dev_priv->drm, "SK8 intel crtc present\n"); > + > + crtc_state = crtc ? to_intel_crtc_state(crtc->base.state) : NULL; > + > + drm_dbg_kms(&dev_priv->drm, "SK8 crtc state created\n"); > + 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(drm_conn); > + crtc_state->uapi.encoder_mask |= > + drm_encoder_mask(drm_enc); > + crtc_state->intel_wd = conn_to_intel_wd(wb_conn); > + } > + drm_dbg_kms(&dev_priv->drm, > + "[CONNECTOR:%d:%s] hw state readout: %s\n", > + drm_conn->base.id, drm_conn->name, > + str_enabled_disabled(drm_conn->encoder)); > + continue; > + } > + else { > + connector = to_intel_connector(drm_conn); > if (connector->get_hw_state(connector)) { > struct intel_crtc_state *crtc_state; > struct intel_crtc *crtc; > @@ -10193,6 +10449,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) > connector->base.dpms = DRM_MODE_DPMS_OFF; > connector->base.encoder = NULL; > } > + } > drm_dbg_kms(&dev_priv->drm, > "[CONNECTOR:%d:%s] hw state readout: %s\n", > connector->base.base.id, connector->base.name, > @@ -10274,10 +10531,19 @@ static void > get_encoder_power_domains(struct drm_i915_private *dev_priv) > { > struct intel_encoder *encoder; > + struct drm_encoder *drm_enc; > > - for_each_intel_encoder(&dev_priv->drm, encoder) { > + for_each_drm_encoder(&dev_priv->drm, drm_enc) { > struct intel_crtc_state *crtc_state; > > + if(drm_enc->encoder_type == DRM_MODE_ENCODER_VIRTUAL > + && dev_priv->writeback_enabled) > + { > + crtc_state = to_intel_crtc_state(drm_enc->crtc->state); > + intel_wd_get_power_domains(drm_enc,crtc_state); > + } else { > + encoder = to_intel_encoder(drm_enc); > + > if (!encoder->get_power_domains) > continue; > > @@ -10290,6 +10556,7 @@ get_encoder_power_domains(struct drm_i915_private *dev_priv) > > crtc_state = to_intel_crtc_state(encoder->base.crtc->state); > encoder->get_power_domains(encoder, crtc_state); > + } > } > } > > @@ -10333,6 +10600,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev, > struct drm_i915_private *dev_priv = to_i915(dev); > struct intel_encoder *encoder; > struct intel_crtc *crtc; > + struct drm_encoder *drm_enc; > intel_wakeref_t wakeref; > > wakeref = intel_display_power_get(dev_priv, POWER_DOMAIN_INIT); > @@ -10363,8 +10631,17 @@ intel_modeset_setup_hw_state(struct drm_device *dev, > > intel_sanitize_plane_mapping(dev_priv); > > - for_each_intel_encoder(dev, encoder) > - intel_sanitize_encoder(encoder); > + for_each_drm_encoder(dev, drm_enc) { > + if(drm_enc->encoder_type == DRM_MODE_ENCODER_VIRTUAL > + && dev_priv->writeback_enabled) > + { > + drm_dbg_kms(dev, > + "SK8 not sanitization not required for wd encoder\n"); > + } else { > + encoder = to_intel_encoder(drm_enc); > + intel_sanitize_encoder(encoder); > + } > + } > > for_each_intel_crtc(&dev_priv->drm, crtc) { > struct intel_crtc_state *crtc_state = > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index 62dc26b3bf76..30e145abaf4d 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -156,6 +156,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. > @@ -447,6 +452,11 @@ enum hpd_pin { > &(dev)->mode_config.encoder_list, \ > base.head) > > +#define for_each_drm_encoder(dev, drm_encoder) \ > + list_for_each_entry(drm_encoder, \ > + &(dev)->mode_config.encoder_list, \ > + head) > + Please drop this. > #define for_each_intel_encoder_mask(dev, intel_encoder, encoder_mask) \ > list_for_each_entry(intel_encoder, \ > &(dev)->mode_config.encoder_list, \ > @@ -467,9 +477,16 @@ enum hpd_pin { > for_each_intel_encoder((dev), (intel_encoder)) \ > for_each_if(intel_encoder_can_psr(intel_encoder)) > > +#define for_each_intel_encoder_with_wd(dev, intel_encoder) \ > + for_each_intel_encoder(dev, intel_encoder) \ > + for_each_if(intel_encoder_is_wd(intel_encoder)) > + The main problem is all the *other* loops over dev->mode_config.encoder_list. We have a lot of those. They need to skip the virtual encoders. Or you need use drm_writeback_connector_init_with_encoder() and pass &intel_encoder->base to it (might be easier). > #define for_each_intel_connector_iter(intel_connector, iter) \ > while ((intel_connector = to_intel_connector(drm_connector_list_iter_next(iter)))) Something like this, perhaps: struct intel_connector * intel_connector_list_iter_next(struct drm_connector_list_iter *iter) { struct drm_connector *connector; drm_for_each_connector_iter(connector, iter) { if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) continue; return to_intel_connector(connector); } return NULL; } #define for_each_intel_connector_iter(connector, iter) \ while ((connector = intel_connector_list_iter_next(iter))) > > +#define for_each_intel_connector_iter_wb(drm_connector, iter) \ > + while ((drm_connector = drm_connector_list_iter_next(iter))) > + That's just drm_for_each_connector_iter(). > #define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \ > list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ > for_each_if((intel_encoder)->base.crtc == (__crtc)) > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index eeadf5c160ac..bb5f2816ad1b 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -43,6 +43,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" > @@ -52,6 +53,7 @@ > #include "intel_display_power.h" > #include "intel_dpll_mgr.h" > #include "intel_pm_types.h" > +#include "intel_wd.h" > > struct drm_printer; > struct __intel_global_objs_state; > @@ -607,6 +609,8 @@ struct intel_connector { > struct work_struct modeset_retry_work; > > struct intel_hdcp hdcp; > + > + struct drm_writeback_connector wb_conn; > }; > > struct intel_digital_connector_state { > @@ -1308,6 +1312,8 @@ struct intel_crtc_state { > > /* for loading single buffered registers during vblank */ > struct drm_vblank_work vblank_work; > + > + struct intel_wd *intel_wd; > }; > > enum intel_pipe_crc_source { > @@ -1366,6 +1372,12 @@ 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 */ > @@ -1494,6 +1506,7 @@ struct cxsr_latency { > #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_connector(x) container_of(x, struct intel_connector, base) > +#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) > @@ -1928,6 +1941,22 @@ static inline bool intel_encoder_is_dp(struct intel_encoder *encoder) > } > } > > +static inline bool intel_encoder_is_wd(struct intel_encoder *encoder) > +{ > + if (encoder->type == INTEL_OUTPUT_WD) > + return true; > + return false; > +} > + > +static inline bool connector_is_writeback(struct drm_connector *drm_connector) > +{ > + if(drm_connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) > + { > + return true; > + } > + return false; > +} > + > static inline struct intel_lspcon * > enc_to_intel_lspcon(struct intel_encoder *encoder) > { > diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c > index 5262f16b45ac..ef2ba51d84bb 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll.c > @@ -955,6 +955,12 @@ 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)) { > + pr_alert("%s: %d: output type: 0x%x", > + __func__, __LINE__, crtc_state->output_types); > + 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_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c > index f31e8c3f8ce0..b7a0ac9bad05 100644 > --- a/drivers/gpu/drm/i915/display/intel_opregion.c > +++ b/drivers/gpu/drm/i915/display/intel_opregion.c > @@ -370,6 +370,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_wb_connector.h b/drivers/gpu/drm/i915/display/intel_wb_connector.h > new file mode 100644 > index 000000000000..8063a9273bc7 > --- /dev/null > +++ b/drivers/gpu/drm/i915/display/intel_wb_connector.h > @@ -0,0 +1,20 @@ > +/* SPDX-License-Identifier: MIT */ > +/* > + * Copyright © 2020 Intel Corporation > + */ > + > +#ifndef __INTEL_WB_CONNECTOR_H__ > +#define __INTEL_WB_CONNECTOR_H__ > + > +#include "intel_display.h" > + > +struct intel_wb_connector *intel_wb_connector_alloc(void); > +void intel_wb_connector_free(struct intel_wb_connector *connector); > +void intel_wb_connector_destroy(struct drm_connector *connector); > +bool intel_wb_connector_get_hw_state(struct intel_wb_connector *connector); > +enum pipe intel_wb_connector_get_pipe(struct intel_wb_connector *connector); > +void intel_wb_connector_attach_encoder(struct intel_wb_connector *connector, > + struct intel_encoder *encoder); > + > +#endif /* __INTEL_WB_CONNECTOR_H__ */ > + > 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..4458544e5d3f > --- /dev/null > +++ b/drivers/gpu/drm/i915/display/intel_wd.c > @@ -0,0 +1,748 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright © 2021 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + * > + * Authors: > + * Suraj Kandpal <suraj.kandpal@intel.com> > + * Arun Murthy <arun.r.murthy@intel.com> > + * > + */ > + > +#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; > + > +static struct drm_writeback_job > +*intel_get_writeback_job_from_queue(struct intel_wd *intel_wd) > +{ > + struct drm_writeback_job *job; > + struct drm_i915_private *dev_priv = to_i915(intel_wd->wb_conn.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(&dev_priv->drm, "job queue is empty\n"); > + return NULL; > + } > + > + return job; > +} > + > +void print_connectors(struct drm_i915_private *dev_priv) > +{ > + struct drm_connector *connector; > + struct drm_connector_list_iter conn_iter; > + struct intel_connector *intel_connector; > + > + drm_modeset_lock_all(&dev_priv->drm); > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > + drm_for_each_connector_iter(connector, &conn_iter) { > + intel_connector = to_intel_connector(connector); > + drm_dbg_kms(&dev_priv->drm, "[CONNECTOR:%d:%s]: status: %s\n", > + connector->base.id, connector->name, > + drm_get_connector_status_name(connector->status)); > + } > + drm_connector_list_iter_end(&conn_iter); > + drm_modeset_unlock_all(&dev_priv->drm); > +} > + > +/*Check with Spec*/ > +static const u32 wb_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(wb_fmts); i++) > + if (pix_format == wb_fmts[i]) > + return 0; > + > + return 1; > +} > + > +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_ggtt_view view = { > + .type = I915_GGTT_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 *dev_priv, > + 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(dev_priv, 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) > +{ > + drm_dbg_kms(connector->dev, ":"); > + return MODE_OK; > +} > + > +static int intel_wd_get_modes(struct drm_connector *connector) > +{ > + return 0; > +} > + > +void intel_wd_get_config(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); > + } > + > +} > + > +int intel_wd_compute_config(struct drm_connector *connector, > + struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state) > +{ > + struct intel_wd *intel_wd; > + struct drm_i915_private *dev_priv = to_i915(connector->dev); > + struct drm_writeback_job *job; > + struct drm_writeback_connector *wb_conn; > + > + drm_dbg_kms(&dev_priv->drm, "\n"); > + > + if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) > + { > + wb_conn = drm_connector_to_writeback(conn_state->connector); > + intel_wd = conn_to_intel_wd(wb_conn); > + job = intel_get_writeback_job_from_queue(intel_wd); > + if (job || conn_state->writeback_job) { > + intel_wd->wd_crtc = to_intel_crtc(pipe_config->uapi.crtc); > + return 0; > + } > + drm_dbg_kms(&dev_priv->drm, "No writebackjob in queue\n"); > + } > + > + return 0; > +} > + > +void intel_wd_get_power_domains(struct drm_encoder *encoder, > + struct intel_crtc_state *crtc_state) > +{ > + struct drm_i915_private *dev_priv = to_i915(encoder->dev); > + struct intel_wd *intel_wd = crtc_state->intel_wd; > + intel_wakeref_t wakeref; > + > + wakeref = intel_display_power_get(dev_priv, > + intel_wd->power_domain); > + > + intel_wd->io_wakeref[0] = wakeref; > + drm_dbg_kms(encoder->dev, "\n"); > +} > + > +//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); > +// drm_dbg_kms(encoder->base.dev, "power enabled : %s\n", > +// !wakeref ? "false":"true"); > +// > +// if (!wakeref) > +// return false; > +// > +// tmp = intel_de_read(dev_priv, PIPECONF(intel_wd->trans)); > +// ret = tmp & WD_TRANS_ACTIVE; > +// drm_dbg_kms(encoder->base.dev, "trancoder enabled: %s\n", > +// ret ? "true":"false"); > +// if (ret) { > +// *pipe = wd_crtc->pipe; > +// drm_dbg_kms(encoder->base.dev, "pipe selected is %d\n", > +// wd_crtc->pipe); > +// } > +// return true; > +//} > + > +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 *dev_priv = to_i915(encoder->dev); > + const struct drm_display_mode *mode = &crtc_st->mode; > + int ret; > + > + drm_dbg_kms(&dev_priv->drm, "\n"); > + > + if (!job) { > + drm_dbg_kms(&dev_priv->drm, "No writeback job created returning\n"); > + return -EINVAL; > + } > + > + fb = job->fb; > + > + if (!fb) { > + drm_dbg_kms(&dev_priv->drm, "Invalid framebuffer\n"); > + return -EINVAL; > + } > + > + if (fb->width != mode->hdisplay || fb->height != mode->vdisplay) { > + drm_dbg_kms(&dev_priv->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(&dev_priv->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_dbg_kms(connector->dev, "\n"); > + drm_connector_cleanup(connector); > + kfree(connector); > +} > + > +static enum drm_connector_status > +intel_wb_connector_detect(struct drm_connector *connector, bool force) > +{ > + drm_dbg_kms(connector->dev, "Writeback connector connected\n"); > + return connector_status_connected; > +} > + > + > +static const struct drm_connector_funcs wd_connector_funcs = { > + .detect = intel_wb_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 = intel_digital_connector_duplicate_state, > +}; > + > +static const struct drm_connector_helper_funcs wd_connector_helper_funcs = { > + .get_modes = intel_wd_get_modes, > + .mode_valid = intel_wd_mode_valid, > +}; > + > +void intel_wd_init(struct drm_i915_private *dev_priv, enum transcoder trans) > +{ > + struct intel_wd *intel_wd; > + struct drm_writeback_connector *wb_conn; > + int n_formats = ARRAY_SIZE(wb_fmts); > + int err; > + u32 possible_crtcs = ~0; > + > + drm_dbg_kms(&dev_priv->drm, "\n"); > + intel_wd = kzalloc(sizeof(*intel_wd), GFP_KERNEL); > + if (!intel_wd) { > + kfree(intel_wd); > + return; > + } > + > + 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; > + intel_wd->power_domain = POWER_DOMAIN_TRANSCODER_B; > + > + err = drm_writeback_connector_init(&dev_priv->drm, wb_conn, > + &wd_connector_funcs, > + &wd_encoder_helper_funcs, > + wb_fmts, n_formats, possible_crtcs); > + > + if (err != 0) { > + drm_dbg_kms(&dev_priv->drm, > + "drm_writeback_connector_init: Failed: %d\n", > + err); > + goto cleanup; > + } > + > + dev_priv->writeback_enabled = true; > + drm_connector_helper_add(&wb_conn->base, &wd_connector_helper_funcs); > + wb_conn->base.status = connector_status_connected; > + return; > + > +cleanup: > + kfree(intel_wd); > +} > + > +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); > +} > + > +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 -1; > + } > + 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)); > + drm_dbg_kms(&dev_priv->drm, "%d is the surface address\n", tmp); > + > + 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; > + > + drm_dbg_kms(&dev_priv->drm, "hactive : %d, vactive: %d\n", hactive, vactive); > + > + tmp = intel_de_read(dev_priv, HTOTAL(intel_wd->trans)); > + drm_dbg_kms(&dev_priv->drm, "hactive_reg : %d\n", tmp); > + tmp = intel_de_read(dev_priv, VTOTAL(intel_wd->trans)); > + drm_dbg_kms(&dev_priv->drm, "vactive_reg : %d\n", tmp); > + /* 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: > + 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; > + drm_dbg_kms(&dev_priv->drm, "Selected pipe is %d\n", pipe); > + 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; > + drm_dbg_kms(&dev_priv->drm, "Trancoder enabled: %s\n", ret ? "true":"false"); > + > + 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 not enabled\n"); > + } > + > + return 0; > +} > + > +static void intel_wd_disable_capture(struct intel_wd *intel_wd) > +{ > + struct drm_i915_private *dev_priv = to_i915(intel_wd->wb_conn.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); > + > + drm_dbg_kms(&dev_priv->drm, "WD Trans_Conf value after disable = 0x%08x\n", > + intel_de_read(dev_priv, PIPECONF(intel_wd->trans))); > + tmp = intel_de_read(dev_priv, WD_TRANS_FUNC_CTL(intel_wd->trans)); > + tmp |= ~TRANS_WD_FUNC_ENABLE; > +} > + > +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 *dev_priv = to_i915(intel_wd->wb_conn.base.dev); > + int ret = 0, status = 0; > + struct intel_crtc *wd_crtc = intel_wd->wd_crtc; > + unsigned long flags; > + > + drm_dbg_kms(&dev_priv->drm, "\n"); > + > + if (!job->out_fence) > + drm_dbg_kms(&dev_priv->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(&dev_priv->drm, > + "wd transcoder setup not completed aborting capture\n"); > + return -1; > + } > + > + if (wd_crtc == NULL) { > + DRM_ERROR("CRTC not attached\n"); > + return -1; > + } > + > + tmp = intel_de_read_fw(dev_priv, > + 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(dev_priv, > + WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); > + > + if (!intel_de_wait_for_set(dev_priv, WD_IIR(intel_wd->trans), > + WD_FRAME_COMPLETE_INT, 100)){ > + drm_dbg_kms(&dev_priv->drm, "frame captured\n"); > + tmp = intel_de_read(dev_priv, WD_IIR(intel_wd->trans)); > + drm_dbg_kms(&dev_priv->drm, "iir value : %d\n", tmp); > + status = 0; > + } else { > + drm_dbg_kms(&dev_priv->drm, "frame not captured triggering stop frame\n"); > + tmp = intel_de_read(dev_priv, > + WD_TRANS_FUNC_CTL(intel_wd->trans)); > + tmp |= STOP_TRIGGER_FRAME; > + intel_de_write(dev_priv, > + WD_TRANS_FUNC_CTL(intel_wd->trans), tmp); > + status = -1; > + } > + > + intel_de_write(dev_priv, WD_IIR(intel_wd->trans), tmp); > + intel_wd_writeback_complete(intel_wd, job, status); > + if (intel_get_writeback_job_from_queue(intel_wd) == NULL) > + intel_wd_disable_capture(intel_wd); > + if (wd_crtc->wd.e) { > + spin_lock_irqsave(&dev_priv->drm.event_lock, flags); > + drm_dbg_kms(&dev_priv->drm, "send %p\n", wd_crtc->wd.e); > + drm_crtc_send_vblank_event(&wd_crtc->base, > + wd_crtc->wd.e); > + spin_unlock_irqrestore(&dev_priv->drm.event_lock, flags); > + wd_crtc->wd.e = NULL; > + } else { > + DRM_ERROR("Event NULL! %p, %p\n", &dev_priv->drm, > + wd_crtc); > + } > + return 0; > + > +} > + > +void intel_wd_enable_capture(struct drm_connector *connector, > + struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state) > +{ > + struct drm_i915_private *dev_priv = to_i915(connector->dev); > + struct drm_writeback_connector *wb_conn = > + drm_connector_to_writeback(connector); > + struct intel_wd *intel_wd = conn_to_intel_wd(wb_conn); > + struct drm_writeback_job *job; > + > + drm_dbg_kms(&dev_priv->drm, "\n"); > + > + job = intel_get_writeback_job_from_queue(intel_wd); > + if (job == NULL) { > + drm_dbg_kms(&dev_priv->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 drm_connector *connector, > + struct intel_crtc *intel_crtc, > + struct intel_crtc_state *intel_crtc_state) > +{ > + struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev); > + struct drm_crtc_state *state = &intel_crtc_state->uapi; > + struct drm_writeback_connector *wb_conn = drm_connector_to_writeback(connector); > + struct intel_wd *intel_wd = conn_to_intel_wd(wb_conn); > + > + if (!intel_wd->wd_crtc) { > + drm_dbg_kms(&dev_priv->drm, "wd crtc not found\n"); > + return; > + } > + > + if (intel_crtc == intel_wd->wd_crtc) { > + intel_crtc->wd.e = state->event; > + state->event = NULL; > + if (intel_crtc->wd.e) > + drm_dbg_kms(&dev_priv->drm, "WD event:%p\n", > + intel_crtc->wd.e); > + else > + drm_dbg_kms(&dev_priv->drm, "WD no event\n"); > + } > +} > + > +void intel_wd_handle_isr(struct drm_i915_private *dev_priv) > +{ > + u32 iir_value = 0; > + struct intel_wd *intel_wd; > + struct drm_connector *connector; > + struct drm_connector_list_iter conn_iter; > + > + iir_value = intel_de_read(dev_priv, WD_IIR(TRANSCODER_WD_0)); > + drm_dbg_kms(&dev_priv->drm, "\n"); > + > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > + for_each_intel_connector_iter_wb(connector, &conn_iter) { > + if(connector_is_writeback(connector)) { > + intel_wd = conn_to_intel_wd(drm_connector_to_writeback(connector)); > + if (!intel_wd->wd_crtc) { > + DRM_ERROR("NO CRTC attached with WD\n"); > + goto clear_iir; > + } > + } > + } > + drm_connector_list_iter_end(&conn_iter); > + > + if (iir_value & WD_VBLANK_INT) > + drm_dbg_kms(&dev_priv->drm, "vblank interrupt for wd transcoder\n"); > + if (iir_value & WD_WRITE_COMPLETE_INT) > + drm_dbg_kms(&dev_priv->drm, > + "wd write complete interrupt encountered\n"); > + else > + DRM_INFO("iir: %x\n", iir_value); > + if (iir_value & WD_FRAME_COMPLETE_INT) { > + drm_dbg_kms(&dev_priv->drm, > + "frame complete interrupt for wd transcoder\n"); > + return; > + } > + > + intel_de_write(dev_priv, WD_IIR(TRANSCODER_WD_0), iir_value); > +clear_iir: > + intel_de_write(dev_priv, 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..377bc827bfb6 > --- /dev/null > +++ b/drivers/gpu/drm/i915/display/intel_wd.h > @@ -0,0 +1,84 @@ > +/* SPDX-License-Identifier: GPL-2.0 > + * Copyright © 2021 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + * Author : > + * Suraj Kandpal<suraj.kandpal@intel.com> > + * Arun Murthy<arun.r.murthy@intel.com> > + */ > + > +#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]; > + //struct intel_connector *attached_connector; > + 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; > + enum intel_display_power_domain power_domain; > +}; > + > +struct intel_wd_clk_vals { > + u32 cdclk; > + u16 link_m; > + u16 link_n; > +}; > + > +//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 *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 drm_connector *connector, > + 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 drm_connector *connector, > + struct intel_crtc *crtc, > + struct intel_crtc_state *state); > +void intel_wd_get_config(struct intel_crtc_state *pipe_config); > +int intel_wd_compute_config(struct drm_connector *connector, > + struct intel_crtc_state *pipe_config, > + struct drm_connector_state *conn_state); > +void intel_wd_get_power_domains(struct drm_encoder *encoder, > + struct intel_crtc_state *crtc_state); > +#endif/* _INTEL_WD_H */ > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index bc1a7ff19463..ef0d3f6c2661 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -35,6 +35,8 @@ > #include <linux/pm_qos.h> > > #include <drm/drm_connector.h> > +#include <drm/drm_writeback.h> > +#include <drm/i915_mei_hdcp_interface.h> > #include <drm/ttm/ttm_device.h> > > #include "display/intel_bios.h" > @@ -772,6 +774,8 @@ struct drm_i915_private { > /* The TTM device structure. */ > struct ttm_device bdev; > > + bool writeback_enabled; > + > I915_SELFTEST_DECLARE(struct i915_selftest_stash selftest;) > > /* > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 73cebc6aa650..95a6a8f7a911 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 61386d1bb07b..850a94adbc63 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -861,7 +861,8 @@ static const struct intel_device_info jsl_info = { > .display.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C) | BIT(PIPE_D), \ > .display.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), \ > .pipe_offsets = { \ > [TRANSCODER_A] = PIPE_A_OFFSET, \ > [TRANSCODER_B] = PIPE_B_OFFSET, \ > @@ -869,6 +870,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, \ > }, \ > .trans_offsets = { \ > [TRANSCODER_A] = TRANSCODER_A_OFFSET, \ > @@ -877,6 +880,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, \ > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index cfd0a0c13703..579b9abcf50e 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3827,6 +3827,11 @@ > #define PIPE_DSI0_OFFSET 0x7b000 > #define PIPE_DSI1_OFFSET 0x7b800 > > +/* WD 0 and 1 */ > +#define PIPE_WD0_OFFSET 0x7e000 > +#define PIPE_WD1_OFFSET 0x7d000 > + > + > #define PIPECONF(pipe) _MMIO_PIPE2(pipe, _PIPEACONF) > #define PIPEDSL(pipe) _MMIO_PIPE2(pipe, _PIPEADSL) > #define PIPEFRAME(pipe) _MMIO_PIPE2(pipe, _PIPEAFRAMEHIGH) > @@ -4491,6 +4496,10 @@ > #define _PIPEDSI0CONF 0x7b008 > #define _PIPEDSI1CONF 0x7b808 > > +/* WD 0 and 1 */ > +#define _PIPEWD0CONF 0x7e008 > +#define _PIPEWD1CONF 0x7d008 > + > /* Sprite A control */ > #define _DVSACNTR 0x72180 > #define DVS_ENABLE REG_BIT(31) > @@ -5753,6 +5762,7 @@ > #define GEN8_DE_MISC_IER _MMIO(0x4446c) > #define GEN8_DE_MISC_GSE (1 << 27) > #define GEN8_DE_EDP_PSR (1 << 19) > +#define GEN8_DE_MISC_WD0 (1 << 23) > > #define GEN8_PCU_ISR _MMIO(0x444e0) > #define GEN8_PCU_IMR _MMIO(0x444e4) > @@ -8915,6 +8925,133 @@ enum skl_power_gate { > #define DSB_ENABLE (1 << 31) > #define DSB_STATUS (1 << 0) > > +#define TGL_ROOT_DEVICE_ID 0x9A00 > +#define TGL_ROOT_DEVICE_MASK 0xFF00 > +#define TGL_ROOT_DEVICE_SKU_MASK 0xF > +#define TGL_ROOT_DEVICE_SKU_ULX 0x2 > +#define TGL_ROOT_DEVICE_SKU_ULT 0x4 > + > +/* Gen12 WD */ > +#define _MMIO_WD(tc, wd0, wd1) _MMIO_TRANS((tc) - TRANSCODER_WD_0, \ > + wd0, wd1) > + > +#define WD_TRANS_ENABLE (1 << 31) > +#define WD_TRANS_DISABLE 0 > +#define WD_TRANS_ACTIVE (1 << 30) > + > +/* WD transcoder control */ > +#define _WD_TRANS_FUNC_CTL_0 0x6e400 > +#define _WD_TRANS_FUNC_CTL_1 0x6ec00 > +#define WD_TRANS_FUNC_CTL(tc) _MMIO_WD(tc,\ > + _WD_TRANS_FUNC_CTL_0,\ > + _WD_TRANS_FUNC_CTL_1) > + > +#define TRANS_WD_FUNC_ENABLE (1 << 31) > +#define WD_TRIGGERED_CAP_MODE_ENABLE (1 << 30) > +#define START_TRIGGER_FRAME (1 << 29) > +#define STOP_TRIGGER_FRAME (1 << 28) > +#define WD_CTL_POINTER_ETEH (0 << 18) > +#define WD_CTL_POINTER_ETDH (1 << 18) > +#define WD_CTL_POINTER_DTDH (2 << 18) > +#define WD_INPUT_SELECT_MASK (7 << 12) > +#define WD_INPUT_PIPE_A (0 << 12) > +#define WD_INPUT_PIPE_B (5 << 12) > +#define WD_INPUT_PIPE_C (6 << 12) > +#define WD_INPUT_PIPE_D (7 << 12) > + > +#define WD_PIX_FMT_MASK (0x3 << 20) > +#define WD_PIX_FMT_YUYV (0x1 << 20) > +#define WD_PIX_FMT_XYUV8888 (0x2 << 20) > +#define WD_PIX_FMT_XBGR8888 (0x3 << 20) > +#define WD_PIX_FMT_Y410 (0x4 << 20) > +#define WD_PIX_FMT_YUV422 (0x5 << 20) > +#define WD_PIX_FMT_XBGR2101010 (0x6 << 20) > +#define WD_PIX_FMT_RGB565 (0x7 << 20) > + > +#define WD_FRAME_NUMBER_MASK 15 > + > +#define _WD_STRIDE_0 0x6e510 > +#define _WD_STRIDE_1 0x6ed10 > +#define WD_STRIDE(tc) _MMIO_WD(tc,\ > + _WD_STRIDE_0,\ > + _WD_STRIDE_1) > +#define WD_STRIDE_SHIFT 6 > +#define WD_STRIDE_MASK (0x3ff << WD_STRIDE_SHIFT) > + > +#define _WD_STREAMCAP_CTL0 0x6e590 > +#define _WD_STREAMCAP_CTL1 0x6ed90 > +#define WD_STREAMCAP_CTL(tc) _MMIO_WD(tc,\ > + _WD_STREAMCAP_CTL0,\ > + _WD_STREAMCAP_CTL1) > + > +#define WD_STREAM_CAP_MODE_EN (1 << 31) > +#define WD_STRAT_MASK (3 << 24) > +#define WD_SLICING_STRAT_1_1 (0 << 24) > +#define WD_SLICING_STRAT_2_1 (1 << 24) > +#define WD_SLICING_STRAT_4_1 (2 << 24) > +#define WD_SLICING_STRAT_8_1 (3 << 24) > +#define WD_STREAM_OVERRUN_STATUS 1 > + > +#define _WD_SURF_0 0x6e514 > +#define _WD_SURF_1 0x6ed14 > +#define WD_SURF(tc) _MMIO_WD(tc,\ > + _WD_SURF_0,\ > + _WD_SURF_1) > + > +#define _WD_IMR_0 0x6e560 > +#define _WD_IMR_1 0x6ed60 > +#define WD_IMR(tc) _MMIO_WD(tc,\ > + _WD_IMR_0,\ > + _WD_IMR_1) > +#define WD_FRAME_COMPLETE_INT (1 << 7) > +#define WD_GTT_FAULT_INT (1 << 6) > +#define WD_VBLANK_INT (1 << 5) > +#define WD_OVERRUN_INT (1 << 4) > +#define WD_CAPTURING_INT (1 << 3) > +#define WD_WRITE_COMPLETE_INT (1 << 2) > + > +#define _WD_IIR_0 0x6e564 > +#define _WD_IIR_1 0x6ed64 > +#define WD_IIR(tc) _MMIO_WD(tc,\ > + _WD_IIR_0,\ > + _WD_IIR_1) > + > +#define _WD_FRAME_STATUS_0 0x6e56b > +#define _WD_FRAME_STATUS_1 0x6ed6b > +#define WD_FRAME_STATUS(tc) _MMIO_WD(tc,\ > + _WD_FRAME_STATUS_0,\ > + _WD_FRAME_STATUS_1) > + > +#define WD_FRAME_COMPLETE (1 << 31) > +#define WD_STATE_IDLE (0 << 24) > +#define WD_STATE_CAPSTART (1 << 24) > +#define WD_STATE_FRAME_START (2 << 24) > +#define WD_STATE_CAPACITIVE (3 << 24) > +#define WD_STATE_TG_DONE (4 << 24) > +#define WD_STATE_WDX_DONE (5 << 24) > +#define WD_STATE_QUICK_CAP (6 << 24) > + > +#define _WD_27_M_0 0x6e524 > +#define _WD_27_M_1 0x6ed24 > +#define WD_27_M(tc) _MMIO_WD(tc,\ > + _WD_27_M_0,\ > + _WD_27_M_1) > + > +#define _WD_27_N_0 0x6e528 > + > +//Address looks wrong in bspec: > +#define _WD_27_N_1 0x6ec28 > +#define WD_27_N(tc) _MMIO_WD(tc,\ > + _WD_27_N_0,\ > + _WD_27_N_1) > + > +#define _WD_TAIL_CFG_0 0x6e520 > +#define _WD_TAIL_CFG_1 0x6ed20 > + > +#define WD_TAIL_CFG(tc) _MMIO_WD(tc,\ > + _WD_TAIL_CFG_0,\ > + _WD_TAIL_CFG_1) > + > #define CLKREQ_POLICY _MMIO(0x101038) > #define CLKREQ_POLICY_MEM_UP_OVRD REG_BIT(1) -- Jani Nikula, Intel Open Source Graphics Center ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-29 9:52 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-02-23 6:20 [Intel-gfx] [RFC PATCH 0/2] Patches to enable writeback in i915 Suraj Kandpal 2022-02-23 6:20 ` [Intel-gfx] [RFC PATCH 1/2] drm/i915: Define WD trancoder for i915 Suraj Kandpal 2022-02-23 6:20 ` [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder Suraj Kandpal 2022-02-23 8:39 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Patches to enable writeback in i915 Patchwork -- strict thread matches above, loose matches on Subject: below -- 2022-06-01 8:21 [Intel-gfx] [RFC PATCH 0/2] i915 writeback enablement Suraj Kandpal 2022-06-01 8:22 ` [Intel-gfx] [RFC PATCH 2/2] drm/i915: Enabling WD Transcoder Suraj Kandpal 2022-06-29 9:52 ` Jani Nikula
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox