mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
drm/i915/display: remove intel_wait_for_vblank()
There are only three call sites remaining for intel_wait_for_vblank(). Remove the function, and open code it to avoid new users from showing up. v2: - Use intel_crtc_wait_for_next_vblank() (Ville) Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/aabcda1208072a732d7796e6dacce37dca9bb843.1638366969.git.jani.nikula@intel.com
This commit is contained in:
parent
f2bc451731
commit
f35ed346ef
4 changed files with 8 additions and 12 deletions
|
@ -1690,7 +1690,7 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
|
|||
intel_de_write(dev_priv, CDCLK_CTL, val);
|
||||
|
||||
if (pipe != INVALID_PIPE)
|
||||
intel_wait_for_vblank(dev_priv, pipe);
|
||||
intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(dev_priv, pipe));
|
||||
|
||||
if (DISPLAY_VER(dev_priv) >= 11) {
|
||||
ret = sandybridge_pcode_write(dev_priv, SKL_PCODE_CDCLK_CONTROL,
|
||||
|
|
|
@ -721,7 +721,7 @@ intel_crt_load_detect(struct intel_crt *crt, u32 pipe)
|
|||
intel_uncore_posting_read(uncore, pipeconf_reg);
|
||||
/* Wait for next Vblank to substitue
|
||||
* border color for Color info */
|
||||
intel_wait_for_vblank(dev_priv, pipe);
|
||||
intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(dev_priv, pipe));
|
||||
st00 = intel_uncore_read8(uncore, _VGA_MSR_WRITE);
|
||||
status = ((st00 & (1 << 4)) != 0) ?
|
||||
connector_status_connected :
|
||||
|
|
|
@ -2101,8 +2101,12 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
|
|||
* to change the workaround. */
|
||||
hsw_workaround_pipe = new_crtc_state->hsw_workaround_pipe;
|
||||
if (IS_HASWELL(dev_priv) && hsw_workaround_pipe != INVALID_PIPE) {
|
||||
intel_wait_for_vblank(dev_priv, hsw_workaround_pipe);
|
||||
intel_wait_for_vblank(dev_priv, hsw_workaround_pipe);
|
||||
struct intel_crtc *wa_crtc;
|
||||
|
||||
wa_crtc = intel_crtc_for_pipe(dev_priv, hsw_workaround_pipe);
|
||||
|
||||
intel_crtc_wait_for_next_vblank(wa_crtc);
|
||||
intel_crtc_wait_for_next_vblank(wa_crtc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2025,14 +2025,6 @@ intel_crtc_wait_for_next_vblank(struct intel_crtc *crtc)
|
|||
drm_crtc_wait_one_vblank(&crtc->base);
|
||||
}
|
||||
|
||||
static inline void
|
||||
intel_wait_for_vblank(struct drm_i915_private *dev_priv, enum pipe pipe)
|
||||
{
|
||||
struct intel_crtc *crtc = intel_crtc_for_pipe(dev_priv, pipe);
|
||||
|
||||
intel_crtc_wait_for_next_vblank(crtc);
|
||||
}
|
||||
|
||||
static inline void
|
||||
intel_wait_for_vblank_if_active(struct drm_i915_private *dev_priv, enum pipe pipe)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue