drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence
Subsystems (3)
PATCH v5 1/1 drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence
Starting from ICL, the default for MIPI GPIO sequences seems to be using native GPIOs i.e. GPIOs available in the GPU. These native GPIOs reuse many pins that quite frankly seem scary to poke based on the VBT sequences. We pretty much have to trust that the board is configured such that the relevant HPD, PP_CONTROL and GPIO bits aren't used for anything else.
MIPI sequence v4 also adds a flag to fall back to non-native sequences.
v5:
- Wrap SHOTPLUG_CTL_DDI modification in spin_lock() in icp_irq_handler() too (Ville)
- References instead of Closes issue 6131 because this does not fix everything
v4:
- Wrap SHOTPLUG_CTL_DDI modification in spin_lock_irq() (Ville)
v3:
- Fix -Wbitwise-conditional-parentheses (kernel test robot <[email protected]>)
v2:
- Fix HPD pin output set (impacts GPIOs 0 and 5)
- Fix GPIO data output direction set (impacts GPIOs 4 and 9)
- Reduce register accesses to single intel_de_rwm()
References: https://gitlab.freedesktop.org/drm/intel/-/issues/6131
--- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 94 +++++++++++++++++++- drivers/gpu/drm/i915/i915_irq.c | 3 + drivers/gpu/drm/i915/i915_reg.h | 1 + 3 files changed, 95 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +91 -3
@@ -41,9 +41,11 @@#include "i915_drv.h" #include "i915_reg.h" +#include "intel_de.h" #include "intel_display_types.h" #include "intel_dsi.h" #include "intel_dsi_vbt.h" +#include "intel_gmbus_regs.h" #include "vlv_dsi.h" #include "vlv_dsi_regs.h" #include "vlv_sideband.h"
@@ -377,6 +379,85 @@ static void icl_exec_gpio(struct intel_connector *connector,drm_dbg_kms (&dev_priv->drm,"Skipping ICL GPIO element execution\n" ); } +enum { +MIPI_RESET_1 =0 , +MIPI_AVDD_EN_1 , +MIPI_BKLT_EN_1 , +MIPI_AVEE_EN_1 , +MIPI_VIO_EN_1 , +MIPI_RESET_2 , +MIPI_AVDD_EN_2 , +MIPI_BKLT_EN_2 , +MIPI_AVEE_EN_2 , +MIPI_VIO_EN_2 , +}; + +static void icl_native_gpio_set_value (struct drm_i915_private *dev_priv, +int gpio,bool value) +{ +int index; + +if (drm_WARN_ON (&dev_priv->drm,DISPLAY_VER (dev_priv) ==11 && gpio >=MIPI_RESET_2 )) +return ; + +switch (gpio) { +case MIPI_RESET_1 : +case MIPI_RESET_2 : + index = gpio ==MIPI_RESET_1 ?HPD_PORT_A :HPD_PORT_B ; + +/* +* Disable HPD to set the pin to output, and set output +* value. The HPD pin should not be enabled for DSI anyway, +* assuming the board design and VBT are sane, and the pin isn't +* used by a non-DSI encoder. +* +* The locking protects against concurrent SHOTPLUG_CTL_DDI +* modifications in irq setup and handling. +*/ +spin_lock_irq (&dev_priv->irq_lock); +intel_de_rmw (dev_priv,SHOTPLUG_CTL_DDI , +SHOTPLUG_CTL_DDI_HPD_ENABLE (index) | +SHOTPLUG_CTL_DDI_HPD_OUTPUT_DATA (index), + value ?SHOTPLUG_CTL_DDI_HPD_OUTPUT_DATA (index) :0 ); +spin_unlock_irq (&dev_priv->irq_lock); +break ; +case MIPI_AVDD_EN_1 : +case MIPI_AVDD_EN_2 : + index = gpio ==MIPI_AVDD_EN_1 ?0 :1 ; + +intel_de_rmw (dev_priv,PP_CONTROL (index),PANEL_POWER_ON , + value ?PANEL_POWER_ON :0 ); +break ; +case MIPI_BKLT_EN_1 : +case MIPI_BKLT_EN_2 : + index = gpio ==MIPI_AVDD_EN_1 ?0 :1 ; + +intel_de_rmw (dev_priv,PP_CONTROL (index),EDP_BLC_ENABLE , + value ?EDP_BLC_ENABLE :0 ); +break ; +case MIPI_AVEE_EN_1 : +case MIPI_AVEE_EN_2 : + index = gpio ==MIPI_AVEE_EN_1 ?1 :2 ; + +intel_de_rmw (dev_priv,GPIO (dev_priv, index), +GPIO_CLOCK_VAL_OUT , +GPIO_CLOCK_DIR_MASK |GPIO_CLOCK_DIR_OUT | +GPIO_CLOCK_VAL_MASK | (value ?GPIO_CLOCK_VAL_OUT :0 )); +break ; +case MIPI_VIO_EN_1 : +case MIPI_VIO_EN_2 : + index = gpio ==MIPI_VIO_EN_1 ?1 :2 ; + +intel_de_rmw (dev_priv,GPIO (dev_priv, index), +GPIO_DATA_VAL_OUT , +GPIO_DATA_DIR_MASK |GPIO_DATA_DIR_OUT | +GPIO_DATA_VAL_MASK | (value ?GPIO_DATA_VAL_OUT :0 )); +break ; +default : +MISSING_CASE (gpio); + } +} +static const u8 *mipi_exec_gpio (struct intel_dsi *intel_dsi,const u8 *data) {struct drm_device *dev = intel_dsi->base.base.dev;
@@ -384,8 +465,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)struct intel_connector *connector = intel_dsi->attached_connector;u8 gpio_source, gpio_index =0 , gpio_number;bool value; - -drm_dbg_kms (&dev_priv->drm,"\n" ); +bool native =DISPLAY_VER (dev_priv) >=11 ;if (connector->panel.vbt.dsi.seq_version >=3 ) gpio_index = *data++;
@@ -398,10 +478,18 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)else gpio_source =0 ; +if (connector->panel.vbt.dsi.seq_version >=4 && *data &BIT (1 )) + native = false; +/* pull up/down */ value = *data++ &1 ; -if (DISPLAY_VER (dev_priv) >=11 ) +drm_dbg_kms (&dev_priv->drm,"GPIO index %u, number %u, source %u, native %s, set to %s\n" , + gpio_index, gpio_number, gpio_source,str_yes_no (native),str_on_off (value)); + +if (native) +icl_native_gpio_set_value (dev_priv, gpio_number, value); +else if (DISPLAY_VER (dev_priv) >=11 )icl_exec_gpio (connector, gpio_source, gpio_index, value);else if (IS_VALLEYVIEW (dev_priv))vlv_exec_gpio (connector, gpio_source, gpio_number, value);
drivers/gpu/drm/i915/i915_irq.c +3 -0
@@ -1974,7 +1974,10 @@ static void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (ddi_hotplug_trigger) {u32 dig_hotplug_reg; +/* Locking due to DSI native GPIO sequences */ +spin_lock (&dev_priv->irq_lock); dig_hotplug_reg =intel_uncore_rmw (&dev_priv->uncore,SHOTPLUG_CTL_DDI ,0 ,0 ); +spin_unlock (&dev_priv->irq_lock); intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask, ddi_hotplug_trigger, dig_hotplug_reg,
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -5966,6 +5966,7 @@#define SHOTPLUG_CTL_DDI _MMIO(0xc4030)#define SHOTPLUG_CTL_DDI_HPD_ENABLE (hpd_pin) (0x8 << (_HPD_PIN_DDI(hpd_pin) * 4)) +#define SHOTPLUG_CTL_DDI_HPD_OUTPUT_DATA (hpd_pin) (0x4 << (_HPD_PIN_DDI(hpd_pin) * 4))#define SHOTPLUG_CTL_DDI_HPD_STATUS_MASK (hpd_pin) (0x3 << (_HPD_PIN_DDI(hpd_pin) * 4))#define SHOTPLUG_CTL_DDI_HPD_NO_DETECT (hpd_pin) (0x0 << (_HPD_PIN_DDI(hpd_pin) * 4))#define SHOTPLUG_CTL_DDI_HPD_SHORT_DETECT (hpd_pin) (0x1 << (_HPD_PIN_DDI(hpd_pin) * 4))
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence (rev5)
== Series Details ==
== Series Details ==
Series: drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence (rev5)
URL : https://patchwork.freedesktop.org/series/111850/
State : warning
== Summary ==
Error: dim checkpatch failed60bdaba1b923 drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence
-:21: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #21:
- References instead of Closes issue 6131 because this does not fix everything
total: 0 errors, 1 warnings, 0 checks, 141 lines checked
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence (rev5)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence (rev5)
URL : https://patchwork.freedesktop.org/series/111850/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12515 -> Patchwork_111850v5
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/index.html
Participating hosts (40 -> 41)
------------------------------
Additional (7): fi-tgl-dsi fi-bwr-2160 fi-apl-guc fi-snb-2520m bat-adlp-4 fi-cfl-8109u fi-blb-e6850
Missing (6): bat-dg1-7 bat-dg1-6 bat-adln-1 bat-rplp-1 bat-rpls-1 bat-rpls-2
Known issues
------------
Here are the changes found in Patchwork_111850v5 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- bat-adlp-4: NOTRUN -> [SKIP][1] ([i915#7456])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-cfl-8109u: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-cfl-8109u/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- fi-apl-guc: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-apl-guc/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- bat-adlp-4: NOTRUN -> [SKIP][4] ([i915#4613]) +3 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@gem_lmem_swapping@verify-random:
- fi-cfl-8109u: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-cfl-8109u/igt@[email protected]
* igt@gem_tiled_pread_basic:
- bat-adlp-4: NOTRUN -> [SKIP][6] ([i915#3282])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@gem_tiled_pread_basic.html
* igt@i915_pm_rpm@module-reload:
- fi-blb-e6850: NOTRUN -> [SKIP][7] ([fdo#109271]) +51 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-blb-e6850/igt@[email protected]
- fi-kbl-soraka: [PASS][8] -> [DMESG-WARN][9] ([i915#1982])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/fi-kbl-soraka/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-kbl-soraka/igt@[email protected]
* igt@i915_pm_rps@basic-api:
- bat-adlp-4: NOTRUN -> [SKIP][10] ([i915#6621])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-hsw-4770: NOTRUN -> [SKIP][11] ([fdo#109271] / [fdo#111827])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-hsw-4770/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- bat-adlp-4: NOTRUN -> [SKIP][12] ([fdo#111827]) +8 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@kms_chamelium@hdmi-crc-fast:
- fi-apl-guc: NOTRUN -> [SKIP][13] ([fdo#109271] / [fdo#111827]) +8 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-apl-guc/igt@[email protected]
- fi-snb-2520m: NOTRUN -> [SKIP][14] ([fdo#109271] / [fdo#111827]) +8 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-snb-2520m/igt@[email protected]
* igt@kms_chamelium@hdmi-edid-read:
- fi-cfl-8109u: NOTRUN -> [SKIP][15] ([fdo#109271] / [fdo#111827]) +8 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-cfl-8109u/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- bat-adlp-4: NOTRUN -> [SKIP][16] ([i915#4103])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-adlp-4: NOTRUN -> [SKIP][17] ([i915#4093]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@kms_psr@primary_mmap_gtt:
- fi-bwr-2160: NOTRUN -> [SKIP][18] ([fdo#109271]) +54 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-bwr-2160/igt@kms_psr@primary_mmap_gtt.html
* igt@kms_psr@sprite_plane_onoff:
- fi-apl-guc: NOTRUN -> [SKIP][19] ([fdo#109271]) +12 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-apl-guc/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-adlp-4: NOTRUN -> [SKIP][20] ([i915#3555] / [i915#4579])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-snb-2520m: NOTRUN -> [SKIP][21] ([fdo#109271]) +23 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-snb-2520m/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-cfl-8109u: NOTRUN -> [SKIP][22] ([fdo#109271]) +9 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-cfl-8109u/igt@[email protected]
- bat-adlp-4: NOTRUN -> [SKIP][23] ([fdo#109295] / [i915#3301] / [i915#3708])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
* igt@prime_vgem@basic-write:
- bat-adlp-4: NOTRUN -> [SKIP][24] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-4/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][25] ([i915#4785]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/fi-hsw-4770/igt@i915_selftest@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/fi-hsw-4770/igt@i915_selftest@[email protected]
- {bat-adlm-1}: [INCOMPLETE][27] ([i915#4983]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/bat-adlm-1/igt@i915_selftest@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlm-1/igt@i915_selftest@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-edp-1:
- {bat-adlp-6}: [DMESG-WARN][29] ([i915#2867]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/bat-adlp-6/igt@kms_pipe_crc_basic@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/bat-adlp-6/igt@kms_pipe_crc_basic@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4093]: https://gitlab.freedesktop.org/drm/intel/issues/4093
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6856]: https://gitlab.freedesktop.org/drm/intel/issues/6856
[i915#7125]: https://gitlab.freedesktop.org/drm/intel/issues/7125
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
Build changes
-------------
* Linux: CI_DRM_12515 -> Patchwork_111850v5
CI-20190529: 20190529
CI_DRM_12515: 25905f33e9cb1630d94ce04688d5a6c756f96e9d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7098: d24d605d1b94d404e5ccea13eed607b81e233696 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_111850v5: 25905f33e9cb1630d94ce04688d5a6c756f96e9d @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
b8657aee6d66 drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence (rev5)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/dsi: add support for ICL+ native MIPI GPIO sequence (rev5)
URL : https://patchwork.freedesktop.org/series/111850/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12515_full -> Patchwork_111850v5_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/index.html
Participating hosts (14 -> 10)
------------------------------
Missing (4): shard-rkl0 pig-kbl-iris pig-glk-j5005 pig-skl-6260u
Known issues
------------
Here are the changes found in Patchwork_111850v5_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2346])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-glk3/igt@kms_cursor_legacy@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-glk8/igt@kms_cursor_legacy@[email protected]
#### Possible fixes ####
* igt@gem_eio@reset-stress:
- {shard-dg1}: [FAIL][3] ([i915#5784]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-dg1-15/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-dg1-15/igt@[email protected]
* igt@gem_exec_balancer@fairslice:
- {shard-rkl}: [SKIP][5] ([i915#6259]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-5/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-2/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][7] ([i915#2846]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-glk3/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-glk8/igt@[email protected]
* igt@gem_exec_reloc@basic-cpu-read:
- {shard-rkl}: [SKIP][9] ([i915#3281]) -> [PASS][10] +4 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-5/igt@[email protected]
* igt@gem_madvise@dontneed-before-pwrite:
- {shard-rkl}: [SKIP][11] ([i915#3282]) -> [PASS][12] +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-5/igt@[email protected]
* igt@gen9_exec_parse@unaligned-access:
- {shard-rkl}: [SKIP][13] ([i915#2527]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-5/igt@[email protected]
* igt@i915_hangman@engine-engine-error@bcs0:
- {shard-rkl}: [SKIP][15] ([i915#6258]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-5/igt@i915_hangman@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-2/igt@i915_hangman@[email protected]
* igt@i915_pm_rpm@modeset-lpsp:
- {shard-rkl}: [SKIP][17] ([i915#1397]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-3/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-6/igt@[email protected]
* igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-1:
- shard-glk: [FAIL][19] ([i915#2521]) -> [PASS][20] +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-glk7/igt@kms_async_flips@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-glk1/igt@kms_async_flips@[email protected]
* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- {shard-rkl}: [SKIP][21] ([i915#1845] / [i915#4098]) -> [PASS][22] +15 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-3/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-6/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size:
- shard-glk: [FAIL][23] ([i915#2346]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-glk3/igt@kms_cursor_legacy@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-glk8/igt@kms_cursor_legacy@[email protected]
* igt@kms_fbcon_fbt@psr:
- {shard-rkl}: [SKIP][25] ([i915#3955]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-3/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite:
- {shard-rkl}: [SKIP][27] ([i915#1849] / [i915#4098]) -> [PASS][28] +6 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_properties@plane-properties-legacy:
- {shard-rkl}: [SKIP][29] ([i915#1849]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-5/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-6/igt@[email protected]
* igt@kms_psr@primary_page_flip:
- {shard-rkl}: [SKIP][31] ([i915#1072]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-5/igt@kms_psr@primary_page_flip.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-6/igt@kms_psr@primary_page_flip.html
* igt@prime_vgem@basic-fence-flip:
- {shard-rkl}: [SKIP][33] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12515/shard-rkl-5/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/shard-rkl-6/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3825]: https://gitlab.freedesktop.org/drm/intel/issues/3825
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3966]: https://gitlab.freedesktop.org/drm/intel/issues/3966
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7673]: https://gitlab.freedesktop.org/drm/intel/issues/7673
[i915#7681]: https://gitlab.freedesktop.org/drm/intel/issues/7681
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
Build changes
-------------
* Linux: CI_DRM_12515 -> Patchwork_111850v5
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12515: 25905f33e9cb1630d94ce04688d5a6c756f96e9d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7098: d24d605d1b94d404e5ccea13eed607b81e233696 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_111850v5: 25905f33e9cb1630d94ce04688d5a6c756f96e9d @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111850v5/index.html
Quoted 20 lines · Jani Nikula
Starting from ICL, the default for MIPI GPIO sequences seems to be using native GPIOs i.e. GPIOs available in the GPU. These native GPIOs reuse many pins that quite frankly seem scary to poke based on the VBT sequences. We pretty much have to trust that the board is configured such that the relevant HPD,
PP_CONTROLand GPIO bits aren't used for anything else.MIPI sequence v4 also adds a flag to fall back to non-native sequences.
v5:
- WrapSHOTPLUG_CTL_DDImodification inspin_lock()inicp_irq_handler()too (Ville)
- References instead of Closes issue 6131 because this does not fix everythingv4:
- WrapSHOTPLUG_CTL_DDImodification inspin_lock_irq()(Ville)v3:
- Fix -Wbitwise-conditional-parentheses (kernel test robot <[email protected]>)
Quoted 8 lines
v2:
- Fix HPD pin output set (impacts GPIOs 0 and 5)
- Fix GPIO data output direction set (impacts GPIOs 4 and 9)
- Reduce register accesses to singleintel_de_rwm()References: https://gitlab.freedesktop.org/drm/intel/-/issues/6131
Cc Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 167 lines
--- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 94 +++++++++++++++++++- drivers/gpu/drm/i915/i915_irq.c | 3 + drivers/gpu/drm/i915/i915_reg.h | 1 + 3 files changed, 95 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_dsi_vbt.c +91
-3@@ -41,9 +41,11 @@#include "i915_drv.h" #include "i915_reg.h" +#include "intel_de.h" #include "intel_display_types.h" #include "intel_dsi.h" #include "intel_dsi_vbt.h" +#include "intel_gmbus_regs.h" #include "vlv_dsi.h" #include "vlv_dsi_regs.h" #include "vlv_sideband.h" @@ -377,6 +379,85 @@ static void icl_exec_gpio(struct intel_connector *connector,drm_dbg_kms (&dev_priv->drm,"Skipping ICL GPIO element execution\n" ); } +enum { +MIPI_RESET_1 =0 , +MIPI_AVDD_EN_1 , +MIPI_BKLT_EN_1 , +MIPI_AVEE_EN_1 , +MIPI_VIO_EN_1 , +MIPI_RESET_2 , +MIPI_AVDD_EN_2 , +MIPI_BKLT_EN_2 , +MIPI_AVEE_EN_2 , +MIPI_VIO_EN_2 , +}; + +static void icl_native_gpio_set_value (struct drm_i915_private *dev_priv, +int gpio,bool value) +{ +int index; + +if (drm_WARN_ON (&dev_priv->drm,DISPLAY_VER (dev_priv) ==11 && gpio >=MIPI_RESET_2 )) +return ; + +switch (gpio) { +case MIPI_RESET_1 : +case MIPI_RESET_2 : + index = gpio ==MIPI_RESET_1 ?HPD_PORT_A :HPD_PORT_B ; + +/* +* Disable HPD to set the pin to output, and set output +* value. The HPD pin should not be enabled for DSI anyway, +* assuming the board design and VBT are sane, and the pin isn't +* used by a non-DSI encoder. +* +* The locking protects against concurrent SHOTPLUG_CTL_DDI +* modifications in irq setup and handling. +*/ +spin_lock_irq (&dev_priv->irq_lock); +intel_de_rmw (dev_priv,SHOTPLUG_CTL_DDI , +SHOTPLUG_CTL_DDI_HPD_ENABLE (index) | +SHOTPLUG_CTL_DDI_HPD_OUTPUT_DATA (index), + value ?SHOTPLUG_CTL_DDI_HPD_OUTPUT_DATA (index) :0 ); +spin_unlock_irq (&dev_priv->irq_lock); +break ; +case MIPI_AVDD_EN_1 : +case MIPI_AVDD_EN_2 : + index = gpio ==MIPI_AVDD_EN_1 ?0 :1 ; + +intel_de_rmw (dev_priv,PP_CONTROL (index),PANEL_POWER_ON , + value ?PANEL_POWER_ON :0 ); +break ; +case MIPI_BKLT_EN_1 : +case MIPI_BKLT_EN_2 : + index = gpio ==MIPI_AVDD_EN_1 ?0 :1 ; + +intel_de_rmw (dev_priv,PP_CONTROL (index),EDP_BLC_ENABLE , + value ?EDP_BLC_ENABLE :0 ); +break ; +case MIPI_AVEE_EN_1 : +case MIPI_AVEE_EN_2 : + index = gpio ==MIPI_AVEE_EN_1 ?1 :2 ; + +intel_de_rmw (dev_priv,GPIO (dev_priv, index), +GPIO_CLOCK_VAL_OUT , +GPIO_CLOCK_DIR_MASK |GPIO_CLOCK_DIR_OUT | +GPIO_CLOCK_VAL_MASK | (value ?GPIO_CLOCK_VAL_OUT :0 )); +break ; +case MIPI_VIO_EN_1 : +case MIPI_VIO_EN_2 : + index = gpio ==MIPI_VIO_EN_1 ?1 :2 ; + +intel_de_rmw (dev_priv,GPIO (dev_priv, index), +GPIO_DATA_VAL_OUT , +GPIO_DATA_DIR_MASK |GPIO_DATA_DIR_OUT | +GPIO_DATA_VAL_MASK | (value ?GPIO_DATA_VAL_OUT :0 )); +break ; +default : +MISSING_CASE (gpio); + } +} +static const u8 *mipi_exec_gpio (struct intel_dsi *intel_dsi,const u8 *data) {struct drm_device *dev = intel_dsi->base.base.dev;@@ -384,8 +465,7 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)struct intel_connector *connector = intel_dsi->attached_connector;u8 gpio_source, gpio_index =0 , gpio_number;bool value; - -drm_dbg_kms (&dev_priv->drm,"\n" ); +bool native =DISPLAY_VER (dev_priv) >=11 ;if (connector->panel.vbt.dsi.seq_version >=3 ) gpio_index = *data++;@@ -398,10 +478,18 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)else gpio_source =0 ; +if (connector->panel.vbt.dsi.seq_version >=4 && *data &BIT (1 )) + native = false; +/* pull up/down */ value = *data++ &1 ; -if (DISPLAY_VER (dev_priv) >=11 ) +drm_dbg_kms (&dev_priv->drm,"GPIO index %u, number %u, source %u, native %s, set to %s\n" , + gpio_index, gpio_number, gpio_source,str_yes_no (native),str_on_off (value)); + +if (native) +icl_native_gpio_set_value (dev_priv, gpio_number, value); +else if (DISPLAY_VER (dev_priv) >=11 )icl_exec_gpio (connector, gpio_source, gpio_index, value);else if (IS_VALLEYVIEW (dev_priv))vlv_exec_gpio (connector, gpio_source, gpio_number, value);drivers/gpu/drm/i915/i915_irq.c +3
-0@@ -1974,7 +1974,10 @@ static void icp_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)if (ddi_hotplug_trigger) {u32 dig_hotplug_reg; +/* Locking due to DSI native GPIO sequences */ +spin_lock (&dev_priv->irq_lock); dig_hotplug_reg =intel_uncore_rmw (&dev_priv->uncore,SHOTPLUG_CTL_DDI ,0 ,0 ); +spin_unlock (&dev_priv->irq_lock); intel_get_hpd_pins(dev_priv, &pin_mask, &long_mask, ddi_hotplug_trigger, dig_hotplug_reg,drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -5966,6 +5966,7 @@#define SHOTPLUG_CTL_DDI _MMIO(0xc4030)#define SHOTPLUG_CTL_DDI_HPD_ENABLE (hpd_pin) (0x8 << (_HPD_PIN_DDI(hpd_pin) * 4)) +#define SHOTPLUG_CTL_DDI_HPD_OUTPUT_DATA (hpd_pin) (0x4 << (_HPD_PIN_DDI(hpd_pin) * 4))#define SHOTPLUG_CTL_DDI_HPD_STATUS_MASK (hpd_pin) (0x3 << (_HPD_PIN_DDI(hpd_pin) * 4))#define SHOTPLUG_CTL_DDI_HPD_NO_DETECT (hpd_pin) (0x0 << (_HPD_PIN_DDI(hpd_pin) * 4))#define SHOTPLUG_CTL_DDI_HPD_SHORT_DETECT (hpd_pin) (0x1 << (_HPD_PIN_DDI(hpd_pin) * 4))Signature · 1 line
2.34.1
Signature · 2 lines
Ville Syrjälä Intel