[Intel-gfx] [PATCH] drm/i915: prefer for_each_intel_* macros for iteration
Jani Nikula
jani.nikula at intel.com
Wed Dec 16 04:41:20 PST 2015
On Wed, 16 Dec 2015, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Wed, Dec 16, 2015 at 12:48:16PM +0200, Jani Nikula wrote:
>> Use the for_each_intel_* macros for iterating intel_encoder,
>> intel_connector, and intel_crtc. No functional changes.
>>
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>
> Trusting that gcc will scream at you if you fumbled types:
>
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Pushed to drm-intel-next-queued, thanks for the review.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/i915_drv.c | 11 ++++-------
>> drivers/gpu/drm/i915/intel_display.c | 10 +++-------
>> drivers/gpu/drm/i915/intel_dp.c | 8 +++-----
>> drivers/gpu/drm/i915/intel_opregion.c | 6 +++---
>> drivers/gpu/drm/i915/intel_panel.c | 4 ++--
>> drivers/gpu/drm/i915/intel_pm.c | 5 ++---
>> 6 files changed, 17 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 8ddfcce92cf1..44ad3085695f 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -543,15 +543,12 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)
>> static void intel_suspend_encoders(struct drm_i915_private *dev_priv)
>> {
>> struct drm_device *dev = dev_priv->dev;
>> - struct drm_encoder *encoder;
>> + struct intel_encoder *encoder;
>>
>> drm_modeset_lock_all(dev);
>> - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
>> - struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
>> -
>> - if (intel_encoder->suspend)
>> - intel_encoder->suspend(intel_encoder);
>> - }
>> + for_each_intel_encoder(dev, encoder)
>> + if (encoder->suspend)
>> + encoder->suspend(encoder);
>> drm_modeset_unlock_all(dev);
>> }
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>> index 471f1207d438..079a7c0ed58e 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -15823,7 +15823,7 @@ void intel_connector_unregister(struct intel_connector *intel_connector)
>> void intel_modeset_cleanup(struct drm_device *dev)
>> {
>> struct drm_i915_private *dev_priv = dev->dev_private;
>> - struct drm_connector *connector;
>> + struct intel_connector *connector;
>>
>> intel_disable_gt_powersave(dev);
>>
>> @@ -15850,12 +15850,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
>> flush_scheduled_work();
>>
>> /* destroy the backlight and sysfs files before encoders/connectors */
>> - list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
>> - struct intel_connector *intel_connector;
>> -
>> - intel_connector = to_intel_connector(connector);
>> - intel_connector->unregister(intel_connector);
>> - }
>> + for_each_intel_connector(dev, connector)
>> + connector->unregister(connector);
>>
>> drm_mode_config_cleanup(dev);
>>
>> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>> index 31ba24114065..796e3d313cb9 100644
>> --- a/drivers/gpu/drm/i915/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/intel_dp.c
>> @@ -389,8 +389,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)
>> * We don't have power sequencer currently.
>> * Pick one that's not used by other ports.
>> */
>> - list_for_each_entry(encoder, &dev->mode_config.encoder_list,
>> - base.head) {
>> + for_each_intel_encoder(dev, encoder) {
>> struct intel_dp *tmp;
>>
>> if (encoder->type != INTEL_OUTPUT_EDP)
>> @@ -530,7 +529,7 @@ void vlv_power_sequencer_reset(struct drm_i915_private *dev_priv)
>> * should use them always.
>> */
>>
>> - list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head) {
>> + for_each_intel_encoder(dev, encoder) {
>> struct intel_dp *intel_dp;
>>
>> if (encoder->type != INTEL_OUTPUT_EDP)
>> @@ -2850,8 +2849,7 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,
>> if (WARN_ON(pipe != PIPE_A && pipe != PIPE_B))
>> return;
>>
>> - list_for_each_entry(encoder, &dev->mode_config.encoder_list,
>> - base.head) {
>> + for_each_intel_encoder(dev, encoder) {
>> struct intel_dp *intel_dp;
>> enum port port;
>>
>> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
>> index 53164a05ff7a..96dbd71124a3 100644
>> --- a/drivers/gpu/drm/i915/intel_opregion.c
>> +++ b/drivers/gpu/drm/i915/intel_opregion.c
>> @@ -422,7 +422,7 @@ int intel_opregion_notify_adapter(struct drm_device *dev, pci_power_t state)
>> static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
>> {
>> struct drm_i915_private *dev_priv = dev->dev_private;
>> - struct intel_connector *intel_connector;
>> + struct intel_connector *connector;
>> struct opregion_asle *asle = dev_priv->opregion.asle;
>>
>> DRM_DEBUG_DRIVER("bclp = 0x%08x\n", bclp);
>> @@ -446,8 +446,8 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
>> * only one).
>> */
>> DRM_DEBUG_KMS("updating opregion backlight %d/255\n", bclp);
>> - list_for_each_entry(intel_connector, &dev->mode_config.connector_list, base.head)
>> - intel_panel_set_backlight_acpi(intel_connector, bclp, 255);
>> + for_each_intel_connector(dev, connector)
>> + intel_panel_set_backlight_acpi(connector, bclp, 255);
>> asle->cblv = DIV_ROUND_UP(bclp * 100, 255) | ASLE_CBLV_VALID;
>>
>> drm_modeset_unlock(&dev->mode_config.connection_mutex);
>> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
>> index 72183a057c79..f5b4c98de608 100644
>> --- a/drivers/gpu/drm/i915/intel_panel.c
>> +++ b/drivers/gpu/drm/i915/intel_panel.c
>> @@ -1845,7 +1845,7 @@ void intel_backlight_register(struct drm_device *dev)
>> {
>> struct intel_connector *connector;
>>
>> - list_for_each_entry(connector, &dev->mode_config.connector_list, base.head)
>> + for_each_intel_connector(dev, connector)
>> intel_backlight_device_register(connector);
>> }
>>
>> @@ -1853,6 +1853,6 @@ void intel_backlight_unregister(struct drm_device *dev)
>> {
>> struct intel_connector *connector;
>>
>> - list_for_each_entry(connector, &dev->mode_config.connector_list, base.head)
>> + for_each_intel_connector(dev, connector)
>> intel_backlight_device_unregister(connector);
>> }
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 99f2642fd5df..d385d9991eed 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -3314,7 +3314,7 @@ static void skl_write_wm_values(struct drm_i915_private *dev_priv,
>> struct drm_device *dev = dev_priv->dev;
>> struct intel_crtc *crtc;
>>
>> - list_for_each_entry(crtc, &dev->mode_config.crtc_list, base.head) {
>> + for_each_intel_crtc(dev, crtc) {
>> int i, level, max_level = ilk_wm_max_level(dev);
>> enum pipe pipe = crtc->pipe;
>>
>> @@ -3523,8 +3523,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,
>> * Otherwise, because of this_crtc being freshly enabled/disabled, the
>> * other active pipes need new DDB allocation and WM values.
>> */
>> - list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list,
>> - base.head) {
>> + for_each_intel_crtc(dev, intel_crtc) {
>> struct skl_pipe_wm pipe_wm = {};
>> bool wm_changed;
>>
>> --
>> 2.1.4
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
More information about the Intel-gfx
mailing list