Merge the modeset-rework, basic conversion into drm-intel-next

As a quick reference I'll detail the motivation and design of the new code a
bit here (mostly stitched together from patchbomb announcements and commits
introducing the new concepts).

The crtc helper code has the fundamental assumption that encoders and crtcs can
be enabled/disabled in any order, as long as we take care of depencies (which
means that enabled encoders need an enabled crtc to feed them data,
essentially).

Our hw works differently. We already have tons of ugly cases where crtc code
enables encoder hw (or encoder->mode_set enables stuff that should only be
enabled in enocder->commit) to work around these issues. But on the disable
side we can't pull off similar tricks - there we actually need to rework the
modeset sequence that controls all this. And this is also the real motivation
why I've finally undertaken this rewrite: eDP on my shiny new Ivybridge
Ultrabook is broken, and it's broken due to the wrong disable sequence ...

The new code introduces a few interfaces and concepts:

- Add new encoder->enable/disable functions which are directly called from the
crtc->enable/disable function. This ensures that the encoder's can be
enabled/disabled at a very specific in the modeset sequence, controlled by our
platform specific code (instead of the crtc helper code calling them at a time
it deems convenient).

- Rework the dpms code - our code has mostly 1:1 connector:encoder mappings and
does support cloning on only a few encoders, so we can simplify things quite a
bit.

- Also only ever disable/enable the entire output pipeline. This ensures that
we obey the right sequence of enabling/disabling things, trying to be clever
here mostly just complicates the code and results in bugs. For cloneable
encoders this requires a bit of special handling to ensure that outputs can
still be disabled individually, but it simplifies the common case.

- Add infrastructure to read out the current hw state. No amount of careful
ordering will help us if we brick the hw on the initial modeset setup. Which
could happen if we just randomly disable things, oblivious to the state set up
by the bios. Hence we need to be able to read that out. As a benefit, we grow a
few generic functions useful to cross-check our modeset code with actual hw
state.

With all this in place, we can copy&paste the crtc helper code into the
drm/i915 driver and start to rework it:

- As detailed above, the new code only disables/enables an entire output pipe.
As a preparation for global mode-changes (e.g. reassigning shared resources) it
keeps track of which pipes need to be touched by a set of bitmasks.

- To ensure that we correctly disable the current display pipes, we need to
know the currently active connector/encoder/crtc linking. The old crtc helper
simply overwrote these links with the new setup, the new code stages the new
links in ->new_* pointers. Those get commited to the real linking pointers once
the old output configuration has been torn down, before the ->mode_set
callbacks are called.

- Finally the code adds tons of self-consistency checks by employing the new hw
state readout functions to cross-check the actual hw state with what the
datastructure think it should be. These checks are done both after every
modeset and after the hw state has been read out and sanitized at boot/resume
time. All these checks greatly helped in tracking down regressions and bugs in
the new code.

With this new basis, a lot of cleanups and improvements to the code are now
possible (besides the DP fixes that ultimately made me write this), but not yet
done:

- I think we should create struct intel_mode and use it as the adjusted mode
everywhere to store little pieces like needs_tvclock, pipe dithering values or
dp link parameters. That would still be a layering violation, but at least we
wouldn't need to recompute these kinds of things in intel_display.c. Especially
the port bpc computation needed for selecting the pipe bpc and dithering
settings in intel_display.c is rather gross.

- In a related rework we could implement ->mode_valid in terms of ->mode_fixup
in a generic way - I've hunted down too many bugs where ->mode_valid did the
right thing, but ->mode_fixup didn't. Or vice versa, resulting in funny bugs
for user-supplied modes.

- Ditch the idea to rework the hdp handling in the common crtc helper code and
just move things to i915.ko. Which would rid us of the ->detect crtc helper
dependencies.

- LVDS wire pair and pll enabling is all done in the crtc->mode_set function
currently. We should be able to move this to the crtc_enable callbacks (or in
the case of the LVDS wire pair enabling, into some encoder callback).

Last, but not least, this new code should also help in enabling a few neat
features: The hw state readout code prepares (but there are still big pieces
missing) for fastboot, i.e. avoiding the inital modeset at boot-up and just
taking over the configuration left behind by the bios. We also should be able
to extend the configuration checks in the beginning of the modeset sequence and
make better decisions about shared resources (which is the entire point behind
the atomic/global modeset ioctl).

Tested-by: Jani Nikula <jani.nikula@intel.com>
Tested-by: Ben Widawsky <ben@bwidawsk.net>
Tested-by: Damien Lespiau <damien.lespiau@intel.com>
Tested-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Vijay Purushothaman <vijay.a.purushothaman@intel.com>
Acked-by: Vijay Purushothaman <vijay.a.purushothaman@intel.com>
Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Acked-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 128 insertions, 36 deletions

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 6c9a85759bc3..39c319827f91 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -628,6 +628,14 @@ static bool intel_sdvo_set_active_outputs(struct intel_sdvo *intel_sdvo,
                                     &outputs, sizeof(outputs));
 }
 
+static bool intel_sdvo_get_active_outputs(struct intel_sdvo *intel_sdvo,
+                                          u16 *outputs)
+{
+        return intel_sdvo_get_value(intel_sdvo,
+                                    SDVO_CMD_GET_ACTIVE_OUTPUTS,
+                                    outputs, sizeof(*outputs));
+}
+
 static bool intel_sdvo_set_encoder_power_state(struct intel_sdvo *intel_sdvo,
                                                int mode)
 {
@@ -1142,51 +1150,132 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,
         intel_sdvo_write_sdvox(intel_sdvo, sdvox);
 }
 
-static void intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
+static bool intel_sdvo_connector_get_hw_state(struct intel_connector *connector)
 {
-        struct drm_device *dev = encoder->dev;
+        struct intel_sdvo_connector *intel_sdvo_connector =
+                to_intel_sdvo_connector(&connector->base);
+        struct intel_sdvo *intel_sdvo = intel_attached_sdvo(&connector->base);
+        u16 active_outputs;
+
+        intel_sdvo_get_active_outputs(intel_sdvo, &active_outputs);
+
+        if (active_outputs & intel_sdvo_connector->output_flag)
+                return true;
+        else
+                return false;
+}
+
+static bool intel_sdvo_get_hw_state(struct intel_encoder *encoder,
+                                    enum pipe *pipe)
+{
+        struct drm_device *dev = encoder->base.dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
-        struct intel_sdvo *intel_sdvo = to_intel_sdvo(encoder);
-        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
+        struct intel_sdvo *intel_sdvo = to_intel_sdvo(&encoder->base);
+        u32 tmp;
+
+        tmp = I915_READ(intel_sdvo->sdvo_reg);
+
+        if (!(tmp & SDVO_ENABLE))
+                return false;
+
+        if (HAS_PCH_CPT(dev))
+                *pipe = PORT_TO_PIPE_CPT(tmp);
+        else
+                *pipe = PORT_TO_PIPE(tmp);
+
+        return true;
+}
+
+static void intel_disable_sdvo(struct intel_encoder *encoder)
+{
+        struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+        struct intel_sdvo *intel_sdvo = to_intel_sdvo(&encoder->base);
+        u32 temp;
+
+        intel_sdvo_set_active_outputs(intel_sdvo, 0);
+        if (0)
+                intel_sdvo_set_encoder_power_state(intel_sdvo,
+                                                   DRM_MODE_DPMS_OFF);
+
+        temp = I915_READ(intel_sdvo->sdvo_reg);
+        if ((temp & SDVO_ENABLE) != 0) {
+                intel_sdvo_write_sdvox(intel_sdvo, temp & ~SDVO_ENABLE);
+        }
+}
+
+static void intel_enable_sdvo(struct intel_encoder *encoder)
+{
+        struct drm_device *dev = encoder->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_sdvo *intel_sdvo = to_intel_sdvo(&encoder->base);
+        struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
         u32 temp;
+        bool input1, input2;
+        int i;
+        u8 status;
+
+        temp = I915_READ(intel_sdvo->sdvo_reg);
+        if ((temp & SDVO_ENABLE) == 0)
+                intel_sdvo_write_sdvox(intel_sdvo, temp | SDVO_ENABLE);
+        for (i = 0; i < 2; i++)
+                intel_wait_for_vblank(dev, intel_crtc->pipe);
+
+        status = intel_sdvo_get_trained_inputs(intel_sdvo, &input1, &input2);
+        /* Warn if the device reported failure to sync.
+         * A lot of SDVO devices fail to notify of sync, but it's
+         * a given it the status is a success, we succeeded.
+         */
+        if (status == SDVO_CMD_STATUS_SUCCESS && !input1) {
+                DRM_DEBUG_KMS("First %s output reported failure to "
+                                "sync\n", SDVO_NAME(intel_sdvo));
+        }
+
+        if (0)
+                intel_sdvo_set_encoder_power_state(intel_sdvo,
+                                                   DRM_MODE_DPMS_ON);
+        intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo->attached_output);
+}
+
+static void intel_sdvo_dpms(struct drm_connector *connector, int mode)
+{
+        struct drm_crtc *crtc;
+        struct intel_sdvo *intel_sdvo = intel_attached_sdvo(connector);
+
+        /* dvo supports only 2 dpms states. */
+        if (mode != DRM_MODE_DPMS_ON)
+                mode = DRM_MODE_DPMS_OFF;
+
+        if (mode == connector->dpms)
+                return;
+
+        connector->dpms = mode;
+
+        /* Only need to change hw state when actually enabled */
+        crtc = intel_sdvo->base.base.crtc;
+        if (!crtc) {
+                intel_sdvo->base.connectors_active = false;
+                return;
+        }
 
         if (mode != DRM_MODE_DPMS_ON) {
                 intel_sdvo_set_active_outputs(intel_sdvo, 0);
                 if (0)
                         intel_sdvo_set_encoder_power_state(intel_sdvo, mode);
 
-                if (mode == DRM_MODE_DPMS_OFF) {
-                        temp = I915_READ(intel_sdvo->sdvo_reg);
-                        if ((temp & SDVO_ENABLE) != 0) {
-                                intel_sdvo_write_sdvox(intel_sdvo, temp & ~SDVO_ENABLE);
-                        }
-                }
+                intel_sdvo->base.connectors_active = false;
+
+                intel_crtc_update_dpms(crtc);
         } else {
-                bool input1, input2;
-                int i;
-                u8 status;
-
-                temp = I915_READ(intel_sdvo->sdvo_reg);
-                if ((temp & SDVO_ENABLE) == 0)
-                        intel_sdvo_write_sdvox(intel_sdvo, temp | SDVO_ENABLE);
-                for (i = 0; i < 2; i++)
-                        intel_wait_for_vblank(dev, intel_crtc->pipe);
-
-                status = intel_sdvo_get_trained_inputs(intel_sdvo, &input1, &input2);
-                /* Warn if the device reported failure to sync.
-                 * A lot of SDVO devices fail to notify of sync, but it's
-                 * a given it the status is a success, we succeeded.
-                 */
-                if (status == SDVO_CMD_STATUS_SUCCESS && !input1) {
-                        DRM_DEBUG_KMS("First %s output reported failure to "
-                                        "sync\n", SDVO_NAME(intel_sdvo));
-                }
+                intel_sdvo->base.connectors_active = true;
+
+                intel_crtc_update_dpms(crtc);
 
                 if (0)
                         intel_sdvo_set_encoder_power_state(intel_sdvo, mode);
                 intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo->attached_output);
         }
-        return;
+
+        intel_modeset_check_state(connector->dev);
 }
 
 static int intel_sdvo_mode_valid(struct drm_connector *connector,
@@ -1838,8 +1927,8 @@ set_value:
 done:
         if (intel_sdvo->base.base.crtc) {
                 struct drm_crtc *crtc = intel_sdvo->base.base.crtc;
-                drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
-                                         crtc->y, crtc->fb);
+                intel_set_mode(crtc, &crtc->mode,
+                               crtc->x, crtc->y, crtc->fb);
         }
 
         return 0;
@@ -1847,15 +1936,13 @@ done:
 }
 
 static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
-        .dpms = intel_sdvo_dpms,
         .mode_fixup = intel_sdvo_mode_fixup,
-        .prepare = intel_encoder_prepare,
         .mode_set = intel_sdvo_mode_set,
-        .commit = intel_encoder_commit,
+        .disable = intel_encoder_noop,
 };
 
 static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
-        .dpms = drm_helper_connector_dpms,
+        .dpms = intel_sdvo_dpms,
         .detect = intel_sdvo_detect,
         .fill_modes = drm_helper_probe_single_connector_modes,
         .set_property = intel_sdvo_set_property,
@@ -2027,6 +2114,7 @@ intel_sdvo_connector_init(struct intel_sdvo_connector *connector,
         connector->base.base.interlace_allowed = 1;
         connector->base.base.doublescan_allowed = 0;
         connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;
+        connector->base.get_hw_state = intel_sdvo_connector_get_hw_state;
 
         intel_connector_attach_encoder(&connector->base, &encoder->base);
         drm_sysfs_connector_add(&connector->base.base);
@@ -2578,6 +2666,10 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
 
         drm_encoder_helper_add(&intel_encoder->base, &intel_sdvo_helper_funcs);
 
+        intel_encoder->disable = intel_disable_sdvo;
+        intel_encoder->enable = intel_enable_sdvo;
+        intel_encoder->get_hw_state = intel_sdvo_get_hw_state;
+
         /* In default case sdvo lvds is false */
         if (!intel_sdvo_get_capabilities(intel_sdvo, &intel_sdvo->caps))
                 goto err;