diff options
author | Keith Packard <keithp@keithp.com> | 2014-12-13 22:22:30 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2014-12-19 18:09:15 -0800 |
commit | 2c7111235ca5c3bd23cd824589dfbc0ebd477585 (patch) | |
tree | fedac33f0c118b0928129cde565f03207aa4e725 | |
parent | 5a541bd5e7adc9fdcc1883558be9218f82a284e0 (diff) |
modesetting: Enable Xv when using glamor
This just calls the existing function to create the relevant Xv
adaptor and hook it up.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | hw/xfree86/drivers/modesetting/driver.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index cad900063..d9a29827c 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -1103,6 +1103,19 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv) xf86DPMSInit(pScreen, xf86DPMSSet, 0); +#ifdef GLAMOR + if (ms->drmmode.glamor) { + XF86VideoAdaptorPtr glamor_adaptor; + + glamor_adaptor = glamor_xv_init(pScreen, 16); + if (glamor_adaptor != NULL) + xf86XVScreenInit(pScreen, &glamor_adaptor, 1); + else + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to initialize XV support.\n"); + } +#endif + if (serverGeneration == 1) xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); |