drm/i915: rename and move intel_get_pipe_from_connector()
Subsystems (2)
PATCH 1/1 drm/i915: rename and move intel_get_pipe_from_connector()
Rename intel_get_pipe_from_connector() to intel_connector_get_pipe() and move it near its connector function friends in intel_connector.c. No functional changes.
--- drivers/gpu/drm/i915/intel_connector.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_display.c | 12 ------------ drivers/gpu/drm/i915/intel_drv.h | 3 +-- drivers/gpu/drm/i915/intel_panel.c | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_connector.c +12 -0
@@ -147,6 +147,18 @@ bool intel_connector_get_hw_state(struct intel_connector *connector)return encoder->get_hw_state (encoder, &pipe); } +enum pipe intel_connector_get_pipe (struct intel_connector *connector) +{ +struct drm_device *dev = connector->base.dev; + +WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); + +if (!connector->base.state->crtc) +return INVALID_PIPE ; + +return to_intel_crtc (connector->base.state->crtc)->pipe; +} +/** * intel_connector_update_modes - update connector from edid * @connector: DRM connector device to use
drivers/gpu/drm/i915/intel_display.c +0 -12
@@ -13900,18 +13900,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)return ret; } -enum pipe intel_get_pipe_from_connector (struct intel_connector *connector) -{ -struct drm_device *dev = connector->base.dev; - -WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); - -if (!connector->base.state->crtc) -return INVALID_PIPE ; - -return to_intel_crtc (connector->base.state->crtc)->pipe; -} -int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {
drivers/gpu/drm/i915/intel_drv.h +1 -2
@@ -1534,8 +1534,6 @@ intel_encoder_current_mode(struct intel_encoder *encoder);bool intel_port_is_tc (struct drm_i915_private *dev_priv,enum port port);enum tc_port intel_port_to_tc (struct drm_i915_private *dev_priv,enum port port); - -enum pipe intel_get_pipe_from_connector (struct intel_connector *connector);int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,
@@ -1694,6 +1692,7 @@ void intel_connector_unregister(struct drm_connector *connector);void intel_connector_attach_encoder (struct intel_connector *connector,struct intel_encoder *encoder);bool intel_connector_get_hw_state (struct intel_connector *connector); +enum pipe intel_connector_get_pipe (struct intel_connector *connector);int intel_connector_update_modes (struct drm_connector *connector,struct edid *edid);int intel_ddc_get_modes (struct drm_connector *c,struct i2c_adapter *adapter);
drivers/gpu/drm/i915/intel_panel.c +1 -1
@@ -505,7 +505,7 @@ static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)static u32 vlv_get_backlight (struct intel_connector *connector) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -enum pipe pipe =intel_get_pipe_from_connector (connector); +enum pipe pipe =intel_connector_get_pipe (connector);return _vlv_get_backlight (dev_priv, pipe); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Jani Nikula
Rename
intel_get_pipe_from_connector()tointel_connector_get_pipe()and move it near its connector function friends inintel_connector.c. No functional changes.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_connector.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_display.c | 12 ------------ drivers/gpu/drm/i915/intel_drv.h | 3 +-- drivers/gpu/drm/i915/intel_panel.c | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/intel_connector.c +1
-0@@ -147,6 +147,18 @@ bool intel_connector_get_hw_state(struct intel_connector *connector)return encoder->get_hw_state (encoder, &pipe); } +enum pipe intel_connector_get_pipe (struct intel_connector *connector)
drivers/gpu/drm/i915/intel_connector.c bool intel_connector_get_hw_state(struct intel_connector *connector) · line 160
Quoted 10 lines
drivers/gpu/drm/i915/intel_connector.c +10
-0+{ +struct drm_device *dev = connector->base.dev; + +WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); + +if (!connector->base.state->crtc) +return INVALID_PIPE ; + +return to_intel_crtc (connector->base.state->crtc)->pipe; +}
This thing is a bit racy when it comes to nonblocking modesets. Perhaps we should track the pipe internally alongside backight.enabled?
Anyways, patch seems ok so
Quoted 68 lines
drivers/gpu/drm/i915/intel_connector.c +1
-0+/** * intel_connector_update_modes - update connector from edid * @connector: DRM connector device to use drivers/gpu/drm/i915/intel_display.c +0
-12@@ -13900,18 +13900,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)return ret; } -enum pipe intel_get_pipe_from_connector (struct intel_connector *connector) -{ -struct drm_device *dev = connector->base.dev; - -WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); - -if (!connector->base.state->crtc) -return INVALID_PIPE ; - -return to_intel_crtc (connector->base.state->crtc)->pipe; -} -int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {drivers/gpu/drm/i915/intel_drv.h +1
-2@@ -1534,8 +1534,6 @@ intel_encoder_current_mode(struct intel_encoder *encoder);bool intel_port_is_tc (struct drm_i915_private *dev_priv,enum port port);enum tc_port intel_port_to_tc (struct drm_i915_private *dev_priv,enum port port); - -enum pipe intel_get_pipe_from_connector (struct intel_connector *connector);int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,@@ -1694,6 +1692,7 @@ void intel_connector_unregister(struct drm_connector *connector);void intel_connector_attach_encoder (struct intel_connector *connector,struct intel_encoder *encoder);bool intel_connector_get_hw_state (struct intel_connector *connector); +enum pipe intel_connector_get_pipe (struct intel_connector *connector);int intel_connector_update_modes (struct drm_connector *connector,struct edid *edid);int intel_ddc_get_modes (struct drm_connector *c,struct i2c_adapter *adapter);drivers/gpu/drm/i915/intel_panel.c +1
-1@@ -505,7 +505,7 @@ static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)static u32 vlv_get_backlight (struct intel_connector *connector) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -enum pipe pipe =intel_get_pipe_from_connector (connector); +enum pipe pipe =intel_connector_get_pipe (connector);return _vlv_get_backlight (dev_priv, pipe); }Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 21 lines · Ville Syrjälä
Quoted 20 lines · Jani Nikula
Rename
intel_get_pipe_from_connector()tointel_connector_get_pipe()and move it near its connector function friends inintel_connector.c. No functional changes.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_connector.c | 12 ++++++++++++ drivers/gpu/drm/i915/intel_display.c | 12 ------------ drivers/gpu/drm/i915/intel_drv.h | 3 +-- drivers/gpu/drm/i915/intel_panel.c | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/intel_connector.c +0
-0@@ -147,6 +147,18 @@ bool intel_connector_get_hw_state(struct intel_connector *connector)return encoder->get_hw_state (encoder, &pipe); }
Quoted 15 lines
drivers/gpu/drm/i915/intel_connector.c bool intel_connector_get_hw_state(struct intel_connector *connector) · line 160
Quoted 11 lines
drivers/gpu/drm/i915/intel_connector.c +11
-0+enum pipe intel_connector_get_pipe (struct intel_connector *connector) +{ +struct drm_device *dev = connector->base.dev; + +WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); + +if (!connector->base.state->crtc) +return INVALID_PIPE ; + +return to_intel_crtc (connector->base.state->crtc)->pipe; +}This thing is a bit racy when it comes to nonblocking modesets. Perhaps we should track the pipe internally alongside backight.enabled?
Noted, though not sure when I'll get around to it. Unrelated to this minor intel_display.c cleanup though.
Quoted 2 lines
Anyways, patch seems ok so
Reviewed-by Ville Syrjälä <[email protected]>
Thanks, pushed.
BR,
Jani.
Quoted 69 lines
Quoted 69 lines
drivers/gpu/drm/i915/intel_connector.c +1
-0+/** * intel_connector_update_modes - update connector from edid * @connector: DRM connector device to use drivers/gpu/drm/i915/intel_display.c +0
-12@@ -13900,18 +13900,6 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)return ret; } -enum pipe intel_get_pipe_from_connector (struct intel_connector *connector) -{ -struct drm_device *dev = connector->base.dev; - -WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); - -if (!connector->base.state->crtc) -return INVALID_PIPE ; - -return to_intel_crtc (connector->base.state->crtc)->pipe; -} -int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {drivers/gpu/drm/i915/intel_drv.h +1
-2@@ -1534,8 +1534,6 @@ intel_encoder_current_mode(struct intel_encoder *encoder);bool intel_port_is_tc (struct drm_i915_private *dev_priv,enum port port);enum tc_port intel_port_to_tc (struct drm_i915_private *dev_priv,enum port port); - -enum pipe intel_get_pipe_from_connector (struct intel_connector *connector);int intel_get_pipe_from_crtc_id_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,@@ -1694,6 +1692,7 @@ void intel_connector_unregister(struct drm_connector *connector);void intel_connector_attach_encoder (struct intel_connector *connector,struct intel_encoder *encoder);bool intel_connector_get_hw_state (struct intel_connector *connector); +enum pipe intel_connector_get_pipe (struct intel_connector *connector);int intel_connector_update_modes (struct drm_connector *connector,struct edid *edid);int intel_ddc_get_modes (struct drm_connector *c,struct i2c_adapter *adapter);drivers/gpu/drm/i915/intel_panel.c +1
-1@@ -505,7 +505,7 @@ static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)static u32 vlv_get_backlight (struct intel_connector *connector) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -enum pipe pipe =intel_get_pipe_from_connector (connector); +enum pipe pipe =intel_connector_get_pipe (connector);return _vlv_get_backlight (dev_priv, pipe); }Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: rename and move intel_get_pipe_from_connector()
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: rename and move intel_get_pipe_from_connector()
URL : https://patchwork.freedesktop.org/series/51071/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4988 -> Patchwork_10475 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51071/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10475 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_store@basic-vebox:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#105719)
igt@kms_flip@basic-flip-vs-dpms:
fi-hsw-4770r: PASS -> DMESG-WARN (fdo#105602)
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: PASS -> DMESG-WARN (fdo#102614)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
fi-glk-j4005: PASS -> FAIL (fdo#106211)
igt@pm_rpm@module-reload:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#107726)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-icl-u2: INCOMPLETE (fdo#108315) -> PASS
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: DMESG-WARN (fdo#106000) -> PASS +1
igt@kms_frontbuffer_tracking@basic:
fi-byt-clapper: FAIL (fdo#103167) -> PASS
igt@kms_setmode@basic-clone-single-crtc:
fi-ilk-650: DMESG-WARN (fdo#106387) -> PASS fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106211 https://bugs.freedesktop.org/show_bug.cgi?id=106211
fdo#106387 https://bugs.freedesktop.org/show_bug.cgi?id=106387
fdo#107726 https://bugs.freedesktop.org/show_bug.cgi?id=107726
fdo#108315 https://bugs.freedesktop.org/show_bug.cgi?id=108315
== Participating hosts (45 -> 43) ==
Additional (3): fi-byt-j1900 fi-icl-u fi-pnv-d510
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-snb-2520m
== Build changes ==
* Linux: CI_DRM_4988 -> Patchwork_10475
CI_DRM_4988: b7cd53d7617dc3b3899f5c74a829c51f0fef6d18 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4680: 27fa97d16294af9c9c42fd81b030a73e4aa2e7c3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10475: bd522cdadae0511922cd2d8d0d83ac49f7695a0a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
bd522cdadae0 drm/i915: rename and move intel_get_pipe_from_connector()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10475/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: rename and move intel_get_pipe_from_connector()
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: rename and move intel_get_pipe_from_connector()
URL : https://patchwork.freedesktop.org/series/51071/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4988_full -> Patchwork_10475_full =
== Summary - SUCCESS ==
No regressions found.
== Known issues ==
Here are the changes found in Patchwork_10475_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_suspend@shrink:
shard-skl: NOTRUN -> INCOMPLETE (fdo#106886)
igt@gem_exec_await@wide-contexts:
shard-skl: PASS -> FAIL (fdo#106680)
igt@gem_exec_schedule@pi-ringfull-blt:
shard-skl: NOTRUN -> FAIL (fdo#103158)
igt@gem_exec_schedule@pi-ringfull-bsd:
shard-glk: NOTRUN -> FAIL (fdo#103158)
igt@kms_available_modes_crc@available_mode_test_crc:
shard-apl: PASS -> FAIL (fdo#106641)
igt@kms_busy@extended-modeset-hang-newfb-render-b:
shard-snb: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956) +1
igt@kms_busy@extended-pageflip-hang-newfb-render-a:
shard-glk: NOTRUN -> DMESG-WARN (fdo#107956) +3
igt@kms_cursor_crc@cursor-128x128-suspend:
shard-glk: NOTRUN -> FAIL (fdo#103232)
igt@kms_cursor_crc@cursor-256x256-random:
shard-apl: PASS -> FAIL (fdo#103232) +2
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: NOTRUN -> FAIL (fdo#105454)
igt@kms_fbcon_fbt@psr-suspend:
shard-skl: NOTRUN -> FAIL (fdo#107882)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
shard-glk: PASS -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-wc:
shard-glk: NOTRUN -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbc-stridechange:
shard-skl: NOTRUN -> FAIL (fdo#105683)
igt@kms_plane@pixel-format-pipe-a-planes:
shard-skl: NOTRUN -> DMESG-FAIL (fdo#103166, fdo#106885)
shard-glk: NOTRUN -> FAIL (fdo#103166)
igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
shard-skl: NOTRUN -> FAIL (fdo#108145, fdo#107815)
igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
shard-glk: NOTRUN -> FAIL (fdo#108145) +2
shard-skl: NOTRUN -> FAIL (fdo#108145) +1
igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
shard-skl: NOTRUN -> FAIL (fdo#108146) +1
igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
shard-apl: PASS -> FAIL (fdo#103166)
igt@kms_setmode@basic:
shard-hsw: NOTRUN -> FAIL (fdo#99912)
shard-snb: NOTRUN -> FAIL (fdo#99912)
igt@pm_backlight@fade_with_suspend:
shard-skl: NOTRUN -> FAIL (fdo#107847)
igt@pm_rpm@system-suspend:
shard-skl: PASS -> INCOMPLETE (fdo#104108, fdo#107807)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-glk: INCOMPLETE (k.org#198133, fdo#103359, fdo#106886) -> PASS
igt@kms_cursor_crc@cursor-256x85-onscreen:
shard-apl: FAIL (fdo#103232) -> PASS +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
shard-apl: FAIL (fdo#103167) -> PASS fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
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#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105683 https://bugs.freedesktop.org/show_bug.cgi?id=105683
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#106680 https://bugs.freedesktop.org/show_bug.cgi?id=106680
fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
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#107882 https://bugs.freedesktop.org/show_bug.cgi?id=107882
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108146 https://bugs.freedesktop.org/show_bug.cgi?id=108146
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4988 -> Patchwork_10475
CI_DRM_4988: b7cd53d7617dc3b3899f5c74a829c51f0fef6d18 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4680: 27fa97d16294af9c9c42fd81b030a73e4aa2e7c3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10475: bd522cdadae0511922cd2d8d0d83ac49f7695a0a @ 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_10475/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx