Commit b1f9bc3d authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Include need_vlv_dsi_wa in intel_vblank_evade_ctx

Pull the need_vlv_dsi_wa details into intel_vblank_evade_init()
so that caller doesn't have to care about it.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231213102519.13500-5-ville.syrjala@linux.intel.comReviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
parent 637bda52
...@@ -473,6 +473,7 @@ static int intel_mode_vblank_start(const struct drm_display_mode *mode) ...@@ -473,6 +473,7 @@ static int intel_mode_vblank_start(const struct drm_display_mode *mode)
struct intel_vblank_evade_ctx { struct intel_vblank_evade_ctx {
int min, max, vblank_start; int min, max, vblank_start;
bool need_vlv_dsi_wa;
}; };
static void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state, static void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_state,
...@@ -480,9 +481,13 @@ static void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_stat ...@@ -480,9 +481,13 @@ static void intel_vblank_evade_init(const struct intel_crtc_state *old_crtc_stat
struct intel_vblank_evade_ctx *evade) struct intel_vblank_evade_ctx *evade)
{ {
struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc); struct intel_crtc *crtc = to_intel_crtc(new_crtc_state->uapi.crtc);
struct drm_i915_private *i915 = to_i915(crtc->base.dev);
const struct intel_crtc_state *crtc_state; const struct intel_crtc_state *crtc_state;
const struct drm_display_mode *adjusted_mode; const struct drm_display_mode *adjusted_mode;
evade->need_vlv_dsi_wa = (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) &&
intel_crtc_has_type(new_crtc_state, INTEL_OUTPUT_DSI);
/* /*
* During fastsets/etc. the transcoder is still * During fastsets/etc. the transcoder is still
* running with the old timings at this point. * running with the old timings at this point.
...@@ -550,8 +555,6 @@ void intel_pipe_update_start(struct intel_atomic_state *state, ...@@ -550,8 +555,6 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
long timeout = msecs_to_jiffies_timeout(1); long timeout = msecs_to_jiffies_timeout(1);
int scanline; int scanline;
wait_queue_head_t *wq = drm_crtc_vblank_waitqueue(&crtc->base); wait_queue_head_t *wq = drm_crtc_vblank_waitqueue(&crtc->base);
bool need_vlv_dsi_wa = (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) &&
intel_crtc_has_type(new_crtc_state, INTEL_OUTPUT_DSI);
struct intel_vblank_evade_ctx evade; struct intel_vblank_evade_ctx evade;
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
...@@ -633,7 +636,7 @@ void intel_pipe_update_start(struct intel_atomic_state *state, ...@@ -633,7 +636,7 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
* *
* FIXME figure out if BXT+ DSI suffers from this as well * FIXME figure out if BXT+ DSI suffers from this as well
*/ */
while (need_vlv_dsi_wa && scanline == evade.vblank_start) while (evade.need_vlv_dsi_wa && scanline == evade.vblank_start)
scanline = intel_get_crtc_scanline(crtc); scanline = intel_get_crtc_scanline(crtc);
drm_crtc_vblank_put(&crtc->base); drm_crtc_vblank_put(&crtc->base);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment