repositories
/
deb_xorg-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ODROID-U3 xorg-server debian package fork :
[deb_xorg-server.git]
/
debian
/
patches
/
fix-detach-gpu.patch
diff --git
a/debian/patches/fix-detach-gpu.patch
b/debian/patches/fix-detach-gpu.patch
index cba33cf64acdab566a60c46a8ebd178309dd355c..8af9913c9cacf2b978ccd06374f6dceb4ee7deed 100644
(file)
--- a/
debian/patches/fix-detach-gpu.patch
+++ b/
debian/patches/fix-detach-gpu.patch
@@
-1,6
+1,6
@@
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -1800,7 +1800,8 @@
+@@ -1800,7 +1800,8 @@
xf86RandR14ProviderSetOutputSource(Scree
ScreenPtr cmScreen = pScreen->current_master;
xf86DetachOutputGPU(pScreen);
ScreenPtr cmScreen = pScreen->current_master;
xf86DetachOutputGPU(pScreen);
@@
-10,7
+10,7
@@
}
provider->output_source = NULL;
return TRUE;
}
provider->output_source = NULL;
return TRUE;
-@@ -1811,7 +1812,8 @@
+@@ -1811,7 +1812,8 @@
xf86RandR14ProviderSetOutputSource(Scree
SetRootClip(source_provider->pScreen, FALSE);
SetRootClip(source_provider->pScreen, FALSE);
@@
-20,7
+20,7
@@
AttachOutputGPU(source_provider->pScreen, pScreen);
provider->output_source = source_provider;
AttachOutputGPU(source_provider->pScreen, pScreen);
provider->output_source = source_provider;
-@@ -1828,7 +1830,8 @@
+@@ -1828,7 +1830,8 @@
xf86RandR14ProviderSetOffloadSink(Screen
if (provider->offload_sink) {
ScreenPtr cmScreen = pScreen->current_master;
xf86DetachOutputGPU(pScreen);
if (provider->offload_sink) {
ScreenPtr cmScreen = pScreen->current_master;
xf86DetachOutputGPU(pScreen);
@@
-30,7
+30,7
@@
}
provider->offload_sink = NULL;
}
provider->offload_sink = NULL;
-@@ -1838,7 +1841,8 @@
+@@ -1838,7 +1841,8 @@
xf86RandR14ProviderSetOffloadSink(Screen
if (provider->offload_sink == sink_provider)
return TRUE;
if (provider->offload_sink == sink_provider)
return TRUE;
@@
-40,7
+40,7
@@
AttachOffloadGPU(sink_provider->pScreen, pScreen);
provider->offload_sink = sink_provider;
AttachOffloadGPU(sink_provider->pScreen, pScreen);
provider->offload_sink = sink_provider;
-@@ -1917,12 +1921,14 @@
+@@ -1917,12 +1921,14 @@
xf86RandR14ProviderDestroy(ScreenPtr scr
config->randr_provider->offload_sink = NULL;
RRSetChanged(screen);
}
config->randr_provider->offload_sink = NULL;
RRSetChanged(screen);
}
@@
-59,7
+59,7
@@
config->randr_provider = NULL;
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
config->randr_provider = NULL;
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
-@@ -3911,6 +3911,8 @@ AttachUnboundGPU(ScreenPtr pScreen, Scre
enPtr new)
+@@ -3911,6 +3911,8 @@ AttachUnboundGPU(ScreenPtr pScreen, Scre
assert(new->isGPU);
assert(!new->current_master);
xorg_list_add(&new->unattached_head, &pScreen->unattached_list);
assert(new->isGPU);
assert(!new->current_master);
xorg_list_add(&new->unattached_head, &pScreen->unattached_list);
@@
-68,7
+68,7
@@
new->current_master = pScreen;
}
new->current_master = pScreen;
}
-@@ -393
7,7 +3937,8 @@
+@@ -393
5,7 +3937,8 @@ DetachOutputGPU(ScreenPtr slave)
{
assert(slave->isGPU);
xorg_list_del(&slave->output_head);
{
assert(slave->isGPU);
xorg_list_del(&slave->output_head);
@@
-78,7
+78,7
@@
}
void
}
void
-@@ -395
3,6 +3954,7 @@
+@@ -395
1,6 +3954,7 @@ DetachOffloadGPU(ScreenPtr slave)
{
assert(slave->isGPU);
xorg_list_del(&slave->offload_head);
{
assert(slave->isGPU);
xorg_list_del(&slave->offload_head);