[Intel-gfx] [PATCH] Make DGA optional

[Zhenyu Wang]

On 2009.09.15 15:07:16 +0800, Jin, Gordon wrote:
> Zhenyu Wang wrote on Tuesday, September 15, 2009 10:26 AM:
> > On 2009.09.02 22:57:33 +0800, Zhenyu Wang wrote:
> >> As DGA is optional in xserver, we should check this too instead
> >> of always trying to init DGA.
> >> 
> >> Found when update xserver to
> >> 6fffcd5825454a7fe58ffbcfb219f007cf38e731, 
> >> but not update xf86dgaproto, which caused X fails to start.
> >> 
> >> Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com> ---
> >>  src/i810_driver.c |    2 ++
> >>  src/i830_driver.c |    5 ++++-
> >>  2 files changed, 6 insertions(+), 1 deletions(-)
> >> 
> >> diff --git a/src/i810_driver.c b/src/i810_driver.c
> >> index a08a500..7961c3d 100644
> >> --- a/src/i810_driver.c
> >> +++ b/src/i810_driver.c
> >> @@ -2024,7 +2024,9 @@ I810ScreenInit(int scrnIndex, ScreenPtr
> >>  pScreen, int argc, char **argv)     } #endif
> >> 
> >> +#ifdef XFreeXDGA
> >>     I810DGAInit(pScreen);
> >> +#endif
> >> 
> >>     if (!xf86InitFBManager(pScreen, &(pI810->FbMemBox))) {
> >>        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
> >> diff --git a/src/i830_driver.c b/src/i830_driver.c
> >> index 7e0ebf3..4334de6 100644
> >> --- a/src/i830_driver.c
> >> +++ b/src/i830_driver.c
> >> @@ -2733,7 +2733,10 @@ I830ScreenInit(int scrnIndex, ScreenPtr
> >> pScreen, int argc, char **argv) 
> >> 
> >>     xf86SetBlackWhitePixels(pScreen);
> >> 
> >> -   xf86DiDGAInit (pScreen, pI830->LinearAddr + pScrn->fbOffset);
> >> +#ifdef XFreeXDGA +   if (!pI830->use_drm_mode)
> >> +       xf86DiDGAInit (pScreen, pI830->LinearAddr +
> >> pScrn->fbOffset); +#endif 
> >> 
> >>     if (!I830AccelInit(pScreen)) {
> >>        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
> >> --
> >> 1.5.3.8
> > 
> > This one also disables DGA in KMS, which introduce
> > http://bugs.freedesktop.org/show_bug.cgi?id=23858 Any idea on how to
> > enable DGA in KMS? 
> 
> I'd suggest to revert the patch if we don't have good idea at this point.
> 

As DGA is optional in xserver, revert that one might crash X in start.
Or we just fake to init DGA proto, not sure if there's any DGA callbacks
that driver can use for framebuffer open later?

DGA did not work correctly in KMS before, but some close-source games were
still working makes me think they might just check if DGA proto exists...

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090915/4e3c29b4/attachment.sig>