From: Ville Syrjälä Date: Fri, 17 May 2019 19:31:25 +0000 (+0300) Subject: drm/i915: Don't pass the crtc to intel_modeset_pipe_config() X-Git-Tag: v5.3-rc1~81^2~16^2~161 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f239b7998507419a46815d6df8c17bdddc04d8c3;p=thirdparty%2Fkernel%2Flinux.git drm/i915: Don't pass the crtc to intel_modeset_pipe_config() We already pass the crtc's state to intel_modeset_pipe_config() so passing the crtc as well is redundant. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20190517193132.8140-7-ville.syrjala@linux.intel.com Reviewed-by: Maarten Lankhorst --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 04fb75af48b28..1072064297452 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12017,9 +12017,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) } static int -intel_modeset_pipe_config(struct drm_crtc *crtc, - struct intel_crtc_state *pipe_config) +intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) { + struct drm_crtc *crtc = pipe_config->base.crtc; struct drm_atomic_state *state = pipe_config->base.state; struct intel_encoder *encoder; struct drm_connector *connector; @@ -13386,7 +13386,7 @@ static int intel_atomic_check(struct drm_device *dev, continue; } - ret = intel_modeset_pipe_config(crtc, pipe_config); + ret = intel_modeset_pipe_config(pipe_config); if (ret == -EDEADLK) return ret; if (ret) {