| 1 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
From 63e4f22d5fe3d4247cb48c969b5f7f2690665d78 Mon Sep 17 00:00:00 2001 |
| 2 |
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
From: Adel Gadllah <adel.gadllah@gmail.com> |
|
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> |
|
|
<head> |
|
|
<title>svntogit/packages.git - Git clone of the 'packages' repository |
|
|
</title> |
|
|
<meta name='generator' content='cgit v0.10.2'/> |
|
|
<meta name='robots' content='index, nofollow'/> |
|
|
<link rel='stylesheet' type='text/css' href='/cgit.css'/> |
|
|
<link rel='shortcut icon' href='/favicon.ico'/> |
|
|
<link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server' type='application/atom+xml'/> |
|
|
<link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
<link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
<link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
<link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
</head> |
|
|
<body> |
|
|
<div id="archnavbar"><!-- Arch Linux global navigation bar --> |
|
|
<div id="archnavbarlogo"> |
|
|
<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> |
|
|
</div> |
|
|
<div id="archnavbarmenu"> |
|
|
<ul id="archnavbarlist"> |
|
|
<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> |
|
|
<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> |
|
|
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> |
|
|
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> |
|
|
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> |
|
|
<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> |
|
|
<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> |
|
|
</ul> |
|
|
</div> |
|
|
</div><!-- #archnavbar --> |
|
|
<div id='cgit'><table id='header'> |
|
|
<tr> |
|
|
<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> |
|
|
<tr><td class='sub'>Git clone of the 'packages' repository |
|
|
</td><td class='sub right'></td></tr></table> |
|
|
<table class='tabs'><tr><td> |
|
|
<a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/0001-modesetting-Fix-software-cursor-fallback.patch'> |
|
|
<input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'> |
|
|
<option value='grep'>log msg</option> |
|
|
<option value='author'>author</option> |
|
|
<option value='committer'>committer</option> |
|
|
<option value='range'>range</option> |
|
|
</select> |
|
|
<input class='txt' type='text' size='10' name='q' value=''/> |
|
|
<input type='submit' value='search'/> |
|
|
</form> |
|
|
</td></tr></table> |
|
|
<div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server'>0001-modesetting-Fix-software-cursor-fallback.patch</a></div><div class='content'>blob: ffb08756cf06eefb94a6628e12b0391c2761c5a5 (<a href='/svntogit/packages.git/plain/trunk/0001-modesetting-Fix-software-cursor-fallback.patch?h=packages/xorg-server'>plain</a>) |
|
|
<table summary='blob content' class='blob'> |
|
|
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> |
|
|
<a id='n2' href='#n2'>2</a> |
|
|
<a id='n3' href='#n3'>3</a> |
|
|
<a id='n4' href='#n4'>4</a> |
|
|
<a id='n5' href='#n5'>5</a> |
|
|
<a id='n6' href='#n6'>6</a> |
|
|
<a id='n7' href='#n7'>7</a> |
|
|
<a id='n8' href='#n8'>8</a> |
|
|
<a id='n9' href='#n9'>9</a> |
|
|
<a id='n10' href='#n10'>10</a> |
|
|
<a id='n11' href='#n11'>11</a> |
|
|
<a id='n12' href='#n12'>12</a> |
|
|
<a id='n13' href='#n13'>13</a> |
|
|
<a id='n14' href='#n14'>14</a> |
|
|
<a id='n15' href='#n15'>15</a> |
|
|
<a id='n16' href='#n16'>16</a> |
|
|
<a id='n17' href='#n17'>17</a> |
|
|
<a id='n18' href='#n18'>18</a> |
|
|
<a id='n19' href='#n19'>19</a> |
|
|
<a id='n20' href='#n20'>20</a> |
|
|
<a id='n21' href='#n21'>21</a> |
|
|
<a id='n22' href='#n22'>22</a> |
|
|
<a id='n23' href='#n23'>23</a> |
|
|
<a id='n24' href='#n24'>24</a> |
|
|
<a id='n25' href='#n25'>25</a> |
|
|
<a id='n26' href='#n26'>26</a> |
|
|
<a id='n27' href='#n27'>27</a> |
|
|
<a id='n28' href='#n28'>28</a> |
|
|
<a id='n29' href='#n29'>29</a> |
|
|
<a id='n30' href='#n30'>30</a> |
|
|
<a id='n31' href='#n31'>31</a> |
|
|
<a id='n32' href='#n32'>32</a> |
|
|
<a id='n33' href='#n33'>33</a> |
|
|
<a id='n34' href='#n34'>34</a> |
|
|
<a id='n35' href='#n35'>35</a> |
|
|
<a id='n36' href='#n36'>36</a> |
|
|
<a id='n37' href='#n37'>37</a> |
|
|
<a id='n38' href='#n38'>38</a> |
|
|
<a id='n39' href='#n39'>39</a> |
|
|
<a id='n40' href='#n40'>40</a> |
|
|
<a id='n41' href='#n41'>41</a> |
|
|
<a id='n42' href='#n42'>42</a> |
|
|
</pre></td> |
|
|
<td class='lines'><pre><code>From 63e4f22d5fe3d4247cb48c969b5f7f2690665d78 Mon Sep 17 00:00:00 2001 |
|
|
From: Adel Gadllah <adel.gadllah@gmail.com> |
|
| 3 |
Date: Fri, 1 May 2015 17:21:12 +0200 |
Date: Fri, 1 May 2015 17:21:12 +0200 |
| 4 |
Subject: [PATCH] modesetting: Fix software cursor fallback |
Subject: [PATCH] modesetting: Fix software cursor fallback |
| 5 |
MIME-Version: 1.0 |
MIME-Version: 1.0 |
| 14 |
the cursor2 usage on EINVAL. |
the cursor2 usage on EINVAL. |
| 15 |
|
|
| 16 |
References: https://bugzilla.redhat.com/show_bug.cgi?id=1205725 |
References: https://bugzilla.redhat.com/show_bug.cgi?id=1205725 |
| 17 |
Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com> |
Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com> |
| 18 |
Reviewed-by: Michel Dänzer <michel@daenzer.net> |
Reviewed-by: Michel Dänzer <michel@daenzer.net> |
| 19 |
<span class="hl kwb">---</span> |
--- |
| 20 |
hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++-- |
hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++-- |
| 21 |
1 file changed, 2 insertions(+), 2 deletions(-) |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 22 |
|
|
| 23 |
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c |
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c |
| 24 |
index 824500b..912abda 100644 |
index 824500b..912abda 100644 |
| 25 |
<span class="hl kwb">--- a/hw/xfree86/drivers/modesetting/drmmode_display.c</span> |
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c |
| 26 |
<span class="hl kwa">+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c</span> |
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c |
| 27 |
@@ -396,10 +396,10 @@ drmmode_set_cursor(xf86CrtcPtr crtc) |
@@ -396,10 +396,10 @@ drmmode_set_cursor(xf86CrtcPtr crtc) |
| 28 |
drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, |
drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, |
| 29 |
handle, ms->cursor_width, ms->cursor_height, |
handle, ms->cursor_width, ms->cursor_height, |
| 30 |
cursor->bits->xhot, cursor->bits->yhot); |
cursor->bits->xhot, cursor->bits->yhot); |
| 31 |
<span class="hl kwa">+ if (!ret)</span> |
+ if (!ret) |
| 32 |
<span class="hl kwa">+ return;</span> |
+ return; |
| 33 |
if (ret == -EINVAL) |
if (ret == -EINVAL) |
| 34 |
use_set_cursor2 = FALSE; |
use_set_cursor2 = FALSE; |
| 35 |
<span class="hl kwb">- else</span> |
- else |
| 36 |
<span class="hl kwb">- return;</span> |
- return; |
| 37 |
} |
} |
| 38 |
|
|
| 39 |
ret = drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, |
ret = drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, |
| 40 |
<span class="hl kwb">-- </span> |
-- |
| 41 |
2.1.0 |
2.1.0 |
| 42 |
|
|
|
</code></pre></td></tr></table> |
|
|
</div> <!-- class=content --> |
|
|
<div class="foot" style="padding-left:1em;padding-right:1em;"> |
|
|
<p>Copyright © 2002-2014 <a href="mailto:jvinet@zeroflux.org" |
|
|
title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" |
|
|
title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo |
|
|
are recognized trademarks. Some rights reserved. The registered trademark |
|
|
Linux® is used pursuant to a sublicense from LMI, the exclusive licensee |
|
|
of Linus Torvalds, owner of the mark on a world-wide basis.</p> |
|
|
</div> |
|
|
</div> <!-- id=cgit --> |
|
|
</body> |
|
|
</html> |
|
Parent Directory
| 
Revision Log
| 
Patch