diff options
| author | Ander Conselvan de Oliveira | 2015-03-20 15:18:02 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2015-03-26 15:12:26 +0100 |
| commit | 49172fee6173d213cf711bfad751e1b38e8fdaaf (patch) | |
| tree | 4942292c7516c45d8de9479896ad5e50413da8fa /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Add intel_atomic_get_crtc_state() helper function (diff) | |
| download | kernel-qcow2-linux-49172fee6173d213cf711bfad751e1b38e8fdaaf.tar.gz kernel-qcow2-linux-49172fee6173d213cf711bfad751e1b38e8fdaaf.tar.xz kernel-qcow2-linux-49172fee6173d213cf711bfad751e1b38e8fdaaf.zip | |
drm/i915: Pass acquire ctx also to intel_release_load_detect_pipe()
For now this is not necessary since intel_set_mode() doesn't acquire any
new locks. However, once that function is converted to atomic, that will
change, since we'll pass an atomic state to it, and that needs to have
the right acquire context set.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9d314f889613..bbd09aaa055d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9038,7 +9038,8 @@ fail_unlock: } void intel_release_load_detect_pipe(struct drm_connector *connector, - struct intel_load_detect_pipe *old) + struct intel_load_detect_pipe *old, + struct drm_modeset_acquire_ctx *ctx) { struct intel_encoder *intel_encoder = intel_attached_encoder(connector); @@ -13595,7 +13596,7 @@ static void intel_enable_pipe_a(struct drm_device *dev) return; if (intel_get_load_detect_pipe(crt, NULL, &load_detect_temp, ctx)) - intel_release_load_detect_pipe(crt, &load_detect_temp); + intel_release_load_detect_pipe(crt, &load_detect_temp, ctx); } static bool |