drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
Subsystems (3)
PATCH 1/1 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
From: Maarten Lankhorst <[email protected]>
With bigjoiner, there will be 2 pipes driving 2 halfs of 1 transcoder, because of this, we need a pipe_mode for various calculations, including for example watermarks, plane clipping, etc.
v6:
* renaming in separate function, only pipe_mode here (Ville)
* Add description (Maarten)
v5:
* Rebase (Manasi)
v4:
* Manual rebase (Manasi)
v3:
* Change state to crtc_state, fix rebase err (Manasi) v2:
* Manual Rebase (Manasi)
--- drivers/gpu/drm/i915/display/intel_display.c | 41 +++++----- .../drm/i915/display/intel_display_types.h | 11 ++- drivers/gpu/drm/i915/intel_pm.c | 76 +++++++++---------- 3 files changed, 70 insertions(+), 58 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +23 -18
@@ -6167,18 +6167,16 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,static int skl_update_scaler_crtc (struct intel_crtc_state *crtc_state) { -const struct drm_display_mode *adjusted_mode = - &crtc_state->hw.adjusted_mode; +const struct drm_display_mode *pipe_mode = &crtc_state->hw.pipe_mode;int width, height;if (crtc_state->pch_pfit.enabled) { width =drm_rect_width (&crtc_state->pch_pfit.dst); height =drm_rect_height (&crtc_state->pch_pfit.dst); }else { - width = adjusted_mode->crtc_hdisplay; - height = adjusted_mode->crtc_vdisplay; + width = pipe_mode->crtc_hdisplay; + height = pipe_mode->crtc_vdisplay; } - return skl_update_scaler(crtc_state, !crtc_state->hw.active, SKL_CRTC_INDEX, &crtc_state->scaler_state.scaler_id,
@@ -8192,7 +8190,7 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc)static u32 ilk_pipe_pixel_rate (const struct intel_crtc_state *crtc_state) { -u32 pixel_rate = crtc_state->hw.adjusted_mode.crtc_clock; +u32 pixel_rate = crtc_state->hw.pipe_mode.crtc_clock;unsigned int pipe_w, pipe_h, pfit_w, pfit_h;/*
@@ -8229,7 +8227,7 @@ static void intel_crtc_compute_pixel_rate(struct intel_crtc_state *crtc_state)if (HAS_GMCH (dev_priv))/* FIXME calculate proper pipe pixel rate for GMCH pfit */ crtc_state->pixel_rate = - crtc_state->hw.adjusted_mode.crtc_clock; + crtc_state->hw.pipe_mode.crtc_clock;else crtc_state->pixel_rate =ilk_pipe_pixel_rate (crtc_state);
@@ -8239,7 +8237,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; +const struct drm_display_mode *pipe_mode = &pipe_config->hw.pipe_mode;int clock_limit = dev_priv->max_dotclk_freq;if (INTEL_GEN (dev_priv) <4 ) {
@@ -8250,16 +8248,16 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,* is > 90% of the (display) core speed. */ if (intel_crtc_supports_double_wide (crtc) && - adjusted_mode->crtc_clock > clock_limit) { + pipe_mode->crtc_clock > clock_limit) { clock_limit = dev_priv->max_dotclk_freq; pipe_config->double_wide = true; } } -if (adjusted_mode->crtc_clock > clock_limit) { +if (pipe_mode->crtc_clock > clock_limit) {drm_dbg_kms (&dev_priv->drm,"requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n" , - adjusted_mode->crtc_clock, clock_limit, + pipe_mode->crtc_clock, clock_limit,yesno (pipe_config->double_wide));return -EINVAL ; }
@@ -8302,7 +8300,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,* WaPruneModeWithIncorrectHsyncOffset:ctg,elk,ilk,snb,ivb,vlv,hsw. */ if ((INTEL_GEN (dev_priv) >4 ||IS_G4X (dev_priv)) && - adjusted_mode->crtc_hsync_start == adjusted_mode->crtc_hdisplay) + pipe_mode->crtc_hsync_start == pipe_mode->crtc_hdisplay)return -EINVAL ;intel_crtc_compute_pixel_rate (pipe_config);
@@ -12817,15 +12815,15 @@ static bool c8_planes_changed(const struct intel_crtc_state *new_crtc_state)static u16 hsw_linetime_wm (const struct intel_crtc_state *crtc_state) { -const struct drm_display_mode *adjusted_mode = - &crtc_state->hw.adjusted_mode; +const struct drm_display_mode *pipe_mode = + &crtc_state->hw.pipe_mode;int linetime_wm;if (!crtc_state->hw.enable)return 0 ; - linetime_wm =DIV_ROUND_CLOSEST (adjusted_mode->crtc_htotal *1000 *8 , - adjusted_mode->crtc_clock); + linetime_wm =DIV_ROUND_CLOSEST (pipe_mode->crtc_htotal *1000 *8 , + pipe_mode->crtc_clock);return min (linetime_wm,0x1ff ); }
@@ -13455,8 +13453,9 @@ intel_crtc_copy_uapi_to_hw_state(struct intel_crtc_state *crtc_state) crtc_state->hw.enable = crtc_state->uapi.enable; crtc_state->hw.active = crtc_state->uapi.active; crtc_state->hw.mode = crtc_state->uapi.mode; - crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; crtc_state->hw.scaling_filter = crtc_state->uapi.scaling_filter; + crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +intel_crtc_copy_uapi_to_hw_state_nomodeset (crtc_state); }
@@ -13559,7 +13558,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)* computation to clearly distinguish it from the adjusted mode, which * can be changed by the connectors in the below retry loop. */ -drm_mode_get_hv_timing (&pipe_config->hw.mode, +drm_mode_get_hv_timing (&pipe_config->hw.pipe_mode, &pipe_config->pipe_src_w, &pipe_config->pipe_src_h);
@@ -13653,6 +13652,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)"hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* without bigjoiner, pipe_mode == adjusted_mode */ + pipe_config->hw.pipe_mode = pipe_config->hw.adjusted_mode; +return 0 ; }
@@ -18910,6 +18912,9 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)*/ crtc_state->inherited = true; +/* initialize pipe_mode */ + crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode; +intel_crtc_compute_pixel_rate (crtc_state);intel_crtc_update_active_timings (crtc_state);
drivers/gpu/drm/i915/display/intel_display_types.h +9 -2
@@ -817,15 +817,22 @@ struct intel_crtc_state {* The following members are used to verify the hardware state: * - enable * - active -* - mode / adjusted_mode +* - mode/adjusted_mode * - color property blobs. * * During initial hw readout, they need to be copied to uapi. +* +* Bigjoiner will allow a transcoder mode that spans 2 pipes; +* Use the pipe_mode for calculations like watermarks, pipe +* scaler, and bandwidth. +* +* Use adjusted_mode for things that need to know the full +* mode on the transcoder, which spans all pipes. */ struct {bool active, enable;struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; -struct drm_display_mode mode, adjusted_mode; +struct drm_display_mode mode, pipe_mode, adjusted_mode;enum drm_scaling_filter scaling_filter; } hw;
drivers/gpu/drm/i915/intel_pm.c +38 -38
215 lines not on this page · raw message
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
== Series Details ==
== Series Details ==
Series: drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
URL : https://patchwork.freedesktop.org/series/82931/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 3060c8151734 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split -:7: WARNING:TYPO_SPELLING: 'halfs' may be misspelled - perhaps 'halves'? #7: With bigjoiner, there will be 2 pipes driving 2 halfs of 1 transcoder,
-:135: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #135: FILE: drivers/gpu/drm/i915/display/intel_display.c:13457:
+ crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode;
total: 0 errors, 1 warnings, 1 checks, 366 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
URL : https://patchwork.freedesktop.org/series/82931/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9178 -> Patchwork_18757
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18757 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18757, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18757:
### IGT changes ###
#### Possible regressions ####
* igt@runner@aborted:
- fi-ilk-650: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-ilk-650/igt@[email protected]
- fi-pnv-d510: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-pnv-d510/igt@[email protected]
- fi-skl-6600u: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-skl-6600u/igt@[email protected]
- fi-gdg-551: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-gdg-551/igt@[email protected]
- fi-snb-2520m: NOTRUN -> [FAIL][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-snb-2520m/igt@[email protected]
- fi-skl-lmem: NOTRUN -> [FAIL][6]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-skl-lmem/igt@[email protected]
- fi-bwr-2160: NOTRUN -> [FAIL][7]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-bwr-2160/igt@[email protected]
- fi-kbl-guc: NOTRUN -> [FAIL][8]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-kbl-guc/igt@[email protected]
- fi-snb-2600: NOTRUN -> [FAIL][9]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-snb-2600/igt@[email protected]
- fi-cml-u2: NOTRUN -> [FAIL][10]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-cml-u2/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][11]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-ivb-3770/igt@[email protected]
- fi-byt-j1900: NOTRUN -> [FAIL][12]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-byt-j1900/igt@[email protected]
- fi-elk-e7500: NOTRUN -> [FAIL][13]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-elk-e7500/igt@[email protected]
- fi-cml-s: NOTRUN -> [FAIL][14]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-cml-s/igt@[email protected]
- fi-skl-guc: NOTRUN -> [FAIL][15]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-skl-guc/igt@[email protected]
- fi-skl-6700k2: NOTRUN -> [FAIL][16]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-skl-6700k2/igt@[email protected]
- fi-blb-e6850: NOTRUN -> [FAIL][17]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-blb-e6850/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@runner@aborted:
- {fi-ehl-1}: NOTRUN -> [FAIL][18]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/fi-ehl-1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18757 that come from known issues:
### IGT changes ###
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1569]: https://gitlab.freedesktop.org/drm/intel/issues/1569
[i915#1784]: https://gitlab.freedesktop.org/drm/intel/issues/1784
[i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
[i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
[i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
[i915#2439]: https://gitlab.freedesktop.org/drm/intel/issues/2439
Participating hosts (44 -> 38)
------------------------------
Additional (1): fi-blb-e6850
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9178 -> Patchwork_18757
CI-20190529: 20190529
CI_DRM_9178: e5886151db1a9d6300303264648595d3bd5a8d60 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5822: b4bcf05cb9839037128905deda7146434155cc41 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18757: 3060c815173414fa0ee78585e2774e3b4c7a5a81 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
3060c8151734 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18757/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx