Skip to contentSkip to conversation

drm vblank timestamping changes

GIT PULL Ville Syrjälä 1 participant 1 message Jan 20, 2014

lore
Share & tools
lore
#0 lore raw

Hi Dave,

Here's the vblank timestamp pull request you wanted.

I addressed the few bugs that Mario pointed out and added the r-bs.

As it has been a while since I made the changes, I gave it a quick spin on a few different i915 machines. Fortunately everything still seems to be fine.

The following changes since commit cfd72a4c2089aa3938f37281a34d6eb3306d5fd8:

Merge branch 'drm-intel-next' of git://people.freedesktop.org/~danvet/drm-intel into drm-next (2014-01-20 10:21:54 +1000)

are available in the git repository at:

git://gitorious.org/vsyrjala/linux.git drm-vbl-timestamp

for you to fetch changes up to 095163bad59bfeed294a81e0d873fa8943e4fa01:

drm/i915: Add a kludge for DSL incrementing too late and ISR not working (2014-01-20 12:21:36 +0200)

----------------------------------------------------------------
Ville Syrjälä (14):
drm: Pass the display mode to drm_calc_timestamping_constants()
drm: Pass the display mode to drm_calc_vbltimestamp_from_scanoutpos() drm/i915: Kill hwmode save/restore
drm/i915: Call drm_calc_timestamping_constants() earlier
drm: Improve drm_calc_timestamping_constants() documentation
drm: Simplify the math in drm_calc_timestamping_constants() drm/radeon: Populate crtc_clock in radeon_atom_get_tv_timings()
drm: Use crtc_clock in drm_calc_timestamping_constants()
drm: Change {pixel,line,frame}dur_ns from s64 to int
drm/i915: Fix scanoutpos calculations for interlaced modes
drm: Fix vblank timestamping constants for interlaced modes
drm: Pass 'flags' from the caller to .get_scanout_position() drm/radeon: Move the early vblank IRQ fixup to radeon_get_crtc_scanoutpos() drm/i915: Add a kludge for DSL incrementing too late and ISR not working

 drivers/gpu/drm/drm_crtc_helper.c        |   2 +-
 drivers/gpu/drm/drm_irq.c                | 109 ++++++++++++-------------------
 drivers/gpu/drm/i915/i915_irq.c          |  91 ++++++++++++++------------
 drivers/gpu/drm/i915/intel_display.c     |  29 ++++----
 drivers/gpu/drm/radeon/radeon_atombios.c |   6 +-
 drivers/gpu/drm/radeon/radeon_display.c  |  29 +++++++-
 drivers/gpu/drm/radeon/radeon_drv.c      |   1 +
 drivers/gpu/drm/radeon/radeon_kms.c      |   2 +-
 drivers/gpu/drm/radeon/radeon_mode.h     |   1 +
 drivers/gpu/drm/radeon/radeon_pm.c       |   2 +-
 include/drm/drmP.h                       |   8 ++-
 include/drm/drm_crtc.h                   |   2 +-
 12 files changed, 144 insertions(+), 138 deletions(-)
Signature · 2 lines
Ville Syrjälä
Intel OTC