1. 22 11月, 2010 1 次提交
    • M
      drm/vblank: Add support for precise vblank timestamping. · 27641c3f
      Mario Kleiner 提交于
      The DRI2 swap & sync implementation needs precise
      vblank counts and precise timestamps corresponding
      to those vblank counts. For conformance to the OpenML
      OML_sync_control extension specification the DRM
      timestamp associated with a vblank count should
      correspond to the start of video scanout of the first
      scanline of the video frame following the vblank
      interval for that vblank count.
      
      Therefore we need to carry around precise timestamps
      for vblanks. Currently the DRM and KMS drivers generate
      timestamps ad-hoc via do_gettimeofday() in some
      places. The resulting timestamps are sometimes not
      very precise due to interrupt handling delays, they
      don't conform to OML_sync_control and some are wrong,
      as they aren't taken synchronized to the vblank.
      
      This patch implements support inside the drm core
      for precise and robust timestamping. It consists
      of the following interrelated pieces.
      
      1. Vblank timestamp caching:
      
      A per-crtc ringbuffer stores the most recent vblank
      timestamps corresponding to vblank counts.
      
      The ringbuffer can be read out lock-free via the
      accessor function:
      
      struct timeval timestamp;
      vblankcount = drm_vblank_count_and_time(dev, crtcid, &timestamp).
      
      The function returns the current vblank count and
      the corresponding timestamp for start of video
      scanout following the vblank interval. It can be
      used anywhere between enclosing drm_vblank_get(dev, crtcid)
      and drm_vblank_put(dev,crtcid) statements. It is used
      inside the drmWaitVblank ioctl and in the vblank event
      queueing and handling. It should be used by kms drivers for
      timestamping of bufferswap completion.
      
      The timestamp ringbuffer is reinitialized each time
      vblank irq's get reenabled in drm_vblank_get()/
      drm_update_vblank_count(). It is invalidated when
      vblank irq's get disabled.
      
      The ringbuffer is updated inside drm_handle_vblank()
      at each vblank irq.
      
      2. Calculation of precise vblank timestamps:
      
      drm_get_last_vbltimestamp() is used to compute the
      timestamp for the end of the most recent vblank (if
      inside active scanout), or the expected end of the
      current vblank interval (if called inside a vblank
      interval). The function calls into a new optional kms
      driver entry point dev->driver->get_vblank_timestamp()
      which is supposed to provide the precise timestamp.
      If a kms driver doesn't implement the entry point or
      if the call fails, a simple do_gettimeofday() timestamp
      is returned as crude approximation of the true vblank time.
      
      A new drm module parameter drm.timestamp_precision_usec
      allows to disable high precision timestamps (if set to
      zero) or to specify the maximum acceptable error in
      the timestamps in microseconds.
      
      Kms drivers could implement their get_vblank_timestamp()
      function in a gpu specific way, as long as returned
      timestamps conform to OML_sync_control, e.g., by use
      of gpu specific hardware timestamps.
      
      Optionally, kms drivers can simply wrap and use the new
      utility function drm_calc_vbltimestamp_from_scanoutpos().
      This function calls a new optional kms driver function
      dev->driver->get_scanout_position() which returns the
      current horizontal and vertical video scanout position
      of the crtc. The scanout position together with the
      drm_display_timing of the current video mode is used
      to calculate elapsed time relative to start of active scanout
      for the current video frame. This elapsed time is subtracted
      from the current do_gettimeofday() time to get the timestamp
      corresponding to start of video scanout. Currently
      non-interlaced, non-doublescan video modes, with or
      without panel scaling are handled correctly. Interlaced/
      doublescan modes are tbd in a future patch.
      
      3. Filtering of redundant vblank irq's and removal of
      some race-conditions in the vblank irq enable/disable path:
      
      Some gpu's (e.g., Radeon R500/R600) send spurious vblank
      irq's outside the vblank if vblank irq's get reenabled.
      These get detected by use of the vblank timestamps and
      filtered out to avoid miscounting of vblanks.
      
      Some race-conditions between the vblank irq enable/disable
      functions, the vblank irq handler and the gpu itself (updating
      its hardware vblank counter in the "wrong" moment) are
      fixed inside vblank_disable_and_save() and
      drm_update_vblank_count() by use of the vblank timestamps and
      a new spinlock dev->vblank_time_lock.
      
      The time until vblank irq disable is now configurable via
      a new drm module parameter drm.vblankoffdelay to allow
      experimentation with timeouts that are much shorter than
      the current 5 seconds and should allow longer vblank off
      periods for better power savings.
      
      Followup patches will use these new functions to
      implement precise timestamping for the intel and radeon
      kms drivers.
      Signed-off-by: NMario Kleiner <mario.kleiner@tuebingen.mpg.de>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      27641c3f
  2. 19 10月, 2010 1 次提交
  3. 06 10月, 2010 1 次提交
  4. 14 9月, 2010 1 次提交
  5. 13 9月, 2010 1 次提交
  6. 10 8月, 2010 2 次提交
  7. 23 7月, 2010 1 次提交
  8. 18 5月, 2010 2 次提交
    • D
      drm/fbdev: fix cloning on fbcon · 1d42bbc8
      Dave Airlie 提交于
      Simple cloning rules compared to server:
      (a) single crtc
      (b) > 1 connector active
      (c) check command line mode
      (d) try and find 1024x768 DMT mode if no command line.
      (e) fail to clone
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      1d42bbc8
    • D
      drm/fbdev: rework output polling to be back in the core. (v4) · eb1f8e4f
      Dave Airlie 提交于
      After thinking it over a lot it made more sense for the core to deal with
      the output polling especially so it can notify X.
      
      v2: drop plans for fake connector - per Michel's comments - fix X patch sent to xorg-devel, add intel polled/hpd setting, add initial nouveau polled/hpd settings.
      
      v3: add config lock take inside polling, add intel/nouveau poll init/fini calls
      
      v4: config lock was a bit agressive, only needed around connector list reading.
      otherwise it could re-enter.
      
      glisse: discard drm_helper_hpd_irq_event
      
      v3: Reviewed-by: Michel Dänzer <michel@daenzer.net>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      eb1f8e4f
  9. 07 4月, 2010 3 次提交
    • D
      drm/kms/fb: separate fbdev connector list from core drm connectors · 0b4c0f3f
      Dave Airlie 提交于
      This breaks the connection between the core drm connector list
      and the fbdev connector usage, and allows them to become disjoint
      in the future. It also removes the untype void* that was in the
      connector struct to support this.
      
      All connectors are added to the fbdev now but this could be
      changed in the future.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      0b4c0f3f
    • D
      drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list · 8be48d92
      Dave Airlie 提交于
      This move to using the list of crtcs in the fb helper and cleans up the
      whole picking code, now we store the crtc/connectors we want directly
      into the modeset and we use the modeset directly to set the mode.
      
      Fixes from James Simmons and Ben Skeggs.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      8be48d92
    • D
      drm/fb: fix fbdev object model + cleanup properly. · 38651674
      Dave Airlie 提交于
      The fbdev layer in the kms code should act like a consumer of the kms services and avoid having relying on information being store in the kms core structures in order for it to work.
      
      This patch
      
      a) removes the info pointer/psuedo palette from the core drm_framebuffer structure and moves it to the fbdev helper layer, it also removes the core drm keeping a list of kernel kms fbdevs.
      b) migrated all the fb helper functions out of the crtc helper file into the fb helper file.
      c) pushed the fb probing/hotplug control into the driver
      d) makes the surface sizes into a structure for ease of passing
      This changes the intel/radeon/nouveau drivers to use the new helper.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      38651674
  10. 06 4月, 2010 2 次提交
    • A
      drm/edid: Add secondary GTF curve support · 7a374350
      Adam Jackson 提交于
      Before CVT-R, some monitors would advertise support for an alternative
      GTF formula with lower blanking intervals.  Correctly identify such
      monitors, and use the alternative formula when generating modes for
      them.
      
      Note that we only do this for "standard" timing descriptors (tuples of
      hsize in characters / aspect ratio / vertical refresh).  Range-based
      mode lists still only refer to the primary GTF curve.  It would be
      possible to do better for the latter case, but monitors are required to
      support the primary curve over the entire advertised range, so all it
      would win you is a lower pixel clock and therefore possibly better image
      quality on analog links.
      Signed-off-by: NAdam Jackson <ajax@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      7a374350
    • A
      drm/edid: Fix secondary block fetch. · 61e57a8d
      Adam Jackson 提交于
      This makes fetching the second EDID block on HDMI monitors actually
      work.  DDC can't transfer more than 128 bytes at a time.  Also,
      rearrange the code so the pure DDC bits are separate from block parse.
      Signed-off-by: NAdam Jackson <ajax@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      61e57a8d
  11. 09 2月, 2010 1 次提交
  12. 04 12月, 2009 2 次提交
  13. 19 11月, 2009 1 次提交
  14. 18 11月, 2009 1 次提交
  15. 06 11月, 2009 1 次提交
  16. 25 9月, 2009 1 次提交
    • D
      drm/kms: start adding command line interface using fb. · d50ba256
      Dave Airlie 提交于
      [note this requires an fb patch posted to linux-fbdev-devel already]
      
      This uses the normal video= command line option to control the kms
      output setup at boot time. It is used to override the autodetection
      done by kms.
      
      video= normally takes a framebuffer as the first parameter, in kms
      it will take a connector name, DVI-I-1, or LVDS-1 etc. If no output
      connector is specified the mode string will apply to all connectors.
      
      The mode specification used will match down the probed modes, and if
      no mode is found it will add a CVT mode that matches.
      
      video=1024x768 - all connectors match a 1024x768 mode or add a CVT on
      video=VGA-1:1024x768, VGA-1 connector gets mode only.
      
      The same strings as used in current fb modedb.c are used, except I've
      added three more letters, e, D, d, e = enable, D = enable Digital,
      d = disable, which allow a connector to be forced into a certain state.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      d50ba256
  17. 07 9月, 2009 1 次提交
  18. 31 8月, 2009 1 次提交
    • D
      drm/kms: move driver specific fb common code to helper functions (v2) · 785b93ef
      Dave Airlie 提交于
      Initially I always meant this code to be shared, but things
      ran away from me before I got to it.
      
      This refactors the i915 and radeon kms fbdev interaction layers
      out into generic helpers + driver specific pieces.
      
      It moves all the panic/sysrq enhancements to the core file,
      and stores a linked list of kernel fbs. This could possibly be
      improved to only store the fb which has fbcon on it for panics
      etc.
      
      radeon retains some specific codes used for a big endian
      workaround.
      
      changes:
      fix oops in v1
      fix freeing path for crtc_info
      Reviewed-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      785b93ef
  19. 13 8月, 2009 1 次提交
  20. 04 8月, 2009 1 次提交
  21. 15 7月, 2009 2 次提交
  22. 04 6月, 2009 1 次提交
    • K
      drm: Hook up DPMS property handling in drm_crtc.c. Add drm_helper_connector_dpms. · c9fb15f6
      Keith Packard 提交于
      Making the drm_crtc.c code recognize the DPMS property and invoke the
      connector->dpms function doesn't remove any capability from the driver while
      reducing code duplication.
      
      That just highlighted the problem with the existing DPMS functions which
      could turn off the connector, but failed to turn off any relevant crtcs. The
      new drm_helper_connector_dpms function manages all of that, using the
      drm_helper-specific crtc and encoder dpms functions, automatically computing
      the appropriate DPMS level for each object in the system.
      
      This fixes the current troubles in the i915 driver which left PLLs, pipes
      and planes running while in DPMS_OFF mode or even while they were unused.
      Signed-off-by: NKeith Packard <keithp@keithp.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      c9fb15f6
  23. 29 3月, 2009 2 次提交
    • M
      drm: detect hdmi monitor by hdmi identifier (v3) · f23c20c8
      Ma Ling 提交于
      Sometime we need to communicate with HDMI monitor by sending audio or video
      info frame, so we have to know monitor type. However if user utilize HDMI-DVI adapter to connect DVI monitor, hardware detection will incorrectly show the monitor is HDMI. HDMI spec tell us that any device containing IEEE registration Identifier will be treated as HDMI device.  The patch intends to detect HDMI monitor by this rule.
      Signed-off-by: NMa Ling <ling.ma@intel.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      f23c20c8
    • M
      drm: read EDID extensions from monitor · 167f3a04
      Ma Ling 提交于
      Usually drm read basic EDID, that is enough for us, but since igital display
      were introduced i.e. HDMI monitor, sometime we need to interact with monitor by
      EDID extension information,
      
      EDID extensions include audio/video data block, speaker allocation and vendor specific data blocks.
      
      This patch intends to read EDID extensions from digital monitor for users.
      Signed-off-by: NMa Ling <ling.ma@intel.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      167f3a04
  24. 13 3月, 2009 1 次提交
  25. 20 2月, 2009 1 次提交
  26. 22 1月, 2009 1 次提交
    • J
      drm: create mode_config idr lock · ad2563c2
      Jesse Barnes 提交于
      Create a separate mode_config IDR lock for simplicity.  The core DRM
      config structures (connector, mode, etc. lists) are still protected by
      the mode_config mutex, but the CRTC IDR (used for the various identifier
      IDs) is now protected by the mode_config idr_mutex.  Simplifies the
      locking a bit and removes a warning.
      
      All objects are protected by the config mutex, we may in the future,
      split the object further to have reference counts.
      Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      ad2563c2
  27. 16 1月, 2009 1 次提交
    • J
      drm: initial KMS config fixes · 40a518d9
      Jesse Barnes 提交于
      When mode setting is first initialized, the driver will call into
      drm_helper_initial_config() to set up an initial output and framebuffer
      configuration.  This routine is responsible for probing the available
      connectors, encoders, and crtcs, looking for modes and putting together
      something reasonable (where reasonable is defined as "allows kernel
      messages to be visible on as many displays as possible").
      
      However, the code was a bit too aggressive in setting default modes when
      none were found on a given connector.  Even if some connectors had modes,
      any connectors found lacking modes would have the default 800x600 mode added
      to their mode list, which in some cases could cause problems later down the
      line.  In my case, the LVDS was perfectly available, but the initial config
      code added 800x600 modes to both of the detected but unavailable HDMI
      connectors (which are on my non-existent docking station).  This ended up
      preventing later code from setting a mode on my LVDS, which is bad.
      
      This patch fixes that behavior by making the initial config code walk
      through the connectors first, counting the available modes, before it decides
      to add any default modes to a possibly connected output.  It also fixes the
      logic in drm_target_preferred() that was causing zeroed out modes to be set
      as the preferred mode for a given connector, even if no modes were available.
      Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      Signed-off-by: NDave Airlie <airlied@linux.ie>
      40a518d9
  28. 29 12月, 2008 3 次提交
    • K
      drm: drop DRM_IOCTL_MODE_REPLACEFB, add+remove works just as well. · 0c7c2664
      Kristian H�gsberg 提交于
      The replace fb ioctl replaces the backing buffer object for a modesetting
      framebuffer object.  This can be acheived by just creating a new
      framebuffer backed by the new buffer object, setting that for the crtcs
      in question and then removing the old framebuffer object.
      Signed-off-by: NKristian Hogsberg <krh@redhat.com>
      Acked-by: NJakob Bornecrantz <jakob@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      0c7c2664
    • J
      drm: sanitise drm modesetting API + remove unused hotplug · e0c8463a
      Jakob Bornecrantz 提交于
      The initially merged modesetting API has some uglies in it, this
      cleans up the struct members and ioctl ordering for initial submission.
      
      It also removes the unneeded hotplug infrastructure.
      
      airlied:- I've pulled this patch in from git modesetting-gem tree.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e0c8463a
    • D
      DRM: add mode setting support · f453ba04
      Dave Airlie 提交于
      Add mode setting support to the DRM layer.
      
      This is a fairly big chunk of work that allows DRM drivers to provide
      full output control and configuration capabilities to userspace.  It was
      motivated by several factors:
        - the fb layer's APIs aren't suited for anything but simple
          configurations
        - coordination between the fb layer, DRM layer, and various userspace
          drivers is poor to non-existent (radeonfb excepted)
        - user level mode setting drivers makes displaying panic & oops
          messages more difficult
        - suspend/resume of graphics state is possible in many more
          configurations with kernel level support
      
      This commit just adds the core DRM part of the mode setting APIs.
      Driver specific commits using these new structure and APIs will follow.
      
      Co-authors: Jesse Barnes <jbarnes@virtuousgeek.org>, Jakob Bornecrantz <jakob@tungstengraphics.com>
      Contributors: Alan Hourihane <alanh@tungstengraphics.com>, Maarten Maathuis <madman2003@gmail.com>
      Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NEric Anholt <eric@anholt.net>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      f453ba04