[Intel-gfx] [PATCH 2/6] drm/i915: use compute_config in set_config v2

[Jesse Barnes]

This will allow us to consult more info before deciding whether to flip
or do a full mode set.

v2:
  - don't use uninitialized or incorrect pipe masks in set_config
    failure path (Ander)

Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index f9a0963..0f1952e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11430,6 +11430,7 @@ static int intel_crtc_set_config(struct drm_mode_set 
*set)
        struct drm_device *dev;
        struct drm_mode_set save_set;
        struct intel_set_config *config;
+       unsigned modeset_pipes, prepare_pipes, disable_pipes;
        int ret;
 
        BUG_ON(!set);
@@ -11475,9 +11476,17 @@ static int intel_crtc_set_config(struct drm_mode_set 
*set)
        if (ret)
                goto fail;
 
+       ret = intel_modeset_compute_config(set->crtc, set->mode, set->fb,
+                                          &modeset_pipes, &prepare_pipes,
+                                          &disable_pipes);
+       if (ret)
+               goto fail;
+
        if (config->mode_changed) {
-               ret = intel_set_mode(set->crtc, set->mode,
-                                    set->x, set->y, set->fb);
+               ret = intel_set_mode_pipes(set->crtc, set->mode,
+                                          set->x, set->y, set->fb,
+                                          modeset_pipes, prepare_pipes,
+                                          disable_pipes);
        } else if (config->fb_changed) {
                struct intel_crtc *intel_crtc = to_intel_crtc(set->crtc);
 
@@ -13412,14 +13421,27 @@ void intel_modeset_setup_hw_state(struct drm_device 
*dev,
                for_each_pipe(dev_priv, pipe) {
                        struct drm_crtc *crtc =
                                dev_priv->pipe_to_crtc_mapping[pipe];
+                       unsigned modeset_pipes, prepare_pipes, disable_pipes;
+                       int ret;
+
+                       ret = intel_modeset_compute_config(crtc, &crtc->mode,
+                                                          crtc->primary->fb,
+                                                          &modeset_pipes,
+                                                          &prepare_pipes,
+                                                          &disable_pipes);
+                       if (ret) {
+                               DRM_DEBUG_KMS("prepare failed\n");
+                               goto out;
+                       }
 
                        __intel_set_mode(crtc, &crtc->mode, crtc->x, crtc->y,
-                                        crtc->primary->fb);
+                                        crtc->primary->fb, modeset_pipes,
+                                        prepare_pipes, disable_pipes);
                }
        } else {
                intel_modeset_update_staged_output_state(dev);
        }
-
+out:
        intel_modeset_check_state(dev);
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx