diff mbox series

[v3,1/3] drm/i915/icl: replace check for combo phy

Message ID 20181114011509.3667-1-lucas.demarchi@intel.com (mailing list archive)
State New, archived
Headers show
Series [v3,1/3] drm/i915/icl: replace check for combo phy | expand

Commit Message

Lucas De Marchi Nov. 14, 2018, 1:15 a.m. UTC 
These are the only places that assume ports A and B are the ones with
combo phy.  Let's use intel_port_is_combophy() there to make sure
it checks for combo phy ports the same way everywhere.

v2: define for_each_combo_port() helper to check the ports

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_combo_phy.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Jani Nikula Nov. 14, 2018, 8:03 a.m. UTC | #1 
On Tue, 13 Nov 2018, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> These are the only places that assume ports A and B are the ones with
> combo phy.  Let's use intel_port_is_combophy() there to make sure
> it checks for combo phy ports the same way everywhere.
>
> v2: define for_each_combo_port() helper to check the ports
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> Reviewed-by: Imre Deak <imre.deak@intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_combo_phy.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c
> index f7c16f6724f0..49f3a533860d 100644
> --- a/drivers/gpu/drm/i915/intel_combo_phy.c
> +++ b/drivers/gpu/drm/i915/intel_combo_phy.c
> @@ -5,6 +5,10 @@
>  
>  #include "intel_drv.h"
>  
> +#define for_each_combo_port(__dev_priv, __port) \
> +	for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++)	\
> +		for_each_if(intel_port_is_combophy(__dev_priv, __port))
> +
>  enum {
>  	PROCMON_0_85V_DOT_0,
>  	PROCMON_0_95V_DOT_0,
> @@ -199,7 +203,7 @@ void icl_combo_phys_init(struct drm_i915_private *dev_priv)
>  {
>  	enum port port;
>  
> -	for (port = PORT_A; port <= PORT_B; port++) {
> +	for_each_combo_port(dev_priv, port) {
>  		u32 val;
>  
>  		if (icl_combo_phy_verify_state(dev_priv, port)) {
> @@ -228,7 +232,7 @@ void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)
>  {
>  	enum port port;
>  
> -	for (port = PORT_A; port <= PORT_B; port++) {
> +	for_each_combo_port(dev_priv, port) {
>  		u32 val;
>  
>  		if (!icl_combo_phy_verify_state(dev_priv, port))
Souza, Jose Nov. 16, 2018, 12:41 a.m. UTC | #2 
Pushed to drm-intel-next-queued.

On Wed, 2018-11-14 at 06:23 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [v3,1/3] drm/i915/icl: replace check for
> combo phy
> URL   : https://patchwork.freedesktop.org/series/52459/
> State : success
> 
> == Summary ==
> 
> = CI Bug Log - changes from CI_DRM_5134_full -> Patchwork_10820_full
> =
> 
> == Summary - WARNING ==
> 
>   Minor unknown changes coming with Patchwork_10820_full need to be
> verified
>   manually.
>   
>   If you think the reported changes have nothing to do with the
> changes
>   introduced in Patchwork_10820_full, please notify your bug team to
> allow them
>   to document this new failure mode, which will reduce false
> positives in CI.
> 
>   
> 
> == Possible new issues ==
> 
>   Here are the unknown changes that may have been introduced in
> Patchwork_10820_full:
> 
>   === IGT changes ===
> 
>     ==== Warnings ====
> 
>     igt@perf_pmu@rc6:
>       shard-kbl:          PASS -> SKIP
> 
>     
> == Known issues ==
> 
>   Here are the changes found in Patchwork_10820_full that come from
> known issues:
> 
>   === IGT changes ===
> 
>     ==== Issues hit ====
> 
>     igt@gem_ppgtt@blt-vs-render-ctx0:
>       shard-skl:          NOTRUN -> TIMEOUT (fdo#108039)
>       shard-kbl:          PASS -> INCOMPLETE (fdo#106887, fdo#103665,
> fdo#106023)
> 
>     igt@kms_available_modes_crc@available_mode_test_crc:
>       shard-skl:          NOTRUN -> FAIL (fdo#106641)
> 
>     igt@kms_busy@extended-modeset-hang-newfb-render-a:
>       shard-skl:          NOTRUN -> DMESG-WARN (fdo#107956) +2
> 
>     igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
>       shard-kbl:          PASS -> DMESG-WARN (fdo#107956)
> 
>     igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
>       shard-glk:          PASS -> FAIL (fdo#108145)
> 
>     igt@kms_cursor_crc@cursor-256x256-sliding:
>       shard-apl:          PASS -> FAIL (fdo#103232)
> 
>     igt@kms_flip@flip-vs-expired-vblank:
>       shard-glk:          PASS -> FAIL (fdo#105363)
> 
>     igt@kms
> _frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
>       shard-glk:          PASS -> FAIL (fdo#103167) +1
> 
>     igt@kms
> _frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
>       shard-apl:          PASS -> FAIL (fdo#103167) +2
> 
>     igt@kms_frontbuffer_tracking@fbcpsr-stridechange:
>       shard-skl:          NOTRUN -> FAIL (fdo#105683)
> 
>     igt@kms_plane@pixel-format-pipe-b-planes:
>       shard-skl:          NOTRUN -> DMESG-WARN (fdo#106885)
> 
>     igt@kms_plane@plane-panning-bottom-right-pipe-b-planes:
>       shard-skl:          NOTRUN -> FAIL (fdo#103166)
> 
>     igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
>       shard-skl:          NOTRUN -> FAIL (fdo#108145) +5
> 
>     igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
>       shard-skl:          NOTRUN -> FAIL (fdo#108145, fdo#107815)
> 
>     igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
>       shard-apl:          PASS -> FAIL (fdo#103166)
> 
>     igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
>       shard-glk:          PASS -> FAIL (fdo#103166)
> 
>     igt@kms_properties@connector-properties-legacy:
>       shard-kbl:          PASS -> DMESG-WARN (fdo#105345, fdo#103313)
> 
>     igt@kms_setmode@basic:
>       shard-apl:          PASS -> FAIL (fdo#99912)
>       shard-kbl:          PASS -> FAIL (fdo#99912)
> 
>     igt@pm_backlight@fade_with_suspend:
>       shard-skl:          NOTRUN -> FAIL (fdo#107847)
> 
>     
>     ==== Possible fixes ====
> 
>     igt@kms_flip@2x-dpms-vs-vblank-race:
>       shard-hsw:          DMESG-WARN (fdo#102614) -> PASS
> 
>     igt@kms
> _frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
>       shard-apl:          FAIL (fdo#103167) -> PASS +1
> 
>     igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
>       shard-glk:          FAIL (fdo#108145) -> PASS
> 
>     igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
>       shard-skl:          FAIL (fdo#107815) -> PASS
> 
>     igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
>       shard-glk:          FAIL (fdo#103166) -> PASS +1
>       shard-apl:          FAIL (fdo#103166) -> PASS +2
> 
>     igt@perf@polling:
>       shard-hsw:          FAIL (fdo#102252) -> PASS
> 
>     igt@perf_pmu@busy-start-vcs0:
>       shard-kbl:          DMESG-WARN (fdo#103558, fdo#105602) -> PASS
> 
>     igt@pm_rpm@debugfs-forcewake-user:
>       shard-skl:          INCOMPLETE (fdo#107807) -> PASS
> 
>     igt@pm_rpm@dpms-mode-unset-non-lpsp:
>       shard-skl:          INCOMPLETE (fdo#107807) -> SKIP
> 
>     
>   fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
>   fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
>   fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
>   fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
>   fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
>   fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
>   fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   fdo#105345 https://bugs.freedesktop.org/show_bug.cgi?id=105345
>   fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
>   fdo#105683 https://bugs.freedesktop.org/show_bug.cgi?id=105683
>   fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
>   fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
>   fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885
>   fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
>   fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
>   fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
>   fdo#107847 https://bugs.freedesktop.org/show_bug.cgi?id=107847
>   fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
>   fdo#108039 https://bugs.freedesktop.org/show_bug.cgi?id=108039
>   fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
>   fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
> 
> 
> == Participating hosts (6 -> 6) ==
> 
>   No changes in participating hosts
> 
> 
> == Build changes ==
> 
>     * Linux: CI_DRM_5134 -> Patchwork_10820
> 
>   CI_DRM_5134: 76f4cff023b23764df2956ad64a0840bfebd7ca4 @
> git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @
> git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_10820: 49663aa28220474a070f8e4ac2d4d1e549513d73 @
> 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_10820/shards.html
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c
index f7c16f6724f0..49f3a533860d 100644
--- a/drivers/gpu/drm/i915/intel_combo_phy.c
+++ b/drivers/gpu/drm/i915/intel_combo_phy.c
@@ -5,6 +5,10 @@ 
 
 #include "intel_drv.h"
 
+#define for_each_combo_port(__dev_priv, __port) \
+	for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++)	\
+		for_each_if(intel_port_is_combophy(__dev_priv, __port))
+
 enum {
 	PROCMON_0_85V_DOT_0,
 	PROCMON_0_95V_DOT_0,
@@ -199,7 +203,7 @@  void icl_combo_phys_init(struct drm_i915_private *dev_priv)
 {
 	enum port port;
 
-	for (port = PORT_A; port <= PORT_B; port++) {
+	for_each_combo_port(dev_priv, port) {
 		u32 val;
 
 		if (icl_combo_phy_verify_state(dev_priv, port)) {
@@ -228,7 +232,7 @@  void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)
 {
 	enum port port;
 
-	for (port = PORT_A; port <= PORT_B; port++) {
+	for_each_combo_port(dev_priv, port) {
 		u32 val;
 
 		if (!icl_combo_phy_verify_state(dev_priv, port))