1. 02 6月, 2014 13 次提交
  2. 30 5月, 2014 3 次提交
  3. 27 5月, 2014 8 次提交
  4. 26 5月, 2014 4 次提交
  5. 23 5月, 2014 1 次提交
  6. 19 5月, 2014 7 次提交
  7. 16 5月, 2014 2 次提交
    • D
      Merge tag 'topic/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel into drm-next · 425a9a3a
      Dave Airlie 提交于
      Update pull request with drm core patches. Mostly some polish for the
      primary plane stuff and a pile of patches all over from Thierry. Has
      survived a few days in drm-intel-nightly without causing ill.
      
      I've frobbed my scripts a bit to also tag my topic branches so that you
      have something stable to pull - I've accidentally pushed a bunch more
      patches onto this branch before you've taken the old pull request.
      
      * tag 'topic/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel:
        drm: Make drm_crtc_helper_disable() return void
        drm: Fix indentation of closing brace
        drm/dp: Fix typo in comment
        drm: Fixup flip-work kerneldoc
        drm/fb: Fix typos
        drm/edid: Cleanup kerneldoc
        drm/edid: Drop revision argument for drm_mode_std()
        drm: Try to acquire modeset lock on panic or sysrq
        drm: remove unused argument from drm_open_helper
        drm: Handle ->disable_plane failures correctly
        drm: Simplify fb refcounting rules around ->update_plane
        drm/crtc-helper: gc usless connector loop in disable_unused_functions
        drm/plane_helper: don't disable plane in destroy function
        drm/plane-helper: Fix primary plane scaling check
        drm: make mode_valid callback optional
        drm/edid: Fill PAR in AVI infoframe based on CEA mode list
      425a9a3a
    • D
      drm: fix memory leak around mode_group (v2) · ad222799
      Dave Airlie 提交于
      This mode group id_list was never being freed.
      
      v2: take David's suggestion to free in minor_free.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      ad222799
  8. 06 5月, 2014 2 次提交
    • V
      drm/i915: Remove useless checks from primary enable/disable · 10efa932
      Ville Syrjälä 提交于
      We won't be calling intel_enable_primary_plane() or
      intel_disable_primary_plane() with the primary plane in the
      wrong state. So remove the useless DISPLAY_PLANE_ENABLE checks.
      
      v2: Convert the checks to WARNs instead (Daniel,Paulo)
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      10efa932
    • V
      drm/i915: Merge LP1+ watermarks in safer way · d52fea5b
      Ville Syrjälä 提交于
      On ILK when we disable a particular watermark level, we must
      maintain the actual watermark values for that level for some time
      (until the next vblank possibly). Otherwise we risk underruns.
      
      In order to achieve that result we must merge the LP1+ watermarks a
      bit differently since we must also merge levels that are to be
      disabled. We must also make sure we don't overflow the fields in the
      watermark registers in case the calculated watermarks come out too
      big to fit.
      
      As early as possbile we mark all computed watermark levels as
      disabled if they would exceed the register maximums. We make sure
      to leave the actual watermarks for such levels zeroed out. Then during
      merging, we take the maxium values for every level, regardless if
      they're disabled or not. That may seem a bit pointless since at the
      moment all the watermark levels we merge should have their values
      zeroed if the level is already disabled. However soon we will be
      dealing with intermediate watermarks that, in addition to the new
      watermark values, also contain the previous watermark values, and so
      levels that are disabled may no longer be zeroed out.
      
      v2: Split the patch in two (Paulo)
          Use if() instead of & when merging ->enable (Paulo)
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      [danvet: Fix commit message as noted by Paulo.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      d52fea5b