diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-05-17 22:31:24 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-06-04 16:42:53 +0300 |
| commit | 1b9994c789779fb53ca60e11fb6e67dac77d08d2 (patch) | |
| tree | 9540fd044936d2ebc798c406d3b28b6e03ce9f63 /drivers/gpu/drm/i915/intel_display.c | |
| parent | bca0bfa31c1baccf4a3b7987241ab2cf85596b83 (diff) | |
| download | linux-1b9994c789779fb53ca60e11fb6e67dac77d08d2.tar.gz | |
drm/i915: Don't pass the crtc to intel_dump_pipe_config()
We already pass the crtc's state to intel_dump_pipe_config()
so passing the crtc as well is redundant.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190517193132.8140-6-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 791a28e7ecbe..04fb75af48b2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11793,10 +11793,10 @@ static const char *output_formats(enum intel_output_format format) return output_format_str[format]; } -static void intel_dump_pipe_config(struct intel_crtc *crtc, - struct intel_crtc_state *pipe_config, +static void intel_dump_pipe_config(struct intel_crtc_state *pipe_config, const char *context) { + struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); struct drm_plane *plane; @@ -12903,10 +12903,8 @@ verify_crtc_state(struct drm_crtc *crtc, if (!intel_pipe_config_compare(dev_priv, sw_config, pipe_config, false)) { I915_STATE_WARN(1, "pipe state doesn't match!\n"); - intel_dump_pipe_config(intel_crtc, pipe_config, - "[hw state]"); - intel_dump_pipe_config(intel_crtc, sw_config, - "[sw state]"); + intel_dump_pipe_config(pipe_config, "[hw state]"); + intel_dump_pipe_config(sw_config, "[sw state]"); } } @@ -13392,8 +13390,7 @@ static int intel_atomic_check(struct drm_device *dev, if (ret == -EDEADLK) return ret; if (ret) { - intel_dump_pipe_config(to_intel_crtc(crtc), - pipe_config, "[failed]"); + intel_dump_pipe_config(pipe_config, "[failed]"); return ret; } @@ -13407,7 +13404,7 @@ static int intel_atomic_check(struct drm_device *dev, if (needs_modeset(crtc_state)) any_ms = true; - intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, + intel_dump_pipe_config(pipe_config, needs_modeset(crtc_state) ? "[modeset]" : "[fastset]"); } @@ -16668,8 +16665,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev, for_each_intel_crtc(&dev_priv->drm, crtc) { crtc_state = to_intel_crtc_state(crtc->base.state); intel_sanitize_crtc(crtc, ctx); - intel_dump_pipe_config(crtc, crtc_state, - "[setup_hw_state]"); + intel_dump_pipe_config(crtc_state, "[setup_hw_state]"); } intel_modeset_update_connector_atomic_state(dev); |