mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
drm/vblank: Consistent drm_crtc_ prefix
We use drm_crtc_ for all the new-style vblank functions which directly take a struct drm_crtc *. drm_accurate_vblank_count was the odd one out, correct this to appease my OCD. Acked-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-13-daniel.vetter@ffwll.ch
This commit is contained in:
parent
b6dcaaac44
commit
ca814b2553
@ -294,7 +294,7 @@ static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_accurate_vblank_count - retrieve the master vblank counter
|
||||
* drm_crtc_accurate_vblank_count - retrieve the master vblank counter
|
||||
* @crtc: which counter to retrieve
|
||||
*
|
||||
* This function is similar to drm_crtc_vblank_count() but this function
|
||||
@ -304,7 +304,7 @@ static u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe)
|
||||
* This is mostly useful for hardware that can obtain the scanout position, but
|
||||
* doesn't have a hardware frame counter.
|
||||
*/
|
||||
u32 drm_accurate_vblank_count(struct drm_crtc *crtc)
|
||||
u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc)
|
||||
{
|
||||
struct drm_device *dev = crtc->dev;
|
||||
unsigned int pipe = drm_crtc_index(crtc);
|
||||
@ -323,7 +323,7 @@ u32 drm_accurate_vblank_count(struct drm_crtc *crtc)
|
||||
|
||||
return vblank;
|
||||
}
|
||||
EXPORT_SYMBOL(drm_accurate_vblank_count);
|
||||
EXPORT_SYMBOL(drm_crtc_accurate_vblank_count);
|
||||
|
||||
static void __disable_vblank(struct drm_device *dev, unsigned int pipe)
|
||||
{
|
||||
@ -772,7 +772,7 @@ drm_get_last_vbltimestamp(struct drm_device *dev, unsigned int pipe,
|
||||
* vblank events since the system was booted, including lost events due to
|
||||
* modesetting activity. Note that this timer isn't correct against a racing
|
||||
* vblank interrupt (since it only reports the software vblank counter), see
|
||||
* drm_accurate_vblank_count() for such use-cases.
|
||||
* drm_crtc_accurate_vblank_count() for such use-cases.
|
||||
*
|
||||
* Returns:
|
||||
* The software vblank counter.
|
||||
|
@ -1601,7 +1601,7 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,
|
||||
crcs[3] = crc3;
|
||||
crcs[4] = crc4;
|
||||
drm_crtc_add_crc_entry(&crtc->base, true,
|
||||
drm_accurate_vblank_count(&crtc->base),
|
||||
drm_crtc_accurate_vblank_count(&crtc->base),
|
||||
crcs);
|
||||
}
|
||||
}
|
||||
|
@ -12566,7 +12566,7 @@ u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)
|
||||
struct drm_device *dev = crtc->base.dev;
|
||||
|
||||
if (!dev->max_vblank_count)
|
||||
return drm_accurate_vblank_count(&crtc->base);
|
||||
return drm_crtc_accurate_vblank_count(&crtc->base);
|
||||
|
||||
return dev->driver->get_vblank_counter(dev, crtc->pipe);
|
||||
}
|
||||
|
@ -4032,7 +4032,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
|
||||
if (crtc->state->event) {
|
||||
unsigned long flags;
|
||||
/* Get correct count/ts if racing with vblank irq */
|
||||
drm_accurate_vblank_count(crtc);
|
||||
drm_crtc_accurate_vblank_count(crtc);
|
||||
spin_lock_irqsave(&crtc->dev->event_lock, flags);
|
||||
drm_crtc_send_vblank_event(crtc, crtc->state->event);
|
||||
spin_unlock_irqrestore(&crtc->dev->event_lock, flags);
|
||||
|
@ -169,7 +169,7 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc);
|
||||
void drm_crtc_vblank_reset(struct drm_crtc *crtc);
|
||||
void drm_crtc_vblank_on(struct drm_crtc *crtc);
|
||||
void drm_vblank_cleanup(struct drm_device *dev);
|
||||
u32 drm_accurate_vblank_count(struct drm_crtc *crtc);
|
||||
u32 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc);
|
||||
|
||||
bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev,
|
||||
unsigned int pipe, int *max_error,
|
||||
|
Loading…
Reference in New Issue
Block a user