[PATCH 00/11] [resend] drm core and radeon patches for -next
Daniel Vetter
daniel.vetter at ffwll.ch
Fri Feb 18 08:59:10 PST 2011
Hi Dave,
Here are the patches I've talked about on irc for .39.
Patches 1-5 is the "make drm_mm_node embeddable" series. Just the drm core
part, without the patches for i915 (they need to be redone). Chris
Wilson very much likes what these will to do drm/i915. Thomas Hellstrom
cautioned not to go crazy and embed drm_mm_node everywhere (especially in
ttm_bo_object), because the drm_mm allocator is not adequate everwhere and
embedding might just create future obstacles for the Right Thing. Like
switching to idr, as vmgfx already has already done for a few things.
Patches 6-8 embed the gem bo object into the radeon bo object. Changes
since first submission:
- Resolve conflict with pageflip code (resulted in a null-pointer deref).
- Align bo size to PAGE_SIZE (the r600/evergreen kms blit code didn't do
this, upsetting the more paranoid gem code).
Patches 9-11 finish my radeon asic header cleanup that I've started a while
back. Reviewed by Alex Deucher, I've dropped the 3 small patches he
objected.
Tested on my usual array of machines (which now also includes an HD5750 and
a HD 4350 and a g73 from nvidia ;).
Please review and consider merging for next.
Thanks, Daniel
Daniel Vetter (11):
drm/nouveau: don't munge in drm_mm internals
drm: mm: track free areas implicitly
drm: mm: extract node insert helper functions
drm: mm: add api for embedding struct drm_mm_node
drm: mm: add helper to unwind scan state
drm/radeon: embed struct drm_gem_object
drm/radeon: introduce gem_to_radeon_bo helper
drm/radeon: kill radeon_bo->gobj pointer
radeon: consolidate asic-specific function decls for r600 & later
radeon: kill decls for inline functions
radeon: move blit functions to radeon_asic.h
drivers/gpu/drm/drm_mm.c | 570 +++++++++++++++------------
drivers/gpu/drm/nouveau/nouveau_object.c | 2 +-
drivers/gpu/drm/nouveau/nv50_instmem.c | 4 +-
drivers/gpu/drm/nouveau/nvc0_instmem.c | 2 +-
drivers/gpu/drm/radeon/atombios_crtc.c | 8 +-
drivers/gpu/drm/radeon/evergreen_blit_kms.c | 2 +-
drivers/gpu/drm/radeon/r600.c | 2 +-
drivers/gpu/drm/radeon/r600_audio.c | 1 +
drivers/gpu/drm/radeon/r600_blit_kms.c | 2 +-
drivers/gpu/drm/radeon/r600_hdmi.c | 1 +
drivers/gpu/drm/radeon/radeon.h | 77 +----
drivers/gpu/drm/radeon/radeon_asic.h | 77 +++-
drivers/gpu/drm/radeon/radeon_benchmark.c | 4 +-
drivers/gpu/drm/radeon/radeon_cs.c | 2 +-
drivers/gpu/drm/radeon/radeon_device.c | 4 +-
drivers/gpu/drm/radeon/radeon_display.c | 4 +-
drivers/gpu/drm/radeon/radeon_fb.c | 10 +-
drivers/gpu/drm/radeon/radeon_gart.c | 2 +-
drivers/gpu/drm/radeon/radeon_gem.c | 43 +--
drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +-
drivers/gpu/drm/radeon/radeon_object.c | 28 +-
drivers/gpu/drm/radeon/radeon_object.h | 7 +-
drivers/gpu/drm/radeon/radeon_ring.c | 4 +-
drivers/gpu/drm/radeon/radeon_test.c | 4 +-
drivers/gpu/drm/radeon/radeon_ttm.c | 2 +-
drivers/gpu/drm/radeon/rv770.c | 2 +-
include/drm/drm_mm.h | 49 ++-
27 files changed, 493 insertions(+), 424 deletions(-)
--
1.7.2.3
More information about the dri-devel
mailing list