for_each_{intel_,}crtc v2
Subsystems (2)
cover for_each_{intel_,}crtc v2
With Daniel's help to figure out an arcane corner of coccinelle, here is v2 of a series introducing macros to iterate through the CRTCs instead of using list_for_each_entry() and mode_config.crtc_list, a tiny bit more readable and easier to recall.
Damien Lespiau (4):
drm/i915: Introduce a for_each_intel_crtc() macro drm/i915: Use for_each_intel_crtc() when iterating through intel_crtcs drm/i915: Introduce a for_each_crtc() macro
drm/i915: Use for_each_crtc() when iterating through the CRTCs
drivers/gpu/drm/i915/i915_debugfs.c | 4 +- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 6 +++ drivers/gpu/drm/i915/intel_display.c | 71 +++++++++++++++--------------------- drivers/gpu/drm/i915/intel_fbdev.c | 6 +-- drivers/gpu/drm/i915/intel_pm.c | 12 +++--- 6 files changed, 47 insertions(+), 54 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/4 drm/i915: Introduce a for_each_intel_crtc() macro
Fed up with having that long list_for_each_entry() invocation?
Use for_each_intel_crtc()!
--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -163,6 +163,9 @@ enum hpd_pin {#define for_each_pipe (p) for ((p) = 0; (p) < INTEL_INFO(dev)->num_pipes; (p)++)#define for_each_sprite (p, s) for ((s) = 0; (s) < INTEL_INFO(dev)->num_sprites[(p)]; (s)++) +#define for_each_intel_crtc (dev, intel_crtc) \ + list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head) +#define for_each_encoder_on_crtc (dev, __crtc, intel_encoder) \ list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \ if ((intel_encoder)->base.crtc == (__crtc))
Signature · 1 line
1.8.3.1
PATCH 2/4 drm/i915: Use for_each_intel_crtc() when iterating through intel_crtcs
In reply to Damien LespiauGenerated using the semantic patch:
@@
iterator name list_for_each_entry;
iterator name for_each_intel_crtc;
struct intel_crtc * crtc;
struct drm_device * dev;
@@ -list_for_each_entry(crtc,&dev->mode_config.crtc_list,...) {
+for_each_intel_crtc(dev,crtc) {
...}
Followed by a couple of fixups by hand (that spatch doesn't match the cases where list_for_each_entry() is not followed by a set of '{', '}', but I couldn't figure out a way to leave the '{' out of the iterator match).
--- drivers/gpu/drm/i915/i915_debugfs.c | 4 +-- drivers/gpu/drm/i915/intel_display.c | 53 ++++++++++++++---------------------- drivers/gpu/drm/i915/intel_pm.c | 6 ++-- 3 files changed, 25 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +2 -2
@@ -514,7 +514,7 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data)unsigned long flags;struct intel_crtc *crtc; -list_for_each_entry (crtc, &dev->mode_config.crtc_list, base.head) { +for_each_intel_crtc (dev, crtc) {const char pipe =pipe_name (crtc->pipe);const char plane =plane_name (crtc->plane);struct intel_unpin_work *work;
@@ -2345,7 +2345,7 @@ static int i915_display_info(struct seq_file *m, void *unused)drm_modeset_lock_all (dev);seq_printf (m,"CRTC info\n" );seq_printf (m,"---------\n" ); -list_for_each_entry (crtc, &dev->mode_config.crtc_list, base.head) { +for_each_intel_crtc (dev, crtc) {bool active;int x, y;
drivers/gpu/drm/i915/intel_display.c +20 -33
173 lines not on this page · raw message
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -2170,7 +2170,7 @@ static void ilk_compute_wm_config(struct drm_device *dev,struct intel_crtc *intel_crtc;/* Compute the currently _active_ config */ -list_for_each_entry (intel_crtc, &dev->mode_config.crtc_list, base.head) { +for_each_intel_crtc (dev, intel_crtc) {const struct intel_pipe_wm *wm = &intel_crtc->wm.active;if (!wm->pipe_enabled)
@@ -2254,7 +2254,7 @@ static void ilk_merge_wm_level(struct drm_device *dev, ret_wm->enable = true; -list_for_each_entry (intel_crtc, &dev->mode_config.crtc_list, base.head) { +for_each_intel_crtc (dev, intel_crtc) {const struct intel_pipe_wm *active = &intel_crtc->wm.active;const struct intel_wm_level *wm = &active->wm[level];
@@ -2400,7 +2400,7 @@ static void ilk_compute_wm_results(struct drm_device *dev, }/* LP0 register values */ -list_for_each_entry (intel_crtc, &dev->mode_config.crtc_list, base.head) { +for_each_intel_crtc (dev, intel_crtc) {enum pipe pipe = intel_crtc->pipe;const struct intel_wm_level *r = &intel_crtc->wm.active.wm[0 ];
Signature · 1 line
1.8.3.1
PATCH 3/4 drm/i915: Introduce a for_each_crtc() macro
In reply to Damien Lespiau--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -163,6 +163,9 @@ enum hpd_pin {#define for_each_pipe (p) for ((p) = 0; (p) < INTEL_INFO(dev)->num_pipes; (p)++)#define for_each_sprite (p, s) for ((s) = 0; (s) < INTEL_INFO(dev)->num_sprites[(p)]; (s)++) +#define for_each_crtc (dev, crtc) \ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) +#define for_each_intel_crtc (dev, intel_crtc) \ list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head)
Signature · 1 line
1.8.3.1
Jani Nikula
maintainerRe: [PATCH 3/4] drm/i915: Introduce a for_each_crtc() macro
Quoted 10 lines · Damien Lespiau
Signed-off-by Damien Lespiau <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h enum hpd_pin { · line 168
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -163,6 +163,9 @@ enum hpd_pin {#define for_each_pipe (p) for ((p) = 0; (p) < INTEL_INFO(dev)->num_pipes; (p)++)#define for_each_sprite (p, s) for ((s) = 0; (s) < INTEL_INFO(dev)->num_sprites[(p)]; (s)++) +#define for_each_crtc (dev, crtc) \ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) +
Would this be useful in some drm header as drm_for_each_crtc()?
BR,
Jani.
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.h +0
-0#define for_each_intel_crtc (dev, intel_crtc) \ list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head)Signature · 6 lines
1.8.3.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
PATCH 4/4 drm/i915: Use for_each_crtc() when iterating through the CRTCs
In reply to Damien LespiauPatch done using the following semantic patch (thanks Daniel for the help!)
@@
iterator name list_for_each_entry;
iterator name for_each_crtc;
struct drm_crtc * crtc;
struct drm_device * dev;
@@
-list_for_each_entry(crtc,&dev->mode_config.crtc_list, head) {
+for_each_crtc(dev,crtc) {
...
}Followed by a couple of fixups by hand (that spatch doesn't match the cases where list_for_each_entry() is not followed by a set of '{', '}', but I couldn't figure out a way to leave the '{' out of the iterator match).
--- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 18 +++++++++--------- drivers/gpu/drm/i915/intel_fbdev.c | 6 +++--- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -486,7 +486,7 @@ static int i915_drm_freeze(struct drm_device *dev)* for _thaw. */ mutex_lock (&dev->mode_config.mutex); -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) +for_each_crtc (dev, crtc) dev_priv->display.crtc_disable (crtc);mutex_unlock (&dev->mode_config.mutex);
drivers/gpu/drm/i915/intel_display.c +9 -9
@@ -2312,7 +2312,7 @@ static void intel_find_plane_obj(struct intel_crtc *intel_crtc,* Failed to alloc the obj, check to see if we should share * an fb with another CRTC instead */ -list_for_each_entry (c, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, c) { i =to_intel_crtc (c);if (c == &intel_crtc->base)
@@ -2540,7 +2540,7 @@ void intel_display_handle_reset(struct drm_device *dev)* pending_flip_queue really got woken up. */ -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) {struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum plane plane = intel_crtc->plane;
@@ -2548,7 +2548,7 @@ void intel_display_handle_reset(struct drm_device *dev)intel_finish_page_flip_plane (dev, plane); } -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) {struct intel_crtc *intel_crtc =to_intel_crtc (crtc);mutex_lock (&crtc->mutex);
@@ -8301,7 +8301,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector, }/* Find an unused one (if possible) */ -list_for_each_entry (possible_crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, possible_crtc) { i++;if (!(encoder->possible_crtcs & (1 << i)))continue ;
@@ -8692,7 +8692,7 @@ void intel_mark_idle(struct drm_device *dev)if (!i915.powersave) goto out; -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) {if (!crtc->primary->fb)continue ;
@@ -8715,7 +8715,7 @@ void intel_mark_fb_busy(struct drm_i915_gem_object *obj,if (!i915.powersave)return ; -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) {if (!crtc->primary->fb)continue ;
@@ -10339,7 +10339,7 @@ static int intel_set_config_save_state(struct drm_device *dev,* restored, not the drivers personal bookkeeping. */ count =0 ; -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) { config->save_crtc_enabled[count++] = crtc->enabled; }
@@ -12050,7 +12050,7 @@ void intel_modeset_gem_init(struct drm_device *dev)* for this. */ mutex_lock (&dev->struct_mutex); -list_for_each_entry (c, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, c) {if (!c->primary->fb)continue ;
@@ -12096,7 +12096,7 @@ void intel_modeset_cleanup(struct drm_device *dev)intel_unregister_dsm_handler (); -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) {/* Skip inactive CRTCs */ if (!crtc->primary->fb)continue ;
drivers/gpu/drm/i915/intel_fbdev.c +3 -3
@@ -488,7 +488,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,return false;/* Find the largest fb */ -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) { intel_crtc =to_intel_crtc (crtc);if (!intel_crtc->active || !crtc->primary->fb) {
@@ -512,7 +512,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev, }/* Now make sure all the pipes will fit into it */ -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) {unsigned int cur_size; intel_crtc =to_intel_crtc (crtc);
@@ -577,7 +577,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,drm_framebuffer_reference (&ifbdev->fb->base);/* Final pass to check if any active pipes don't have fbs */ -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) { intel_crtc =to_intel_crtc (crtc);if (!intel_crtc->active)
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -487,7 +487,7 @@ void intel_update_fbc(struct drm_device *dev)* - new fb is too large to fit in compressed buffer * - going to an unsupported config (interlace, pixel multiply, etc.) */ -list_for_each_entry (tmp_crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, tmp_crtc) {if (intel_crtc_active (tmp_crtc) &&to_intel_crtc (tmp_crtc)->primary_enabled) {if (crtc) {
@@ -1010,7 +1010,7 @@ static struct drm_crtc *single_enabled_crtc(struct drm_device *dev) {struct drm_crtc *crtc, *enabled =NULL ; -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +for_each_crtc (dev, crtc) {if (intel_crtc_active (crtc)) {if (enabled)return NULL ;
@@ -2747,7 +2747,7 @@ void ilk_wm_get_hw_state(struct drm_device *dev)struct ilk_wm_values *hw = &dev_priv->wm.hw;struct drm_crtc *crtc; -list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) +for_each_crtc (dev, crtc)ilk_pipe_wm_get_hw_state (crtc); hw->wm_lp[0 ] =I915_READ (WM1_LP_ILK );
Signature · 1 line
1.8.3.1
Quoted 10 lines · Damien Lespiau
With Daniel's help to figure out an arcane corner of coccinelle, here is v2 of a series introducing macros to iterate through the CRTCs instead of using
list_for_each_entry()and mode_config.crtc_list, a tiny bit more readable and easier to recall.Damien Lespiau (4):
drm/i915: Introduce afor_each_intel_crtc()macro drm/i915: Usefor_each_intel_crtc()when iterating throughintel_crtcsdrm/i915: Introduce afor_each_crtc()macro
drm/i915: Usefor_each_crtc()when iterating through the CRTCs
Thanks, all four pulled into dinq.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch