1. 24 9月, 2012 1 次提交
  2. 20 9月, 2012 35 次提交
  3. 19 9月, 2012 3 次提交
    • D
      Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 7facf166
      Dave Airlie 提交于
      Daniel writes:
      "The big ticket item here is the new i915 modeset infrastructure.
      Shockingly it didn't not blow up all over the place (i.e. I've managed to
      fix the ugly issues before merging). 1-2 smaller corner cases broke, but
      we have patches. Also, there's tons of patches on top of this that clean
      out cruft and fix a few bugs that couldn't be fixed with the crtc helper
      based stuff. So more stuff to come ;-)
      
      Also a few other things:
      - Tiny fix in the fb helper to go through the official dpms interface
        instead of calling the crtc helper code.
      - forcewake code frobbery from Ben, code should be more in-line with
        what Windows does now.
      - fixes for the render ring flush on hsw (Paulo)
      - gpu frequency tracepoint
      - vlv forcewake changes to better align it with our understanding of the
        forcewake magic.
      - a few smaller cleanups"
      
      + 2 fixes.
      
      * 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel: (78 commits)
        drm/i915: fix OOPS in lid_notify
        drm/i915: correctly update crtc->x/y in set_base
        drm/fb helper: don't call drm_helper_connector_dpms directly
        drm/i915: improve modeset state checking after dpms calls
        drm/i915: add tons of modeset state checks
        drm/i915: no longer call drm_helper_resume_force_mode
        drm/i915: disable all crtcs at suspend time
        drm/i915: push commit_output_state past the crtc/encoder preparing
        drm/i915: switch the load detect code to the staged modeset config
        drm/i915: WARN if the pipe won't turn off
        drm/i915: s/intel_encoder_disable/intel_encoder_noop
        drm/i915: push commit_output_state past crtc disabling
        drm/i915: implement new set_mode code flow
        drm/i915: compute masks of crtcs affected in set_mode
        drm/i915: use staged outuput config in lvds->mode_fixup
        drm/i915: use staged outuput config in tv->mode_fixup
        drm/i915: extract adjusted mode computation
        drm/i915: move output commit and crtc disabling into set_mode
        drm/i915: remove crtc disabling special case
        drm/i915: push crtc->fb update into pipe_set_base
        ...
      7facf166
    • D
      drm: micro optimise cache flushing · 87229ad9
      Dave Airlie 提交于
      We hit this a lot with i915 and although we'd like to engineer things to hit
      it a lot less, this commit at least makes it consume a few less cycles.
      
      from something containing
      movzwl 0x0(%rip),%r10d
      to
      add    %r8,%rdx
      
      I only noticed it while using perf to profile something else.
      Reviewed-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      87229ad9
    • D
      Merge branch 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev into drm-next · f2032d41
      Dave Airlie 提交于
      Laurent writes:
      
      The SH Mobile DRM driver is now (in my opinion) ready for mainline. It
      requires GEM and KMS/FB helpers that have been reviewed on the list and
      tested. Sascha is waiting for them to reach your tree to send a pull request
      for another new driver.
      
      * 'drm-lcdc' of git://linuxtv.org/pinchartl/fbdev:
        drm: Renesas SH Mobile DRM driver
        drm: Add NV24 and NV42 pixel formats
        DRM: Add DRM KMS/FB CMA helper
        DRM: Add DRM GEM CMA helper
        drm/edid: limit printk when facing bad edid
      f2032d41
  4. 18 9月, 2012 1 次提交