Hi Linus,
Please pull the 'drm-linus' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-linus
These are some fixups to the TTM API required to pull the nouveau and vmware
drivers into staging, along with a typo in radeon code.
Dave.
drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
drivers/gpu/drm/radeon/radeon_object.c | 39 ++-------
drivers/gpu/drm/ttm/ttm_bo.c | 134 ++++++++++++++-----------------
include/drm/ttm/ttm_bo_api.h | 63 +++++++--------
4 files changed, 101 insertions(+), 137 deletions(-)
commit d1ede145cea25c5b6d2ebb19b167af14e374bb45
Author: Ben Skeggs <bske...@redhat.com>
Date: Fri Dec 11 15:13:00 2009 +1000
drm/ttm: export some functions useful to drivers using ttm
These are functions required by nouveau which will be merged later.
Signed-off-by: Ben Skeggs <bske...@redhat.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
commit 9062fa6612958f35f41379425bcae9c9b4ccd68e
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Wed Dec 9 19:38:58 2009 -0500
drm/radeon/kms/avivo: fix typo in new_pll module description
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
commit 1fb107fc46692a000533da3d6904ac28b6b3148d
Author: Jerome Glisse <jgli...@redhat.com>
Date: Thu Dec 10 17:16:28 2009 +0100
drm/radeon/kms: Convert radeon to new ttm_bo_init
Now bo init use placement structure like bo validation does.
Signed-off-by: Jerome Glisse <jgli...@redhat.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
commit 09855acb1c2e3779f25317ec9a8ffe1b1784a4a8
Author: Jerome Glisse <jgli...@redhat.com>
Date: Thu Dec 10 17:16:27 2009 +0100
drm/ttm: Convert ttm_buffer_object_init to use ttm_placement
Convert ttm_buffer_object_init to use struct ttm_placement and
rename to ttm_bo_init for consistency with function naming. This
allow to give more complex placement at buffer creation. For
instance you ask to allocate bo into vram first but if there is
not enough vram you can give system as a second possible
placement. It also allow to create buffer in a specific range.
Also rename ttm_buffer_object_validate to ttm_bo_validate.
Signed-off-by: Jerome Glisse <jgli...@redhat.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
