On Tue, 2009-09-15 at 22:57 +0200, Daniel Vetter wrote: > Hi all, > > Latest version of my overlay kms work. I've added the new stuff as separated > patches for easier testing in case something blows up. > > Please review. > > Thanks, Daniel > > Daniel Vetter (8): > [drm]: make drm_mode_object_find typesafe > [drm/i915]: add i915_lp_ring_sync helper > [drm/i915]: kill superflous IS_I855 macro > [drm/i915] implement drmmode overlay support v4 > [drm/i915] fully switch off overlay when not in use > [drm/i915] implement fastpath for overlay flip waiting > [drm/i915] implement interruptible sleeps in the overlay code > [drm/i915] kill i915_lp_ring_sync OK, I've finally pulled this for -next, with a bit of hand resolving of conflicts. I debated, because of the somewhat unusual series of adding the ring sync, implementing, fixing the ring sync use, then removing ring sync. Often, that sort of stuff gets flattened out in the commit history. However, in this case I think it's OK as overlays are touchy and bisectability for "is the interruptible stuff working correctly" may prove useful.
Then I noticed that you'd told me that there was newer stuff in your gitorious tree. Only, that stuff claims to be older (v3), and doesn't have some of the patches above. So I've pushed my merge to drm-overlay of my tree for review -- is it what you think should land? > drivers/gpu/drm/drm_crtc.c | 3 +- > drivers/gpu/drm/i915/Makefile | 1 + > drivers/gpu/drm/i915/i915_dma.c | 7 + > drivers/gpu/drm/i915/i915_drv.h | 8 +- > drivers/gpu/drm/i915/i915_gem.c | 37 +- > drivers/gpu/drm/i915/i915_reg.h | 5 + > drivers/gpu/drm/i915/intel_display.c | 45 +- > drivers/gpu/drm/i915/intel_drv.h | 39 + > drivers/gpu/drm/i915/intel_overlay.c | 1420 > ++++++++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 3 +- > include/drm/drm_os_linux.h | 2 +- > include/drm/i915_drm.h | 71 ++ > 12 files changed, 1620 insertions(+), 21 deletions(-) > create mode 100644 drivers/gpu/drm/i915/intel_overlay.c > > _______________________________________________ > Intel-gfx mailing list > intel-...@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Eric Anholt e...@anholt.net eric.anh...@intel.com
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ Come build with us! The BlackBerry® Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9-12, 2009. Register now! http://p.sf.net/sfu/devconf
-- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel