UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ville Syrjälä 2019-05-17 22:31:24 +03:00
parent bca0bfa31c
commit 1b9994c789
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/drm/i915/intel_display.c
View File

@ -11793,10 +11793,10 @@ static const char *output_formats(enum intel_output_format format)
return output_format_str[format]; return output_format_str[format];
} }
static void intel_dump_pipe_config(struct intel_crtc *crtc, static void intel_dump_pipe_config(struct intel_crtc_state *pipe_config,
struct intel_crtc_state *pipe_config,
const char *context) const char *context)
{ {
struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct drm_plane *plane; struct drm_plane *plane;
@ -12903,10 +12903,8 @@ verify_crtc_state(struct drm_crtc *crtc,
if (!intel_pipe_config_compare(dev_priv, sw_config, if (!intel_pipe_config_compare(dev_priv, sw_config,
pipe_config, false)) { pipe_config, false)) {
I915_STATE_WARN(1, "pipe state doesn't match!\n"); I915_STATE_WARN(1, "pipe state doesn't match!\n");
intel_dump_pipe_config(intel_crtc, pipe_config, intel_dump_pipe_config(pipe_config, "[hw state]");
"[hw state]"); intel_dump_pipe_config(sw_config, "[sw state]");
intel_dump_pipe_config(intel_crtc, sw_config,
"[sw state]");
} }
} }
@ -13392,8 +13390,7 @@ static int intel_atomic_check(struct drm_device *dev,
if (ret == -EDEADLK) if (ret == -EDEADLK)
return ret; return ret;
if (ret) { if (ret) {
intel_dump_pipe_config(to_intel_crtc(crtc), intel_dump_pipe_config(pipe_config, "[failed]");
pipe_config, "[failed]");
return ret; return ret;
} }
@ -13407,7 +13404,7 @@ static int intel_atomic_check(struct drm_device *dev,
if (needs_modeset(crtc_state)) if (needs_modeset(crtc_state))
any_ms = true; any_ms = true;
intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, intel_dump_pipe_config(pipe_config,
needs_modeset(crtc_state) ? needs_modeset(crtc_state) ?
"[modeset]" : "[fastset]"); "[modeset]" : "[fastset]");
} }
@ -16668,8 +16665,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
for_each_intel_crtc(&dev_priv->drm, crtc) { for_each_intel_crtc(&dev_priv->drm, crtc) {
crtc_state = to_intel_crtc_state(crtc->base.state); crtc_state = to_intel_crtc_state(crtc->base.state);
intel_sanitize_crtc(crtc, ctx); intel_sanitize_crtc(crtc, ctx);
intel_dump_pipe_config(crtc, crtc_state, intel_dump_pipe_config(crtc_state, "[setup_hw_state]");
"[setup_hw_state]");
} }
intel_modeset_update_connector_atomic_state(dev); intel_modeset_update_connector_atomic_state(dev);