Hi Dave,
Merged.
3608d9f..54b125d server-1.14-branch -> server-1.14-branch
Matt
On 07/11/2013 07:36 PM, Dave Airlie wrote:
> Hi Matt,
>
> all backports from master, all shipped in Fedora, all making Peter
> angry because he had to rebase
> them.
>
> The following changes since commit 3608d9f3dd6ae1d23e23294e9a56cb8158e65d19:
>
> glx: fix uninitialized var in __glXDRIscreenProbe (2013-07-11 09:46:11
> +1000)
>
> are available in the git repository at:
>
> ssh://people.freedesktop.org/~airlied/xserver for-1.14-gpu-fixes
>
> for you to fetch changes up to 54b125d1751385bcfc3c1b51d21ee6a7dc14143b:
>
> xfree86: don't enable anything in xf86InitialConfiguration for GPU
> screens (2013-07-12 11:24:34 +1000)
>
> ----------------------------------------------------------------
> Aaron Plattner (1):
> xfree86: don't enable anything in xf86InitialConfiguration for GPU
> screens
>
> Dave Airlie (4):
> dix/gpu: remove asserts for output/offload from same slave
> xf86crtc: don't use scrn->display for gpu screens
> dix: allow pixmap dirty helper to be used for non-shared pixmaps
> gpu: call CreateScreenResources for GPU screens
>
> dix/dispatch.c | 2 --
> dix/main.c | 3 +++
> dix/pixmap.c | 2 ++
> fb/fbpixmap.c | 1 +
> hw/xfree86/common/xf86platformBus.c | 8 ++++++++
> hw/xfree86/modes/xf86Crtc.c | 34 ++++++++++++++++++++++++----------
> 6 files changed, 38 insertions(+), 12 deletions(-)
>
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
