drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
Subsystems (2)
PATCH 1/3 drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
From: Ville Syrjälä <[email protected]>
Make i9xx_load_ycbcr_conversion_matrix() static to appease sparse:
intel_color.c:110:6: warning: symbol 'i9xx_load_ycbcr_conversion_matrix' was not declared. Should it be static?
--- drivers/gpu/drm/i915/intel_color.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_color.c +1 -1
@@ -107,7 +107,7 @@ static void ctm_mult_by_limited(uint64_t *result, int64_t *input) } } -void i9xx_load_ycbcr_conversion_matrix (struct intel_crtc *intel_crtc) +static void i9xx_load_ycbcr_conversion_matrix (struct intel_crtc *intel_crtc) {int pipe = intel_crtc->pipe;struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: Make i2c lock ops static
From: Ville Syrjälä <[email protected]>
Make gmbus_lock_ops and proxy_lock_ops static to appease sparse intel_i2c.c:652:34: warning: symbol 'gmbus_lock_ops' was not declared. Should it be static? intel_sdvo.c:2981:34: warning: symbol 'proxy_lock_ops' was not declared. Should it be static?
--- drivers/gpu/drm/i915/intel_i2c.c | 2 +- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_i2c.c +1 -1
@@ -649,7 +649,7 @@ static void gmbus_unlock_bus(struct i2c_adapter *adapter,mutex_unlock (&dev_priv->gmbus_mutex); } -const struct i2c_lock_operations gmbus_lock_ops = { +static const struct i2c_lock_operations gmbus_lock_ops = { .lock_bus = gmbus_lock_bus, .trylock_bus = gmbus_trylock_bus, .unlock_bus = gmbus_unlock_bus,
drivers/gpu/drm/i915/intel_sdvo.c +1 -1
@@ -2978,7 +2978,7 @@ static void proxy_unlock_bus(struct i2c_adapter *adapter, sdvo->i2c->lock_ops->unlock_bus (sdvo->i2c, flags); } -const struct i2c_lock_operations proxy_lock_ops = { +static const struct i2c_lock_operations proxy_lock_ops = { .lock_bus = proxy_lock_bus, .trylock_bus = proxy_trylock_bus, .unlock_bus = proxy_unlock_bus,
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/3] drm/i915: Make i2c lock ops static
Quoting [email protected] (2017-09-01 15:31:22)
Quoted 9 lines
From: Ville Syrjälä <[email protected]>
Make
gmbus_lock_opsandproxy_lock_opsstatic to appease sparse intel_i2c.c:652:34: warning: symbol 'gmbus_lock_ops' was not declared. Should it be static? intel_sdvo.c:2981:34: warning: symbol 'proxy_lock_ops' was not declared. Should it be static?Cc Daniel Vetter <[email protected]>Fixes a85066840d29 ("drm/i915: Rework sdvo proxy i2c locking")Signed-off-by Ville Syrjälä <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: Fix enum pipe vs. enum transcoder for the PCH transcoder
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Use enum pipe for PCH transcoders also in the FIFO underrun code.
Fixes the following new sparse warnings:
intel_fifo_underrun.c:340:49: warning: mixing different enum types
intel_fifo_underrun.c:340:49: int enum pipe versus
intel_fifo_underrun.c:340:49: int enum transcoder
intel_fifo_underrun.c:344:49: warning: mixing different enum types
intel_fifo_underrun.c:344:49: int enum pipe versus
intel_fifo_underrun.c:344:49: int enum transcoder
intel_fifo_underrun.c:397:57: warning: mixing different enum types
intel_fifo_underrun.c:397:57: int enum pipe versus
intel_fifo_underrun.c:397:57: int enum transcoder
intel_fifo_underrun.c:398:17: warning: mixing different enum types
intel_fifo_underrun.c:398:17: int enum pipe versus
intel_fifo_underrun.c:398:17: int enum transcoder
--- drivers/gpu/drm/i915/i915_trace.h | 4 ++-- drivers/gpu/drm/i915/intel_fifo_underrun.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_trace.h +2 -2
@@ -38,7 +38,7 @@ TRACE_EVENT(intel_cpu_fifo_underrun, ); TRACE_EVENT(intel_pch_fifo_underrun, - TP_PROTO(struct drm_i915_private *dev_priv, enum transcoder pch_transcoder), + TP_PROTO(struct drm_i915_private *dev_priv, enum pipe pch_transcoder), TP_ARGS(dev_priv, pch_transcoder), TP_STRUCT__entry(
@@ -48,7 +48,7 @@ TRACE_EVENT(intel_pch_fifo_underrun, ),TP_fast_assign ( - enum pipe pipe = (enum pipe)pch_transcoder; + enum pipe pipe = pch_transcoder; __entry->pipe = pipe; __entry->frame = dev_priv->drm.driver->get_vblank_counter (&dev_priv->drm, pipe); __entry->scanline =intel_get_crtc_scanline (intel_get_crtc_for_pipe (dev_priv, pipe));
drivers/gpu/drm/i915/intel_fifo_underrun.c +10 -10
@@ -187,11 +187,11 @@ static void broadwell_set_fifo_underrun_reporting(struct drm_device *dev, }static void ibx_set_fifo_underrun_reporting (struct drm_device *dev, -enum transcoder pch_transcoder, +enum pipe pch_transcoder,bool enable) {struct drm_i915_private *dev_priv =to_i915 (dev); -uint32_t bit = (pch_transcoder ==TRANSCODER_A ) ? +uint32_t bit = (pch_transcoder ==PIPE_A ) ?SDE_TRANSA_FIFO_UNDER :SDE_TRANSB_FIFO_UNDER ;if (enable)
@@ -203,7 +203,7 @@ static void ibx_set_fifo_underrun_reporting(struct drm_device *dev,static void cpt_check_pch_fifo_underruns (struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -enum transcoder pch_transcoder = (enum transcoder ) crtc->pipe; +enum pipe pch_transcoder = crtc->pipe;uint32_t serr_int =I915_READ (SERR_INT );lockdep_assert_held (&dev_priv->irq_lock);
@@ -215,12 +215,12 @@ static void cpt_check_pch_fifo_underruns(struct intel_crtc *crtc)POSTING_READ (SERR_INT );trace_intel_pch_fifo_underrun (dev_priv, pch_transcoder); -DRM_ERROR ("pch fifo underrun on pch transcoder %s\n" , -transcoder_name (pch_transcoder)); +DRM_ERROR ("pch fifo underrun on pch transcoder %c\n" , +pipe_name (pch_transcoder)); }static void cpt_set_fifo_underrun_reporting (struct drm_device *dev, -enum transcoder pch_transcoder, +enum pipe pch_transcoder,bool enable,bool old) {struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -238,8 +238,8 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,if (old &&I915_READ (SERR_INT ) &SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder)) { -DRM_ERROR ("uncleared pch fifo underrun on pch transcoder %s\n" , -transcoder_name (pch_transcoder)); +DRM_ERROR ("uncleared pch fifo underrun on pch transcoder %c\n" , +pipe_name (pch_transcoder)); } } }
@@ -395,8 +395,8 @@ void intel_pch_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv,if (intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, false)) {trace_intel_pch_fifo_underrun (dev_priv, pch_transcoder); -DRM_ERROR ("PCH transcoder %s FIFO underrun\n" , -transcoder_name (pch_transcoder)); +DRM_ERROR ("PCH transcoder %c FIFO underrun\n" , +pipe_name (pch_transcoder)); } }
Signature · 6 lines
2.13.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: Fix enum pipe vs. enum transcoder for the PCH transcoder
Quoting [email protected] (2017-09-01 15:31:23)
Quoted 18 lines
From: Ville Syrjälä <[email protected]>
Use enum pipe for PCH transcoders also in the FIFO underrun code.
Fixes the following new sparse warnings:
intel_fifo_underrun.c:340:49: warning: mixing different enum types
intel_fifo_underrun.c:340:49: int enum pipe versus
intel_fifo_underrun.c:340:49: int enum transcoder
intel_fifo_underrun.c:344:49: warning: mixing different enum types
intel_fifo_underrun.c:344:49: int enum pipe versus
intel_fifo_underrun.c:344:49: int enum transcoder
intel_fifo_underrun.c:397:57: warning: mixing different enum types
intel_fifo_underrun.c:397:57: int enum pipe versus
intel_fifo_underrun.c:397:57: int enum transcoder
intel_fifo_underrun.c:398:17: warning: mixing different enum types
intel_fifo_underrun.c:398:17: int enum pipe versus
intel_fifo_underrun.c:398:17: int enum transcoder
Quoted 3 lines
Cc Matthias Kaehlcke <[email protected]>Fixes a21960339c8c ("drm/i915: Consistently use enum pipe for PCH transcoders")Signed-off-by Ville Syrjälä <[email protected]>
C types are consistent, so
I have not checked if the semantics are correct... -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting [email protected] (2017-09-01 15:31:21)
Quoted 8 lines
From: Ville Syrjälä <[email protected]>
Make
i9xx_load_ycbcr_conversion_matrix()static to appease sparse:
intel_color.c:110:6: warning: symbol 'i9xx_load_ycbcr_conversion_matrix' was not declared. Should it be static?Cc Shashank Sharma <[email protected]>Fixes 25edf91501b8 ("drm/i915: prepare csc unit for YCBCR420 output")Signed-off-by Ville Syrjälä <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Chris Wilson
Quoting [email protected] (2017-09-01 15:31:21)
Quoted 8 lines
From: Ville Syrjälä <[email protected]>
Make
i9xx_load_ycbcr_conversion_matrix()static to appease sparse:
intel_color.c:110:6: warning: symbol 'i9xx_load_ycbcr_conversion_matrix' was not declared. Should it be static?Cc Shashank Sharma <[email protected]>Fixes 25edf91501b8 ("drm/i915: prepare csc unit for YCBCR420 output")Signed-off-by Ville Syrjälä <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Entire series pushed to dinq. Thanks for the review.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
In reply to [email protected]== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
URL : https://patchwork.freedesktop.org/series/29694/
State : success
== Summary ==
Series 29694v1 series starting with [1/3] drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
https://patchwork.freedesktop.org/api/1.0/series/29694/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
fail -> PASS (fi-snb-2600) fdo#100215
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (fi-blb-e6850) fdo#101599fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101599 https://bugs.freedesktop.org/show_bug.cgi?id=101599
fi-bdw-5557u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:453s fi-bdw-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:444s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:1 skip:63 time:354s fi-bsw-n3050 total:288 pass:243 dwarn:0 dfail:0 fail:0 skip:45 time:561s fi-bwr-2160 total:288 pass:184 dwarn:0 dfail:0 fail:0 skip:104 time:256s fi-bxt-j4205 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:519s fi-byt-j1900 total:288 pass:254 dwarn:1 dfail:0 fail:0 skip:33 time:524s fi-elk-e7500 total:288 pass:230 dwarn:0 dfail:0 fail:0 skip:58 time:442s fi-glk-2a total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:611s fi-hsw-4770 total:288 pass:263 dwarn:0 dfail:0 fail:0 skip:25 time:447s fi-hsw-4770r total:288 pass:263 dwarn:0 dfail:0 fail:0 skip:25 time:424s fi-ilk-650 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:429s fi-ivb-3520m total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:504s fi-ivb-3770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:477s fi-kbl-7500u total:288 pass:264 dwarn:1 dfail:0 fail:0 skip:23 time:517s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:596s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:599s fi-pnv-d510 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:527s fi-skl-6260u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:468s fi-skl-6700k total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:541s fi-skl-6770hq total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:490s fi-skl-gvtdvm total:288 pass:266 dwarn:0 dfail:0 fail:0 skip:22 time:445s fi-skl-x1585l total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:489s fi-snb-2520m total:288 pass:251 dwarn:0 dfail:0 fail:0 skip:37 time:548s fi-snb-2600 total:288 pass:249 dwarn:0 dfail:0 fail:1 skip:38 time:408s
fi-byt-n2820 failed to connect after reboot
8b962a9a16b3a4e3cc2a56cba82ee9c0dc0941b5 drm-tip: 2017y-09m-01d-13h-56m-06s UTC integration manifest 1360ff920a07 drm/i915: Fix enum pipe vs. enum transcoder for the PCH transcoder 4c61baa65e56 drm/i915: Make i2c lock ops staticdc1138cd174e drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5564/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [1/3] drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
In reply to [email protected]== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Make i9xx_load_ycbcr_conversion_matrix() static
URL : https://patchwork.freedesktop.org/series/29694/
State : success
== Summary ==
Test kms_atomic_transition:
Subgroup plane-use-after-nonblocking-unbind:
incomplete -> FAIL (shard-hsw) fdo#101847
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912fdo#101847 https://bugs.freedesktop.org/show_bug.cgi?id=101847
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2265 pass:1232 dwarn:0 dfail:0 fail:17 skip:1016 time:9672s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5564/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 17 lines · On 9/1/2017 8:01 PM, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Make
i9xx_load_ycbcr_conversion_matrix()static to appease sparse:
intel_color.c:110:6: warning: symbol 'i9xx_load_ycbcr_conversion_matrix' was not declared. Should it be static?Cc Shashank Sharma <[email protected]>Fixes 25edf91501b8 ("drm/i915: prepare csc unit for YCBCR420 output")Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_color.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_color.c +0
-0
drivers/gpu/drm/i915/intel_color.c static void ctm_mult_by_limited(uint64_t *result, int64_t *input) · line 111
Quoted 6 lines
drivers/gpu/drm/i915/intel_color.c +1
-1@@ -107,7 +107,7 @@ static void ctm_mult_by_limited(uint64_t *result, int64_t *input) } } -void i9xx_load_ycbcr_conversion_matrix (struct intel_crtc *intel_crtc) +static void i9xx_load_ycbcr_conversion_matrix (struct intel_crtc *intel_crtc) {
Thanks for this patch.
drivers/gpu/drm/i915/intel_color.c static void ctm_mult_by_limited(uint64_t *result, int64_t *input) · line 113
Quoted 2 lines
drivers/gpu/drm/i915/intel_color.c +0
-0int pipe = intel_crtc->pipe;struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx