[Intel-gfx] [PATCH 3/6] i830_bind_memory: Use dri_bo_pin under GEM. Pin when ACCEL_NONE.

[Eric Anholt]

On Wed, 2009-07-08 at 13:28 -0700, Keith Packard wrote:
> When running GEM, any buffer objects can only be pinned using dri_bo_pin,
> they shouldn't be pinned through the GART directly.
> 
> Also, when running with KMS but without UXA, make sure frame buffers get
> pinned when allocated so that the screen pixmap can be set at that time.
> 
> Signed-off-by: Keith Packard <keithp at keithp.com>
> ---
>  src/i830_memory.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/i830_memory.c b/src/i830_memory.c
> index 7326744..2393689 100644
> --- a/src/i830_memory.c
> +++ b/src/i830_memory.c
> @@ -202,7 +202,10 @@ i830_bind_memory(ScrnInfoPtr pScrn, i830_memory *mem)
>      if (mem == NULL || mem->bound)
>  	return TRUE;
>  
> -    if (mem->bo != NULL && !pI830->use_drm_mode) {
> +    if (pI830->have_gem && mem->bo != NULL) {
> +	if (pI830->use_drm_mode && pI830->accel != ACCEL_NONE)
> +	    return TRUE;
> +

Binding pixmaps on behalf of KMS is broken, and the init sequence should
be fixed if that's required :P

-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090708/dda357ab/attachment.sig>