summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/display/intel_crt.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2021-12-01 15:57:06 +0200
committerJani Nikula <jani.nikula@intel.com>2021-12-02 13:45:29 +0200
commitf35ed346ef5bb8e5e89802c4dbc8b311693e39f7 (patch)
tree280bf63d68f79ae5f77bc0ecea4ba27823e8996f /drivers/gpu/drm/i915/display/intel_crt.c
parentf2bc4517310c37cfeca606079fbfdd025d35c4fa (diff)
downloadlinux-stable-f35ed346ef5bb8e5e89802c4dbc8b311693e39f7.tar.gz
linux-stable-f35ed346ef5bb8e5e89802c4dbc8b311693e39f7.tar.bz2
linux-stable-f35ed346ef5bb8e5e89802c4dbc8b311693e39f7.zip
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
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_crt.c')
-rw-r--r--drivers/gpu/drm/i915/display/intel_crt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
index 42533e6457b5..6a3893c8ff22 100644
--- a/drivers/gpu/drm/i915/display/intel_crt.c
+++ b/drivers/gpu/drm/i915/display/intel_crt.c
@@ -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 :