diff options
| author |   Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-09-07 12:10:53 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-09-08 14:21:37 +0300 |
| commit | 3917c9d3b2171dc838b486f7be6869525c6eee02 (patch) | |
| tree | 6371d2bfae89459ab0726e44fd3738dd8646c87b | |
| parent | drm/i915: Nuke fastet state copy hacks (diff) | |
| download | wireguard-linux-3917c9d3b2171dc838b486f7be6869525c6eee02.tar.xz wireguard-linux-3917c9d3b2171dc838b486f7be6869525c6eee02.zip | |
drm/i915: Skip intel_modeset_pipe_config_late() if the pipe is not enabled
No sense in calling intel_modeset_pipe_config_late() for a disabled
pipe.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220907091057.11572-14-ville.syrjala@linux.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 976af608b1d6..765ec3102cfe 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -6783,9 +6783,11 @@ static int intel_atomic_check(struct drm_device *dev, if (!intel_crtc_needs_modeset(new_crtc_state)) continue; - ret = intel_modeset_pipe_config_late(state, crtc); - if (ret) - goto fail; + if (new_crtc_state->hw.enable) { + ret = intel_modeset_pipe_config_late(state, crtc); + if (ret) + goto fail; + } intel_crtc_check_fastset(old_crtc_state, new_crtc_state); } |