lkml.org 
[lkml]   [2018]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 156/171] drm/i915: Restore vblank interrupts earlier
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ville Syrjälä <ville.syrjala@linux.intel.com>

    commit 7cada4d0b7a0fb813dbc9777fec092e9ed0546e9 upstream.

    Plane sanitation needs vblank interrupts (on account of CxSR disable).
    So let's restore vblank interrupts earlier.

    v2: Make it actually build
    v3: Add comment to explain why we need this (Daniel)

    Cc: stable@vger.kernel.org
    Cc: Dennis <dennis.nezic@utoronto.ca>
    Tested-by: Dennis <dennis.nezic@utoronto.ca>
    Tested-by: Peter Nowee <peter.nowee@gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105637
    Fixes: b1e01595a66d ("drm/i915: Redo plane sanitation during readout")
    Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Link: https://patchwork.freedesktop.org/patch/msgid/20181003144951.4397-1-ville.syrjala@linux.intel.com
    (cherry picked from commit 68bc30deac625b8be8d3950b30dc93d09a3645f5)
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/i915/intel_display.c | 23 +++++++++++++----------
    1 file changed, 13 insertions(+), 10 deletions(-)

    --- a/drivers/gpu/drm/i915/intel_display.c
    +++ b/drivers/gpu/drm/i915/intel_display.c
    @@ -15216,13 +15216,9 @@ static void intel_sanitize_crtc(struct i
    I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK);
    }

    - /* restore vblank interrupts to correct state */
    - drm_crtc_vblank_reset(&crtc->base);
    if (crtc->active) {
    struct intel_plane *plane;

    - drm_crtc_vblank_on(&crtc->base);
    -
    /* Disable everything but the primary plane */
    for_each_intel_plane_on_crtc(dev, crtc, plane) {
    const struct intel_plane_state *plane_state =
    @@ -15549,7 +15545,6 @@ intel_modeset_setup_hw_state(struct drm_
    struct drm_modeset_acquire_ctx *ctx)
    {
    struct drm_i915_private *dev_priv = to_i915(dev);
    - enum pipe pipe;
    struct intel_crtc *crtc;
    struct intel_encoder *encoder;
    int i;
    @@ -15560,15 +15555,23 @@ intel_modeset_setup_hw_state(struct drm_
    /* HW state is read out, now we need to sanitize this mess. */
    get_encoder_power_domains(dev_priv);

    - intel_sanitize_plane_mapping(dev_priv);
    + /*
    + * intel_sanitize_plane_mapping() may need to do vblank
    + * waits, so we need vblank interrupts restored beforehand.
    + */
    + for_each_intel_crtc(&dev_priv->drm, crtc) {
    + drm_crtc_vblank_reset(&crtc->base);

    - for_each_intel_encoder(dev, encoder) {
    - intel_sanitize_encoder(encoder);
    + if (crtc->active)
    + drm_crtc_vblank_on(&crtc->base);
    }

    - for_each_pipe(dev_priv, pipe) {
    - crtc = intel_get_crtc_for_pipe(dev_priv, pipe);
    + intel_sanitize_plane_mapping(dev_priv);
    +
    + for_each_intel_encoder(dev, encoder)
    + intel_sanitize_encoder(encoder);

    + for_each_intel_crtc(&dev_priv->drm, crtc) {
    intel_sanitize_crtc(crtc, ctx);
    intel_dump_pipe_config(crtc, crtc->config,
    "[setup_hw_state]");

    \
     
     \ /
      Last update: 2018-11-19 19:19    [W:4.216 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site