Attachment #648988 for bug #732298

Lines 157-163 Link Here

(-)a/src/nouveau_exa.c (-1 / +1 lines)
157		157
158	#ifdef NOUVEAU_PIXMAP_SHARING	158	#ifdef NOUVEAU_PIXMAP_SHARING
159	static Bool	159	static Bool
160	nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p)	160	nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p)
161	{	161	{
162	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);	162	struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
163	struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);	163	struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);




	{
		ret = drmSetMaster(pNv->dev->fd);
		if (ret)
			ErrorF("Unable to get primary: %s\n", strerror(errno));
	}

	if (XF86_CRTC_CONFIG_PTR(pScrn)->num_crtc && !xf86SetDesiredModes(pScrn))


	ret = drmDropMaster(pNv->dev->fd);
	if (ret && errno != EIO && errno != ENODEV)
		ErrorF("Error dropping primary: %i(%m)\n", -errno);
}

static void

{
	RegionRec pixregion;

	PixmapRegionInit(&pixregion, dirty->secondary_dst);

	DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
#ifdef HAS_DIRTYTRACKING_ROTATION
	PixmapSyncDirtyHelper(dirty);
#else
	PixmapSyncDirtyHelper(dirty, &pixregion);
#endif

	DamageRegionProcessPending(&dirty->secondary_dst->drawable);
	RegionUninit(&pixregion);
}


Return to bug 732298

Lines 503-509 Link Here

(-)a/src/nv_driver.c (-5 / +5 lines)
503	{	503	{
504	ret = drmSetMaster(pNv->dev->fd);	504	ret = drmSetMaster(pNv->dev->fd);
505	if (ret)	505	if (ret)
506	ErrorF("Unable to get master: %s\n", strerror(errno));	506	ErrorF("Unable to get primary: %s\n", strerror(errno));
507	}	507	}
508		508
509	if (XF86_CRTC_CONFIG_PTR(pScrn)->num_crtc && !xf86SetDesiredModes(pScrn))	509	if (XF86_CRTC_CONFIG_PTR(pScrn)->num_crtc && !xf86SetDesiredModes(pScrn))
Lines 541-547 Link Here
541		541
542	ret = drmDropMaster(pNv->dev->fd);	542	ret = drmDropMaster(pNv->dev->fd);
543	if (ret && errno != EIO && errno != ENODEV)	543	if (ret && errno != EIO && errno != ENODEV)
544	ErrorF("Error dropping master: %i(%m)\n", -errno);	544	ErrorF("Error dropping primary: %i(%m)\n", -errno);
545	}	545	}
546		546
547	static void	547	static void
Lines 559-574 Link Here
559	{	559	{
560	RegionRec pixregion;	560	RegionRec pixregion;
561		561
562	PixmapRegionInit(&pixregion, dirty->slave_dst);	562	PixmapRegionInit(&pixregion, dirty->secondary_dst);
563		563
564	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);	564	DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
565	#ifdef HAS_DIRTYTRACKING_ROTATION	565	#ifdef HAS_DIRTYTRACKING_ROTATION
566	PixmapSyncDirtyHelper(dirty);	566	PixmapSyncDirtyHelper(dirty);
567	#else	567	#else
568	PixmapSyncDirtyHelper(dirty, &pixregion);	568	PixmapSyncDirtyHelper(dirty, &pixregion);
569	#endif	569	#endif
570		570
571	DamageRegionProcessPending(&dirty->slave_dst->drawable);	571	DamageRegionProcessPending(&dirty->secondary_dst->drawable);
572	RegionUninit(&pixregion);	572	RegionUninit(&pixregion);
573	}	573	}
574		574