Skip to contentSkip to conversation

drm/i915/irq: make i945gm_vblank_work_func() static again

PATCH In review Jani Nikula 3 participants 6 messages Jun 27, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/irq: make i945gm_vblank_work_func() static again

The static keyword was apparently accidentally removed in commit 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs"), leading to sparse warning:

drivers/gpu/drm/i915/i915_irq.c:3382:6: warning: symbol 'i945gm_vblank_work_func' was not declared. Should it be static?

Make the function static again.

Fixes 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs")
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
index 1b83d6e2ae69..73f0338faf9f 100644
@@ -3379,7 +3379,7 @@ void bdw_disable_vblank(struct drm_crtc *crtc)
 	spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 
-void i945gm_vblank_work_func(struct work_struct *work)
+static void i945gm_vblank_work_func(struct work_struct *work)
 {
 	struct drm_i915_private *dev_priv =
 		container_of(work, struct drm_i915_private, i945gm_vblank.work);
Signature · 6 lines
2.20.1

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

Quoting Jani Nikula (2019-06-27 10:19:14)

Quoted 7 lines

The static keyword was apparently accidentally removed in commit 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs"), leading to sparse warning:

drivers/gpu/drm/i915/i915_irq.c:3382:6: warning: symbol 'i945gm_vblank_work_func' was not declared. Should it be static?

Quoted 6 lines

Make the function static again.

Fixes 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs")
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>

3 people (well 2 and a robot) send patches for the same compiler warning! That means something, right?

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

#2 lore raw
Quoted 10 lines · Chris Wilson

Quoting Jani Nikula (2019-06-27 10:19:14)

Quoted 9 lines

The static keyword was apparently accidentally removed in commit 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs"), leading to sparse warning:

drivers/gpu/drm/i915/i915_irq.c:3382:6: warning: symbol 'i945gm_vblank_work_func' was not declared. Should it be static?

Make the function static again.

Quoted 7 lines
Quoted 4 lines
Fixes 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs")
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>

3 people (well 2 and a robot) send patches for the same compiler warning! That means something, right?

That writing patches is more rewarding than reading patches written by others...? ;)

Quoted 1 line

Thanks, likewise, let's see whose patch passes CI first. Looks like your patch regresses module reload. :D

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Quoting Jani Nikula (2019-06-27 11:26:16)

Quoted 19 lines · Chris Wilson
Quoted 10 lines

Quoting Jani Nikula (2019-06-27 10:19:14)

Quoted 9 lines

The static keyword was apparently accidentally removed in commit 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs"), leading to sparse warning:

drivers/gpu/drm/i915/i915_irq.c:3382:6: warning: symbol 'i945gm_vblank_work_func' was not declared. Should it be static?

Make the function static again.

Quoted 7 lines
Quoted 4 lines
Fixes 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs")
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>

3 people (well 2 and a robot) send patches for the same compiler warning! That means something, right?

Quoted 7 lines

That writing patches is more rewarding than reading patches written by others...? ;)

Quoted 1 line

Thanks, likewise, let's see whose patch passes CI first. Looks like your patch regresses module reload. :D

Now known to cibuglog, you cheat!
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Quoting Chris Wilson (2019-06-27 11:28:37)

Quoted 23 lines

Quoting Jani Nikula (2019-06-27 11:26:16)

Quoted 22 lines · Chris Wilson
Quoted 10 lines

Quoting Jani Nikula (2019-06-27 10:19:14)

Quoted 9 lines

The static keyword was apparently accidentally removed in commit 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs"), leading to sparse warning:

drivers/gpu/drm/i915/i915_irq.c:3382:6: warning: symbol 'i945gm_vblank_work_func' was not declared. Should it be static?

Make the function static again.

Quoted 7 lines
Quoted 4 lines
Fixes 08fa8fd0faa5 ("drm/i915: Switch to per-crtc vblank vfuncs")
Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>

3 people (well 2 and a robot) send patches for the same compiler warning! That means something, right?

That writing patches is more rewarding than reading patches written by others...? ;)

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

Thanks, likewise, let's see whose patch passes CI first. Looks like your patch regresses module reload. :D

Now known to cibuglog, you cheat!

I called it a draw and pushed both merged into one :) -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

✗ Fi.CI.BAT: failure for drm/i915/irq: make i945gm_vblank_work_func() static again

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915/irq: make i945gm_vblank_work_func() static again
URL : https://patchwork.freedesktop.org/series/62841/
State : failure

== Summary ==

Applying: drm/i915/irq: make i945gm_vblank_work_func() static again Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/i915_irq.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.

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