Dave Airlie <[email protected]> writes: > dri2: invalidate drawable after sharing pixmap
Merged.
f0bad69..22746df master -> master
> xf86: return NULL for compat output if no outputs.
I don't like this patch -- reading through the function, there's just
one little bit at the bottom which isn't doing the right thing, and it
will *still* do the wrong thing if you delete outputs from a screen.
Here's an (untested) patch which fixes that test instead:
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index e3eaf5f..ee35248 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -66,6 +66,7 @@ xf86CrtcConfigInit(ScrnInfoPtr scrn, const
xf86CrtcConfigFuncsRec * funcs)
config = xnfcalloc(1, sizeof(xf86CrtcConfigRec));
config->funcs = funcs;
+ config->compat_output = -1;
scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config;
}
@@ -1841,7 +1842,9 @@ SetCompatOutput(xf86CrtcConfigPtr config)
if (compat >= 0) {
config->compat_output = compat;
}
- else {
+ else if (0 <= config->compat_output &&
+ config->compat_output < config->num_output)
+ {
/* Don't change the compat output when no valid outputs found */
output = config->output[config->compat_output];
}
> xf86/platform: scan pci after probing devices
Ick. This seems to assume that the device will remain powered up after
get_drm_info closes it again? If that's true, then this seems like it
should be a fine kludge to me.
Can you get rid of the gratuitous '&' in front of
xf86PlatformDeviceProbe for me though?
Reviewed-by: Keith Packard <[email protected]>
> config/udev: ignore change on drm devices
(already reviewed, but this looks sane to me)
Reviewed-by: Keith Packard <[email protected]>
> xf86: fix multi-seat video device support.
This looked right before 1.13 shipped, just too scary in the hours
before the release.
Reviewed-by: Keith Packard <[email protected]>
--
[email protected]
pgpltkFiHygvW.pgp
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
