Skip to contentSkip to conversation

drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()

PATCH In review Jani Nikula 3 participants 9 messages Nov 15, 2018

Subsystems (2)
DRM drivers Intel i915
lore
Share & tools
lore

Jani Nikula

author
#0 lore raw

PATCH 1/3 drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()

Conform to function naming in intel_bios.c.

Cc Imre Deak <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h   | 2 +-
 drivers/gpu/drm/i915/intel_bios.c | 3 ++-
 drivers/gpu/drm/i915/intel_ddi.c  | 2 +-
 drivers/gpu/drm/i915/intel_dp.c   | 2 +-
 drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
index 5d686b585a95..8c6ca39feefc 100644
@@ -3455,7 +3455,7 @@ bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv,
 				     enum port port);
 bool intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,
 				enum port port);
-enum aux_ch intel_aux_ch(struct drm_i915_private *dev_priv, enum port port);
+enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port port);
 
 /* intel_acpi.c */
 #ifdef CONFIG_ACPI
drivers/gpu/drm/i915/intel_bios.c +2 -1
index bd7b2da71419..0694aa8bb9bc 100644
@@ -2191,7 +2191,8 @@ intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv,
 	return false;
 }
 
-enum aux_ch intel_aux_ch(struct drm_i915_private *dev_priv, enum port port)
+enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,
+				   enum port port)
 {
 	const struct ddi_vbt_port_info *info =
 		&dev_priv->vbt.ddi_port_info[port];
drivers/gpu/drm/i915/intel_ddi.c +1 -1
index 4913bbdac843..040483c96029 100644
@@ -4119,7 +4119,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 			(DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);
 	intel_dig_port->dp.output_reg = INVALID_MMIO_REG;
 	intel_dig_port->max_lanes = intel_ddi_max_lanes(intel_dig_port);
-	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);
+	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
 
 	switch (port) {
 	case PORT_A:
drivers/gpu/drm/i915/intel_dp.c +1 -1
index 2b090609bee2..7699f9b7b2d2 100644
@@ -6745,7 +6745,7 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
 	if (port != PORT_A)
 		intel_infoframe_init(intel_dig_port);
 
-	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);
+	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
 	if (!intel_dp_init_connector(intel_dig_port, intel_connector))
 		goto err_init_connector;
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
index bc5b945f9a71..e2c6a2b3e8f2 100644
@@ -2520,6 +2520,6 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
 
 	intel_infoframe_init(intel_dig_port);
 
-	intel_dig_port->aux_ch = intel_aux_ch(dev_priv, port);
+	intel_dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
 	intel_hdmi_init_connector(intel_dig_port, intel_connector);
 }
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#1 lore raw

PATCH 2/3 drm/i915: remove unused DDC PIN macros

Their user has vanished in the course of history. Remove.

Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -4
index 8c6ca39feefc..d100c38697ff 100644
@@ -1060,10 +1060,6 @@ struct i915_gem_mm {
 #define DP_AUX_E 0x50
 #define DP_AUX_F 0x60
 
-#define DDC_PIN_B  0x05
-#define DDC_PIN_C  0x04
-#define DDC_PIN_D  0x06
-
 struct ddi_vbt_port_info {
 	int max_tmds_clock;
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#2 lore raw

PATCH 3/3 drm/i915/bios: make the aux channel macros private to the vbt parser

In reply to Jani Nikula

Hide the aux channel macros in intel_vbt_defs.h now that their use has been abstracted in intel_bios_port_aux_ch().

Cc Imre Deak <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h       | 7 -------
 drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -7
index d100c38697ff..d69b71d368d3 100644
@@ -1053,13 +1053,6 @@ struct i915_gem_mm {
 
 #define I915_ENGINE_WEDGED_TIMEOUT  (60 * HZ)  /* Reset but no recovery? */
 
-#define DP_AUX_A 0x40
-#define DP_AUX_B 0x10
-#define DP_AUX_C 0x20
-#define DP_AUX_D 0x30
-#define DP_AUX_E 0x50
-#define DP_AUX_F 0x60
-
 struct ddi_vbt_port_info {
 	int max_tmds_clock;
drivers/gpu/drm/i915/intel_vbt_defs.h +7 -0
index bba98cf83cbd..bf3662ad5fed 100644
@@ -326,6 +326,13 @@ enum vbt_gmbus_ddi {
 	ICL_DDC_BUS_PORT_4,
 };
 
+#define DP_AUX_A 0x40
+#define DP_AUX_B 0x10
+#define DP_AUX_C 0x20
+#define DP_AUX_D 0x30
+#define DP_AUX_E 0x50
+#define DP_AUX_F 0x60
+
 #define VBT_DP_MAX_LINK_RATE_HBR3	0
 #define VBT_DP_MAX_LINK_RATE_HBR2	1
 #define VBT_DP_MAX_LINK_RATE_HBR	2
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
CI
#6 lore raw

✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/3] drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()
URL : https://patchwork.freedesktop.org/series/52525/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()
Okay!

Commit: drm/i915: remove unused DDC PIN macros -drivers/gpu/drm/i915/selftests/../i915_drv.h:3716:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3712:16: warning: expression using sizeof(void)

Commit: drm/i915/bios: make the aux channel macros private to the vbt parser -drivers/gpu/drm/i915/selftests/../i915_drv.h:3712:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3705:16: warning: expression using sizeof(void)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

CI
#7 lore raw

✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/3] drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()
URL : https://patchwork.freedesktop.org/series/52525/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_5141 -> Patchwork_10828 =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_10828 need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_10828, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/52525/revisions/1/mbox/

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_10828:

=== IGT changes ===

    ==== Warnings ====

    igt@drv_selftest@live_guc:
      fi-skl-iommu:       SKIP -> PASS +1

== Known issues ==

Here are the changes found in Patchwork_10828 that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_contexts:
      fi-icl-u:           NOTRUN -> DMESG-FAIL (fdo#108569)

    igt@drv_selftest@live_execlists:
      fi-apl-guc:         PASS -> INCOMPLETE (fdo#103927)

    igt@drv_selftest@live_hangcheck:
      fi-skl-guc:         PASS -> DMESG-FAIL (fdo#108744, fdo#108593)

    igt@kms_chamelium@common-hpd-after-suspend:
      fi-skl-6700k2:      PASS -> WARN (fdo#108680)

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
      fi-byt-clapper:     PASS -> FAIL (fdo#107362, fdo#103191)

    
    ==== Possible fixes ====

    igt@drv_selftest@live_hangcheck:
      fi-skl-iommu:       INCOMPLETE (fdo#108602, fdo#108744) -> PASS

    igt@gem_exec_suspend@basic-s3:
      fi-blb-e6850:       INCOMPLETE (fdo#107718) -> PASS

    igt@kms_frontbuffer_tracking@basic:
      fi-hsw-peppy:       DMESG-WARN (fdo#102614) -> PASS
      fi-icl-u2:          FAIL (fdo#103167) -> PASS

    igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
      fi-byt-clapper:     FAIL (fdo#107362, fdo#103191) -> PASS

    igt@prime_vgem@basic-fence-flip:
      fi-gdg-551:         FAIL (fdo#103182) -> PASS

fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103182 https://bugs.freedesktop.org/show_bug.cgi?id=103182
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#108569 https://bugs.freedesktop.org/show_bug.cgi?id=108569
fdo#108593 https://bugs.freedesktop.org/show_bug.cgi?id=108593
fdo#108602 https://bugs.freedesktop.org/show_bug.cgi?id=108602
fdo#108680 https://bugs.freedesktop.org/show_bug.cgi?id=108680
fdo#108744 https://bugs.freedesktop.org/show_bug.cgi?id=108744

== Participating hosts (51 -> 46) ==

Additional (1): fi-icl-u
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600

== Build changes ==

* Linux: CI_DRM_5141 -> Patchwork_10828

CI_DRM_5141: fcdadbabc3216aa16c6d8236d55c5e5c8261cc91 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10828: 3e4d914a16d1472873dbb2e3d8ff6c854118f16d @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

3e4d914a16d1 drm/i915/bios: make the aux channel macros private to the vbt parser f2fa38668733 drm/i915: remove unused DDC PIN macros
bf30813eb674 drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10828/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

CI
#8 lore raw

✓ Fi.CI.IGT: success for series starting with [1/3] drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [1/3] drm/i915/bios: rename intel_aux_ch() to intel_bios_port_aux_ch()
URL : https://patchwork.freedesktop.org/series/52525/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_5141_full -> Patchwork_10828_full =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_10828_full need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_10828_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_10828_full:

=== IGT changes ===

    ==== Warnings ====

    igt@pm_rc6_residency@rc6-accuracy:
      shard-kbl:          PASS -> SKIP

== Known issues ==

Here are the changes found in Patchwork_10828_full that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_ppgtt@blt-vs-render-ctxn:
      shard-skl:          NOTRUN -> TIMEOUT (fdo#108039)

    igt@gem_userptr_blits@readonly-unsync:
      shard-apl:          PASS -> INCOMPLETE (fdo#103927) +1

    igt@kms_busy@extended-pageflip-hang-newfb-render-a:
      shard-glk:          PASS -> DMESG-WARN (fdo#107956)

    igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
      shard-skl:          NOTRUN -> DMESG-WARN (fdo#107956)

    igt@kms_chv_cursor_fail@pipe-b-64x64-right-edge:
      shard-glk:          PASS -> DMESG-FAIL (fdo#104671, fdo#106538)

    igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#105363) +1

    igt@kms_flip@flip-vs-expired-vblank:
      shard-skl:          PASS -> FAIL (fdo#105363)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
      shard-apl:          PASS -> FAIL (fdo#103167)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
      shard-glk:          PASS -> FAIL (fdo#103167) +1

    igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-pwrite:
      shard-skl:          NOTRUN -> FAIL (fdo#103167)

    igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
      shard-apl:          PASS -> FAIL (fdo#103166) +2

    
    ==== Possible fixes ====

    igt@gem_userptr_blits@readonly-unsync:
      shard-skl:          INCOMPLETE (fdo#108074) -> PASS

    igt@kms_chv_cursor_fail@pipe-c-256x256-top-edge:
      shard-skl:          FAIL (fdo#104671) -> PASS

    igt@kms_color@pipe-c-ctm-blue-to-red:
      shard-skl:          FAIL (fdo#107201) -> PASS

    igt@kms_cursor_legacy@long-nonblocking-modeset-vs-cursor-atomic:
      shard-hsw:          DMESG-WARN (fdo#102614) -> PASS

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff:
      shard-apl:          FAIL (fdo#103167) -> PASS

    igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
      shard-glk:          FAIL (fdo#103166) -> PASS +2

    igt@pm_rpm@system-suspend:
      shard-skl:          INCOMPLETE (fdo#104108, fdo#107807, fdo#107773) -> PASS

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#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104671 https://bugs.freedesktop.org/show_bug.cgi?id=104671
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#107201 https://bugs.freedesktop.org/show_bug.cgi?id=107201
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108039 https://bugs.freedesktop.org/show_bug.cgi?id=108039
fdo#108074 https://bugs.freedesktop.org/show_bug.cgi?id=108074

== Participating hosts (6 -> 6) ==

No changes in participating hosts

== Build changes ==

* Linux: CI_DRM_5141 -> Patchwork_10828

CI_DRM_5141: fcdadbabc3216aa16c6d8236d55c5e5c8261cc91 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10828: 3e4d914a16d1472873dbb2e3d8ff6c854118f16d @ 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_10828/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 3/3
#3 lore raw

Re: [PATCH 3/3] drm/i915/bios: make the aux channel macros private to the vbt parser

In reply to Jani Nikula

drivers/gpu/drm/i915/intel_vbt_defs.h

Quoted 32 lines · Jani Nikula

Hide the aux channel macros in intel_vbt_defs.h now that their use has been abstracted in intel_bios_port_aux_ch().

Cc Imre Deak <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h       | 7 -------
 drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -7
index d100c38697ff..d69b71d368d3 100644
@@ -1053,13 +1053,6 @@ struct i915_gem_mm {
 
 #define I915_ENGINE_WEDGED_TIMEOUT  (60 * HZ)  /* Reset but no recovery? */
 
-#define DP_AUX_A 0x40
-#define DP_AUX_B 0x10
-#define DP_AUX_C 0x20
-#define DP_AUX_D 0x30
-#define DP_AUX_E 0x50
-#define DP_AUX_F 0x60
-
 struct ddi_vbt_port_info {
 	int max_tmds_clock;
drivers/gpu/drm/i915/intel_vbt_defs.h +0 -0
index bba98cf83cbd..bf3662ad5fed 100644

Unrelated, but this has:
"This information is private to VBT parsing in intel_bios.c." while it's also included from gvt/opregion.c

On patches 1-3:

Reviewed-by Imre Deak <[email protected]>
Quoted 17 lines
drivers/gpu/drm/i915/intel_vbt_defs.h +7 -0
@@ -326,6 +326,13 @@ enum vbt_gmbus_ddi {
 	ICL_DDC_BUS_PORT_4,
 };
 
+#define DP_AUX_A 0x40
+#define DP_AUX_B 0x10
+#define DP_AUX_C 0x20
+#define DP_AUX_D 0x30
+#define DP_AUX_E 0x50
+#define DP_AUX_F 0x60
+
 #define VBT_DP_MAX_LINK_RATE_HBR3	0
 #define VBT_DP_MAX_LINK_RATE_HBR2	1
 #define VBT_DP_MAX_LINK_RATE_HBR	2
Signature · 1 line
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#4 lore raw

Re: [PATCH 3/3] drm/i915/bios: make the aux channel macros private to the vbt parser

Quoted 29 lines · Imre Deak
Quoted 28 lines · Jani Nikula

Hide the aux channel macros in intel_vbt_defs.h now that their use has been abstracted in intel_bios_port_aux_ch().

Cc Imre Deak <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h       | 7 -------
 drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -7
index d100c38697ff..d69b71d368d3 100644
@@ -1053,13 +1053,6 @@ struct i915_gem_mm {
 
 #define I915_ENGINE_WEDGED_TIMEOUT  (60 * HZ)  /* Reset but no recovery? */
 
-#define DP_AUX_A 0x40
-#define DP_AUX_B 0x10
-#define DP_AUX_C 0x20
-#define DP_AUX_D 0x30
-#define DP_AUX_E 0x50
-#define DP_AUX_F 0x60
-
 struct ddi_vbt_port_info {
 	int max_tmds_clock;
Quoted 8 lines

drivers/gpu/drm/i915/intel_vbt_defs.h

Quoted 4 lines
drivers/gpu/drm/i915/intel_vbt_defs.h +0 -0
index bba98cf83cbd..bf3662ad5fed 100644

Unrelated, but this has:
"This information is private to VBT parsing in intel_bios.c." while it's also included from gvt/opregion.c

Yeah, they wanted to use it for their VBT stuff as well, but should be isolated.

Quoted 2 lines

On patches 1-3:

Reviewed-by Imre Deak <[email protected]>

Thanks,
Jani.

Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/intel_vbt_defs.h +7 -0
@@ -326,6 +326,13 @@ enum vbt_gmbus_ddi {
 	ICL_DDC_BUS_PORT_4,
 };
 
+#define DP_AUX_A 0x40
+#define DP_AUX_B 0x10
+#define DP_AUX_C 0x20
+#define DP_AUX_D 0x30
+#define DP_AUX_E 0x50
+#define DP_AUX_F 0x60
+
 #define VBT_DP_MAX_LINK_RATE_HBR3	0
 #define VBT_DP_MAX_LINK_RATE_HBR2	1
 #define VBT_DP_MAX_LINK_RATE_HBR	2
Signature · 1 line
2.11.0
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#5 lore raw

Re: [PATCH 3/3] drm/i915/bios: make the aux channel macros private to the vbt parser

Quoted 39 lines · Jani Nikula
Quoted 29 lines · Imre Deak
Quoted 28 lines · Jani Nikula

Hide the aux channel macros in intel_vbt_defs.h now that their use has been abstracted in intel_bios_port_aux_ch().

Cc Imre Deak <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.h       | 7 -------
 drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -7
index d100c38697ff..d69b71d368d3 100644
@@ -1053,13 +1053,6 @@ struct i915_gem_mm {
 
 #define I915_ENGINE_WEDGED_TIMEOUT  (60 * HZ)  /* Reset but no recovery? */
 
-#define DP_AUX_A 0x40
-#define DP_AUX_B 0x10
-#define DP_AUX_C 0x20
-#define DP_AUX_D 0x30
-#define DP_AUX_E 0x50
-#define DP_AUX_F 0x60
-
 struct ddi_vbt_port_info {
 	int max_tmds_clock;
Quoted 8 lines

drivers/gpu/drm/i915/intel_vbt_defs.h

Quoted 4 lines
drivers/gpu/drm/i915/intel_vbt_defs.h +0 -0
index bba98cf83cbd..bf3662ad5fed 100644

Unrelated, but this has:
"This information is private to VBT parsing in intel_bios.c." while it's also included from gvt/opregion.c

Quoted 7 lines

Yeah, they wanted to use it for their VBT stuff as well, but should be isolated.

Quoted 2 lines

On patches 1-3:

Reviewed-by Imre Deak <[email protected]>

Thanks,

+pushed

Quoted 21 lines

Jani.

Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/intel_vbt_defs.h +7 -0
@@ -326,6 +326,13 @@ enum vbt_gmbus_ddi {
 	ICL_DDC_BUS_PORT_4,
 };
 
+#define DP_AUX_A 0x40
+#define DP_AUX_B 0x10
+#define DP_AUX_C 0x20
+#define DP_AUX_D 0x30
+#define DP_AUX_E 0x50
+#define DP_AUX_F 0x60
+
 #define VBT_DP_MAX_LINK_RATE_HBR3	0
 #define VBT_DP_MAX_LINK_RATE_HBR2	1
 #define VBT_DP_MAX_LINK_RATE_HBR	2
Signature · 1 line
2.11.0
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx