diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-30 12:40:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-30 12:40:53 -0700 |
| commit | 986d46144b183a36b4e98aed95eca0c55a8b4251 (patch) | |
| tree | 2c82ce4ec7e20d85a04b6e659716fdf6604f9985 /hw/xfree86/common | |
| parent | a974c8e7cba40c8d7d1b91e07de8c414627b71a2 (diff) | |
| parent | b5b8f91b82d7b150c926dd3fecee6c3aafff6e39 (diff) | |
Merge remote branch 'jamey/for-keith'
Conflicts:
hw/xfree86/common/xf86xv.c
Diffstat (limited to 'hw/xfree86/common')
| -rw-r--r-- | hw/xfree86/common/xf86xv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 1503502b5..2cc2f6093 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -197,6 +197,9 @@ xf86XVRegisterOffscreenImages( int num ){ OffscreenImageRec *OffscreenImage; + /* This function may be called before xf86XVScreenInit, so there's + * no better place than this to call dixRequestPrivate to ensure we + * have space reserved. After the first call it is a no-op. */ if(!dixRequestPrivate(OffscreenPrivateKey, sizeof(OffscreenImageRec)) || !(OffscreenImage = GetOffscreenImage(pScreen))) /* Every X.org driver assumes this function always succeeds, so |