drm/i915: Simplify intel_mark_busy/idle
Subsystems (2)
PATCH 1/1 drm/i915: Simplify intel_mark_busy/idle
From: Tvrtko Ursulin <[email protected]>
They use dev_priv exclusively so pass it in instead of dev for smaller source and binary.
--- drivers/gpu/drm/i915/i915_gem.c | 4 ++-- drivers/gpu/drm/i915/intel_display.c | 14 +++++--------- drivers/gpu/drm/i915/intel_drv.h | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -2
@@ -2659,7 +2659,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,queue_delayed_work (dev_priv->wq, &dev_priv->mm.retire_work,round_jiffies_up_relative (HZ )); -intel_mark_busy (dev_priv->dev); +intel_mark_busy (dev_priv);/* Sanity check that the reserved size was large enough. */ ret =intel_ring_get_tail (ringbuf) - request_start;
@@ -3041,7 +3041,7 @@ i915_gem_idle_work_handler(struct work_struct *work)* Also locking seems to be fubar here, engine->request_list is protected * by dev->struct_mutex. */ -intel_mark_idle (dev); +intel_mark_idle (dev_priv);if (mutex_trylock (&dev->struct_mutex)) {for_each_engine (engine, dev_priv)
drivers/gpu/drm/i915/intel_display.c +5 -9
@@ -10808,31 +10808,27 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,return mode; } -void intel_mark_busy (struct drm_device *dev) +void intel_mark_busy (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv = dev->dev_private; -if (dev_priv->mm.busy)return ;intel_runtime_pm_get (dev_priv);i915_update_gfx_val (dev_priv); -if (INTEL_INFO (dev)->gen >=6 ) +if (INTEL_GEN (dev_priv) >=6 )gen6_rps_busy (dev_priv); dev_priv->mm.busy = true; } -void intel_mark_idle (struct drm_device *dev) +void intel_mark_idle (struct drm_i915_private *dev_priv) { -struct drm_i915_private *dev_priv = dev->dev_private; -if (!dev_priv->mm.busy)return ; dev_priv->mm.busy = false; -if (INTEL_INFO (dev)->gen >=6 ) -gen6_rps_idle (dev->dev_private); +if (INTEL_GEN (dev_priv) >=6 ) +gen6_rps_idle (dev_priv);intel_runtime_pm_put (dev_priv); }
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -1117,8 +1117,8 @@ extern const struct drm_plane_funcs intel_plane_funcs;void intel_init_display_hooks (struct drm_i915_private *dev_priv);unsigned int intel_rotation_info_size (const struct intel_rotation_info *rot_info);bool intel_has_pending_fb_unpin (struct drm_device *dev); -void intel_mark_busy (struct drm_device *dev); -void intel_mark_idle (struct drm_device *dev); +void intel_mark_busy (struct drm_i915_private *dev_priv); +void intel_mark_idle (struct drm_i915_private *dev_priv);void intel_crtc_restore_mode (struct drm_crtc *crtc);int intel_display_suspend (struct drm_device *dev);void intel_encoder_destroy (struct drm_encoder *encoder);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
They use
dev_privexclusively so pass it in instead of dev for smaller source and binary.
True, but we have an outstanding bug report and patch here because we have current breakage with rpm :(
Quoted 1 line
Signed-off-by Tvrtko Ursulin <[email protected]>
Anyway, this doesn't make things worse or too cause much churn...
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Simplify intel_mark_busy/idle
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Simplify intel_mark_busy/idle
URL : https://patchwork.freedesktop.org/series/6465/
State : failure
== Summary ==
Series 6465v1 drm/i915: Simplify intel_mark_busy/idle
http://patchwork.freedesktop.org/api/1.0/series/6465/revisions/1/mbox/
Test gem_ringfill:
Subgroup basic-default-interruptible:
pass -> DMESG-WARN (ilk-hp8440p)
Test gem_sync:
Subgroup basic-all:
dmesg-warn -> PASS (ilk-hp8440p)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> INCOMPLETE (skl-nuci5)bdw-ultra total:201 pass:176 dwarn:0 dfail:0 fail:0 skip:25 bsw-nuc-2 total:200 pass:159 dwarn:0 dfail:0 fail:0 skip:41 byt-nuc total:200 pass:159 dwarn:0 dfail:0 fail:0 skip:41 hsw-brixbox total:201 pass:175 dwarn:0 dfail:0 fail:0 skip:26 hsw-gt2 total:201 pass:179 dwarn:0 dfail:0 fail:1 skip:21 ilk-hp8440p total:201 pass:139 dwarn:1 dfail:0 fail:0 skip:61 ivb-t430s total:201 pass:170 dwarn:0 dfail:0 fail:0 skip:31 skl-i7k-2 total:201 pass:174 dwarn:0 dfail:0 fail:0 skip:27 skl-nuci5 total:170 pass:158 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:201 pass:159 dwarn:0 dfail:0 fail:0 skip:42 snb-x220t total:201 pass:159 dwarn:0 dfail:0 fail:1 skip:41
Results at /archive/results/CI_IGT_test/Patchwork_2102/
4887074a38f11f6b5be255e54c97e7d0b2a0368b drm-intel-nightly: 2016y-04m-28d-11h-21m-01s UTC integration manifest 5ac057b drm/i915: Simplify intel_mark_busy/idle
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx