lkml.org 
[lkml]   [2018]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 39/41] drm/i915/glk: Add Quirk for GLK NUC HDMI port issues.
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Clint Taylor <clinton.a.taylor@intel.com>

    commit 0ca9488193e61ec5f31a631d8147f74525629e8a upstream.

    On GLK NUC platforms the HDMI retiming buffer needs additional disabled
    time to correctly sync to a faster incoming signal.

    When measured on a scope the highspeed lines of the HDMI clock turn off
    for ~400uS during a normal resolution change. The HDMI retimer on the
    GLK NUC appears to require at least a full frame of quiet time before a
    new faster clock can be correctly sync'd. Wait 100ms due to msleep
    inaccuracies while waiting for a completed frame. Add a quirk to the
    driver for GLK boards that use ITE66317 HDMI retimers.

    V2: Add more devices to the quirk list
    V3: Delay increased to 100ms, check to confirm crtc type is HDMI.
    V4: crtc type check extended to include _DDI and whitespace fixes
    v5: Fix white spaces, remove the macro for delay. Revert the crtc type
    check introduced in v4.

    Cc: Imre Deak <imre.deak@intel.com>
    Cc: <stable@vger.kernel.org> # v4.14+
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105887
    Signed-off-by: Clint Taylor <clinton.a.taylor@intel.com>
    Tested-by: Daniel Scheller <d.scheller.oss@gmail.com>
    Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
    Signed-off-by: Imre Deak <imre.deak@intel.com>
    Reviewed-by: Imre Deak <imre.deak@intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20180710200205.1478-1-radhakrishna.sripada@intel.com
    (cherry picked from commit 90c3e2198777aaa355b6994a31a79c636c8d4306)
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
    Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/i915/i915_drv.h | 1 +
    drivers/gpu/drm/i915/intel_ddi.c | 13 +++++++++++--
    drivers/gpu/drm/i915/intel_display.c | 21 ++++++++++++++++++++-
    drivers/gpu/drm/i915/intel_drv.h | 3 +--
    4 files changed, 33 insertions(+), 5 deletions(-)

    --- a/drivers/gpu/drm/i915/i915_drv.h
    +++ b/drivers/gpu/drm/i915/i915_drv.h
    @@ -1183,6 +1183,7 @@ enum intel_sbi_destination {
    #define QUIRK_BACKLIGHT_PRESENT (1<<3)
    #define QUIRK_PIN_SWIZZLED_PAGES (1<<5)
    #define QUIRK_INCREASE_T12_DELAY (1<<6)
    +#define QUIRK_INCREASE_DDI_DISABLED_TIME (1<<7)

    struct intel_fbdev;
    struct intel_fbc_work;
    --- a/drivers/gpu/drm/i915/intel_ddi.c
    +++ b/drivers/gpu/drm/i915/intel_ddi.c
    @@ -1526,15 +1526,24 @@ void intel_ddi_enable_transcoder_func(co
    I915_WRITE(TRANS_DDI_FUNC_CTL(cpu_transcoder), temp);
    }

    -void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
    - enum transcoder cpu_transcoder)
    +void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state)
    {
    + struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
    + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
    + enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
    i915_reg_t reg = TRANS_DDI_FUNC_CTL(cpu_transcoder);
    uint32_t val = I915_READ(reg);

    val &= ~(TRANS_DDI_FUNC_ENABLE | TRANS_DDI_PORT_MASK | TRANS_DDI_DP_VC_PAYLOAD_ALLOC);
    val |= TRANS_DDI_PORT_NONE;
    I915_WRITE(reg, val);
    +
    + if (dev_priv->quirks & QUIRK_INCREASE_DDI_DISABLED_TIME &&
    + intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
    + DRM_DEBUG_KMS("Quirk Increase DDI disabled time\n");
    + /* Quirk time at 100ms for reliable operation */
    + msleep(100);
    + }
    }

    bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
    --- a/drivers/gpu/drm/i915/intel_display.c
    +++ b/drivers/gpu/drm/i915/intel_display.c
    @@ -5653,7 +5653,7 @@ static void haswell_crtc_disable(struct
    intel_ddi_set_vc_payload_alloc(intel_crtc->config, false);

    if (!transcoder_is_dsi(cpu_transcoder))
    - intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
    + intel_ddi_disable_transcoder_func(old_crtc_state);

    if (INTEL_GEN(dev_priv) >= 9)
    skylake_scaler_disable(intel_crtc);
    @@ -14286,6 +14286,18 @@ static void quirk_increase_t12_delay(str
    DRM_INFO("Applying T12 delay quirk\n");
    }

    +/*
    + * GeminiLake NUC HDMI outputs require additional off time
    + * this allows the onboard retimer to correctly sync to signal
    + */
    +static void quirk_increase_ddi_disabled_time(struct drm_device *dev)
    +{
    + struct drm_i915_private *dev_priv = to_i915(dev);
    +
    + dev_priv->quirks |= QUIRK_INCREASE_DDI_DISABLED_TIME;
    + DRM_INFO("Applying Increase DDI Disabled quirk\n");
    +}
    +
    struct intel_quirk {
    int device;
    int subsystem_vendor;
    @@ -14372,6 +14384,13 @@ static struct intel_quirk intel_quirks[]

    /* Toshiba Satellite P50-C-18C */
    { 0x191B, 0x1179, 0xF840, quirk_increase_t12_delay },
    +
    + /* GeminiLake NUC */
    + { 0x3185, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
    + { 0x3184, 0x8086, 0x2072, quirk_increase_ddi_disabled_time },
    + /* ASRock ITX*/
    + { 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
    + { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },
    };

    static void intel_init_quirks(struct drm_device *dev)
    --- a/drivers/gpu/drm/i915/intel_drv.h
    +++ b/drivers/gpu/drm/i915/intel_drv.h
    @@ -1254,8 +1254,7 @@ void intel_ddi_init(struct drm_i915_priv
    enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder);
    bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe);
    void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state);
    -void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
    - enum transcoder cpu_transcoder);
    +void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state);
    void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state);
    void intel_ddi_disable_pipe_clock(const struct intel_crtc_state *crtc_state);
    struct intel_encoder *

    \
     
     \ /
      Last update: 2018-10-18 20:12    [W:4.366 / U:1.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site