drm/i915: introduce INTEL_DISPLAY_ENABLED()
Subsystems (3)
PATCH v2 1/1 drm/i915: introduce INTEL_DISPLAY_ENABLED()
Prepare for making a distinction between not having display and having disabled display. Add INTEL_DISPLAY_ENABLED() and use it where HAS_DISPLAY() is used after intel_device_info_runtime_init(). This is initially duplication, as disabling display still leads to ->pipe_mask = 0 and HAS_DISPLAY() being false.
Note that ever since i915.display_disable was introduced, it has not affected PCH detection even if it uses HAS_DISPLAY(), as display disable happens after that.
Since INTEL_DISPLAY_ENABLED() will not make sense unless HAS_DISPLAY() is true, include a warning for catching misuses making decisions on INTEL_DISPLAY_ENABLED() when HAS_DISPLAY() is false.
v2: Remove INTEL_DISPLAY_ENABLED() check from intel_detect_pch() (Chris)
--- drivers/gpu/drm/i915/display/intel_bios.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 6 files changed, 12 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_bios.c +1 -1
@@ -1833,7 +1833,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv)const struct bdb_header *bdb;u8 __iomem *bios =NULL ; -if (!HAS_DISPLAY (dev_priv)) { +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv)) {DRM_DEBUG_KMS ("Skipping VBT init due to disabled display.\n" );return ; }
drivers/gpu/drm/i915/display/intel_display.c +2 -2
@@ -15366,7 +15366,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)intel_pps_init (dev_priv); -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return ;if (INTEL_GEN (dev_priv) >=12 ) {
@@ -17273,7 +17273,7 @@ intel_display_capture_error_state(struct drm_i915_private *dev_priv)BUILD_BUG_ON (ARRAY_SIZE (transcoders) !=ARRAY_SIZE (error->transcoder)); -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return NULL ; error =kzalloc (sizeof (*error),GFP_ATOMIC );
drivers/gpu/drm/i915/display/intel_fbdev.c +1 -1
@@ -444,7 +444,7 @@ int intel_fbdev_init(struct drm_device *dev)struct intel_fbdev *ifbdev;int ret; -if (WARN_ON (!HAS_DISPLAY (dev_priv))) +if (WARN_ON (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv)))return -ENODEV ; ifbdev =kzalloc (sizeof (struct intel_fbdev ),GFP_KERNEL );
drivers/gpu/drm/i915/display/intel_gmbus.c +1 -1
@@ -836,7 +836,7 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv)unsigned int pin;int ret; -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return 0 ;if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))
drivers/gpu/drm/i915/i915_drv.c +4 -4
@@ -338,7 +338,7 @@ static int i915_driver_modeset_probe(struct drm_device *dev)if (i915_inject_probe_failure (dev_priv))return -ENODEV ; -if (HAS_DISPLAY (dev_priv)) { +if (HAS_DISPLAY (dev_priv) &&INTEL_DISPLAY_ENABLED (dev_priv)) { ret =drm_vblank_init (&dev_priv->drm,INTEL_NUM_PIPES (dev_priv));if (ret)
@@ -389,7 +389,7 @@ static int i915_driver_modeset_probe(struct drm_device *dev)intel_overlay_setup (dev_priv); -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return 0 ; ret =intel_fbdev_init (dev);
@@ -1378,7 +1378,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) }else DRM_ERROR ("Failed to register driver for userspace access!\n" ); -if (HAS_DISPLAY (dev_priv)) { +if (HAS_DISPLAY (dev_priv) &&INTEL_DISPLAY_ENABLED (dev_priv)) {/* Must be done after probing outputs */ intel_opregion_register (dev_priv);acpi_video_register ();
@@ -1401,7 +1401,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)* We need to coordinate the hotplugs with the asynchronous fbdev * configuration, for which we use the fbdev->async_cookie. */ -if (HAS_DISPLAY (dev_priv)) +if (HAS_DISPLAY (dev_priv) &&INTEL_DISPLAY_ENABLED (dev_priv))drm_kms_helper_poll_init (dev);intel_power_domains_enable (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -2192,6 +2192,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_DISPLAY (dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0) +/* Only valid when HAS_DISPLAY() is true */ +#define INTEL_DISPLAY_ENABLED (dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display) +static inline bool intel_vtd_active (void ) {#ifdef CONFIG_INTEL_IOMMU
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: introduce INTEL_DISPLAY_ENABLED() (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915: introduce INTEL_DISPLAY_ENABLED() (rev2)
URL : https://patchwork.freedesktop.org/series/66610/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 63b6a8f6a4d6 drm/i915: introduce INTEL_DISPLAY_ENABLED() -:142: WARNING:LONG_LINE: line over 100 characters #142: FILE: drivers/gpu/drm/i915/i915_drv.h:2196: +#define INTEL_DISPLAY_ENABLED(dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display)
total: 0 errors, 1 warnings, 0 checks, 81 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: introduce INTEL_DISPLAY_ENABLED() (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: introduce INTEL_DISPLAY_ENABLED() (rev2)
URL : https://patchwork.freedesktop.org/series/66610/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6889 -> Patchwork_14398
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_14398:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_pm_rpm@basic-pci-d3-state:
- {fi-tgl-u}: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-tgl-u/igt@[email protected]
* igt@i915_pm_rpm@basic-rte:
- {fi-tgl-u}: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-tgl-u/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_14398 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-icl-u3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-icl-u3/igt@[email protected]
* igt@i915_module_load@reload:
- fi-icl-u3: [PASS][5] -> [DMESG-WARN][6] ([fdo#107724] / [fdo#111214])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-icl-u3/igt@[email protected]
* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [PASS][7] -> [DMESG-FAIL][8] ([fdo#111108])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
* igt@kms_chamelium@dp-edid-read:
- fi-kbl-7500u: [PASS][9] -> [WARN][10] ([fdo#109483])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-kbl-7500u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-kbl-7500u/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][11] -> [DMESG-WARN][12] ([fdo#102614])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-hsw-peppy/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-hsw-peppy/igt@[email protected]
- fi-icl-u2: [PASS][13] -> [FAIL][14] ([fdo#103167])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-icl-u2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_gttfill@basic:
- {fi-tgl-u}: [INCOMPLETE][15] ([fdo#111593]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-tgl-u/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-tgl-u/igt@[email protected]
* igt@gem_mmap_gtt@basic-write-gtt:
- fi-icl-u3: [DMESG-WARN][17] ([fdo#107724]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-icl-u3/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][19] ([fdo#111096]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-kbl-7500u/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-kbl-7500u/igt@[email protected]
* igt@kms_force_connector_basic@force-edid:
- fi-ilk-650: [DMESG-WARN][21] ([fdo#106387]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/fi-ilk-650/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/fi-ilk-650/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#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#106387]: https://bugs.freedesktop.org/show_bug.cgi?id=106387
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[fdo#111214]: https://bugs.freedesktop.org/show_bug.cgi?id=111214
[fdo#111593]: https://bugs.freedesktop.org/show_bug.cgi?id=111593
[fdo#111678]: https://bugs.freedesktop.org/show_bug.cgi?id=111678
Participating hosts (53 -> 46)
------------------------------
Additional (1): fi-tgl-u2
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6889 -> Patchwork_14398
CI-20190529: 20190529
CI_DRM_6889: 1e5f271c570175c0074a9b2bc748e9f391f47221 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5180: 811b10e2bd7fd2cd8ced9bbb55361c178886bbbd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14398: 63b6a8f6a4d6b61680a0e6669c871e3a629e5d3b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
63b6a8f6a4d6 drm/i915: introduce INTEL_DISPLAY_ENABLED()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: introduce INTEL_DISPLAY_ENABLED() (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: introduce INTEL_DISPLAY_ENABLED() (rev2)
URL : https://patchwork.freedesktop.org/series/66610/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6889_full -> Patchwork_14398_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_14398_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#111325]) +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb1/igt@[email protected]
* igt@gem_tiled_swapping@non-threaded:
- shard-glk: [PASS][3] -> [DMESG-WARN][4] ([fdo#108686])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-glk2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-glk3/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-apl6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-apl2/igt@[email protected]
* igt@kms_flip@dpms-vs-vblank-race:
- shard-glk: [PASS][7] -> [FAIL][8] ([fdo#111609])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-glk1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-glk4/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#105363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-skl3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-skl4/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-hsw: [PASS][11] -> [INCOMPLETE][12] ([fdo#103540])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-hsw6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-hsw7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103167]) +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][15] -> [FAIL][16] ([fdo#108145] / [fdo#110403])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-skl1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-skl6/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103166])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb5/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb1/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb7/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_setmode@basic:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#99912])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-skl2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-skl1/igt@[email protected]
- shard-hsw: [PASS][23] -> [FAIL][24] ([fdo#99912])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-hsw5/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-hsw8/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109276]) +23 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb2/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb8/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][27] ([fdo#110841]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb6/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [SKIP][29] ([fdo#111325]) -> [PASS][30] +4 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb5/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [SKIP][31] ([fdo#109276]) -> [PASS][32] +16 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb5/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb1/igt@[email protected]
* igt@gem_softpin@softpin:
- shard-apl: [INCOMPLETE][33] ([fdo#103927]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-apl2/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-apl7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt:
- shard-iclb: [FAIL][35] ([fdo#103167]) -> [PASS][36] +2 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb7/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-skl: [FAIL][37] ([fdo#103166]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-skl2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-skl10/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [FAIL][39] ([fdo#108145]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-skl3/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-skl2/igt@[email protected]
* igt@kms_psr@psr2_cursor_render:
- shard-iclb: [SKIP][41] ([fdo#109441]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb6/igt@kms_psr@psr2_cursor_render.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb2/igt@kms_psr@psr2_cursor_render.html
* igt@kms_psr@suspend:
- shard-iclb: [INCOMPLETE][43] ([fdo#107713]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb3/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb2/igt@[email protected]
* igt@kms_setmode@basic:
- shard-apl: [FAIL][45] ([fdo#99912]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-apl8/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-apl2/igt@[email protected]
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][47] ([fdo#108566]) -> [PASS][48] +4 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-apl6/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-apl8/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [FAIL][49] ([fdo#110728]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-skl9/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-skl4/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [SKIP][51] ([fdo#109276]) -> [FAIL][52] ([fdo#111329])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb5/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb1/igt@[email protected]
* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [FAIL][53] ([fdo#111330]) -> [SKIP][54] ([fdo#109276]) +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6889/shard-iclb2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14398/shard-iclb7/igt@[email protected]
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#111609]: https://bugs.freedesktop.org/show_bug.cgi?id=111609
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6889 -> Patchwork_14398
CI-20190529: 20190529
CI_DRM_6889: 1e5f271c570175c0074a9b2bc748e9f391f47221 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5180: 811b10e2bd7fd2cd8ced9bbb55361c178886bbbd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14398: 63b6a8f6a4d6b61680a0e6669c871e3a629e5d3b @ 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_14398/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Jani Nikula
Prepare for making a distinction between not having display and having disabled display. Add
INTEL_DISPLAY_ENABLED()and use it whereHAS_DISPLAY()is used afterintel_device_info_runtime_init(). This is initially duplication, as disabling display still leads to ->pipe_mask = 0 andHAS_DISPLAY()being false.Note that ever since i915.display_disable was introduced, it has not affected PCH detection even if it uses
HAS_DISPLAY(), as display disable happens after that.
Quoted 5 lines
Since
INTEL_DISPLAY_ENABLED()will not make sense unlessHAS_DISPLAY()is true, include a warning for catching misuses making decisions onINTEL_DISPLAY_ENABLED()whenHAS_DISPLAY()is false.v2: Remove
INTEL_DISPLAY_ENABLED()check fromintel_detect_pch()(Chris)
Pushed, thanks for the review.
BR,
Jani.
Quoted 131 lines
Cc Chris Wilson <[email protected]>Cc José Roberto de Souza <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by José Roberto de Souza <[email protected]>Acked-by Ville Syrjälä <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_bios.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 8 ++++---- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 6 files changed, 12 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/display/intel_bios.c +1
-1@@ -1833,7 +1833,7 @@ void intel_bios_init(struct drm_i915_private *dev_priv)const struct bdb_header *bdb;u8 __iomem *bios =NULL ; -if (!HAS_DISPLAY (dev_priv)) { +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv)) {DRM_DEBUG_KMS ("Skipping VBT init due to disabled display.\n" );return ; }drivers/gpu/drm/i915/display/intel_display.c +2
-2@@ -15366,7 +15366,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)intel_pps_init (dev_priv); -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return ;if (INTEL_GEN (dev_priv) >=12 ) {@@ -17273,7 +17273,7 @@ intel_display_capture_error_state(struct drm_i915_private *dev_priv)BUILD_BUG_ON (ARRAY_SIZE (transcoders) !=ARRAY_SIZE (error->transcoder)); -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return NULL ; error =kzalloc (sizeof (*error),GFP_ATOMIC );drivers/gpu/drm/i915/display/intel_fbdev.c +1
-1@@ -444,7 +444,7 @@ int intel_fbdev_init(struct drm_device *dev)struct intel_fbdev *ifbdev;int ret; -if (WARN_ON (!HAS_DISPLAY (dev_priv))) +if (WARN_ON (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv)))return -ENODEV ; ifbdev =kzalloc (sizeof (struct intel_fbdev ),GFP_KERNEL );drivers/gpu/drm/i915/display/intel_gmbus.c +1
-1@@ -836,7 +836,7 @@ int intel_gmbus_setup(struct drm_i915_private *dev_priv)unsigned int pin;int ret; -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return 0 ;if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))drivers/gpu/drm/i915/i915_drv.c +4
-4@@ -338,7 +338,7 @@ static int i915_driver_modeset_probe(struct drm_device *dev)if (i915_inject_probe_failure (dev_priv))return -ENODEV ; -if (HAS_DISPLAY (dev_priv)) { +if (HAS_DISPLAY (dev_priv) &&INTEL_DISPLAY_ENABLED (dev_priv)) { ret =drm_vblank_init (&dev_priv->drm,INTEL_NUM_PIPES (dev_priv));if (ret)@@ -389,7 +389,7 @@ static int i915_driver_modeset_probe(struct drm_device *dev)intel_overlay_setup (dev_priv); -if (!HAS_DISPLAY (dev_priv)) +if (!HAS_DISPLAY (dev_priv) || !INTEL_DISPLAY_ENABLED (dev_priv))return 0 ; ret =intel_fbdev_init (dev);@@ -1378,7 +1378,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv) }else DRM_ERROR ("Failed to register driver for userspace access!\n" ); -if (HAS_DISPLAY (dev_priv)) { +if (HAS_DISPLAY (dev_priv) &&INTEL_DISPLAY_ENABLED (dev_priv)) {/* Must be done after probing outputs */ intel_opregion_register (dev_priv);acpi_video_register ();@@ -1401,7 +1401,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)* We need to coordinate the hotplugs with the asynchronous fbdev * configuration, for which we use the fbdev->async_cookie. */ -if (HAS_DISPLAY (dev_priv)) +if (HAS_DISPLAY (dev_priv) &&INTEL_DISPLAY_ENABLED (dev_priv))drm_kms_helper_poll_init (dev);intel_power_domains_enable (dev_priv);drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -2192,6 +2192,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_DISPLAY (dev_priv) (INTEL_INFO(dev_priv)->pipe_mask != 0) +/* Only valid when HAS_DISPLAY() is true */ +#define INTEL_DISPLAY_ENABLED (dev_priv) (WARN_ON(!HAS_DISPLAY(dev_priv)), !i915_modparams.disable_display) +static inline bool intel_vtd_active (void ) {#ifdef CONFIG_INTEL_IOMMU
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx