/[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-modesetting-fix-software-cursor-fallback.patch |
Annotation of /trunk/xorg-server/patches/xorg-server-1.17.1-modesetting-fix-software-cursor-fallback.patch
Parent Directory | Revision Log
Revision 2575 -
(hide annotations)
(download)
Mon Jun 15 12:22:48 2015 UTC (9 years, 3 months ago) by niro
File size: 8440 byte(s)
Mon Jun 15 12:22:48 2015 UTC (9 years, 3 months ago) by niro
File size: 8440 byte(s)
-serveral upstream patches
1 | niro | 2575 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
3 | <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> | ||
4 | <head> | ||
5 | <title>svntogit/packages.git - Git clone of the 'packages' repository | ||
6 | </title> | ||
7 | <meta name='generator' content='cgit v0.10.2'/> | ||
8 | <meta name='robots' content='index, nofollow'/> | ||
9 | <link rel='stylesheet' type='text/css' href='/cgit.css'/> | ||
10 | <link rel='shortcut icon' href='/favicon.ico'/> | ||
11 | <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'/> | ||
12 | <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
13 | <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
14 | <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
15 | <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
16 | </head> | ||
17 | <body> | ||
18 | <div id="archnavbar"><!-- Arch Linux global navigation bar --> | ||
19 | <div id="archnavbarlogo"> | ||
20 | <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> | ||
21 | </div> | ||
22 | <div id="archnavbarmenu"> | ||
23 | <ul id="archnavbarlist"> | ||
24 | <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> | ||
25 | <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> | ||
26 | <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> | ||
27 | <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> | ||
28 | <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> | ||
29 | <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> | ||
30 | <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> | ||
31 | </ul> | ||
32 | </div> | ||
33 | </div><!-- #archnavbar --> | ||
34 | <div id='cgit'><table id='header'> | ||
35 | <tr> | ||
36 | <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> | ||
37 | <tr><td class='sub'>Git clone of the 'packages' repository | ||
38 | </td><td class='sub right'></td></tr></table> | ||
39 | <table class='tabs'><tr><td> | ||
40 | <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'> | ||
41 | <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'> | ||
42 | <option value='grep'>log msg</option> | ||
43 | <option value='author'>author</option> | ||
44 | <option value='committer'>committer</option> | ||
45 | <option value='range'>range</option> | ||
46 | </select> | ||
47 | <input class='txt' type='text' size='10' name='q' value=''/> | ||
48 | <input type='submit' value='search'/> | ||
49 | </form> | ||
50 | </td></tr></table> | ||
51 | <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>) | ||
52 | <table summary='blob content' class='blob'> | ||
53 | <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> | ||
54 | <a id='n2' href='#n2'>2</a> | ||
55 | <a id='n3' href='#n3'>3</a> | ||
56 | <a id='n4' href='#n4'>4</a> | ||
57 | <a id='n5' href='#n5'>5</a> | ||
58 | <a id='n6' href='#n6'>6</a> | ||
59 | <a id='n7' href='#n7'>7</a> | ||
60 | <a id='n8' href='#n8'>8</a> | ||
61 | <a id='n9' href='#n9'>9</a> | ||
62 | <a id='n10' href='#n10'>10</a> | ||
63 | <a id='n11' href='#n11'>11</a> | ||
64 | <a id='n12' href='#n12'>12</a> | ||
65 | <a id='n13' href='#n13'>13</a> | ||
66 | <a id='n14' href='#n14'>14</a> | ||
67 | <a id='n15' href='#n15'>15</a> | ||
68 | <a id='n16' href='#n16'>16</a> | ||
69 | <a id='n17' href='#n17'>17</a> | ||
70 | <a id='n18' href='#n18'>18</a> | ||
71 | <a id='n19' href='#n19'>19</a> | ||
72 | <a id='n20' href='#n20'>20</a> | ||
73 | <a id='n21' href='#n21'>21</a> | ||
74 | <a id='n22' href='#n22'>22</a> | ||
75 | <a id='n23' href='#n23'>23</a> | ||
76 | <a id='n24' href='#n24'>24</a> | ||
77 | <a id='n25' href='#n25'>25</a> | ||
78 | <a id='n26' href='#n26'>26</a> | ||
79 | <a id='n27' href='#n27'>27</a> | ||
80 | <a id='n28' href='#n28'>28</a> | ||
81 | <a id='n29' href='#n29'>29</a> | ||
82 | <a id='n30' href='#n30'>30</a> | ||
83 | <a id='n31' href='#n31'>31</a> | ||
84 | <a id='n32' href='#n32'>32</a> | ||
85 | <a id='n33' href='#n33'>33</a> | ||
86 | <a id='n34' href='#n34'>34</a> | ||
87 | <a id='n35' href='#n35'>35</a> | ||
88 | <a id='n36' href='#n36'>36</a> | ||
89 | <a id='n37' href='#n37'>37</a> | ||
90 | <a id='n38' href='#n38'>38</a> | ||
91 | <a id='n39' href='#n39'>39</a> | ||
92 | <a id='n40' href='#n40'>40</a> | ||
93 | <a id='n41' href='#n41'>41</a> | ||
94 | <a id='n42' href='#n42'>42</a> | ||
95 | </pre></td> | ||
96 | <td class='lines'><pre><code>From 63e4f22d5fe3d4247cb48c969b5f7f2690665d78 Mon Sep 17 00:00:00 2001 | ||
97 | From: Adel Gadllah <adel.gadllah@gmail.com> | ||
98 | Date: Fri, 1 May 2015 17:21:12 +0200 | ||
99 | Subject: [PATCH] modesetting: Fix software cursor fallback | ||
100 | MIME-Version: 1.0 | ||
101 | Content-Type: text/plain; charset=UTF-8 | ||
102 | Content-Transfer-Encoding: 8bit | ||
103 | |||
104 | The code in drmmode_set_cursor does not properly handle the case where | ||
105 | drmModeSetCursor2 returns any other error than EINVAL and silently fails to set | ||
106 | a cursor. | ||
107 | |||
108 | So only return when the drmModeSetCursor2 succeeds (i.e returns 0) and disable | ||
109 | the cursor2 usage on EINVAL. | ||
110 | |||
111 | References: https://bugzilla.redhat.com/show_bug.cgi?id=1205725 | ||
112 | Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com> | ||
113 | Reviewed-by: Michel Dänzer <michel@daenzer.net> | ||
114 | <span class="hl kwb">---</span> | ||
115 | hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++-- | ||
116 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
117 | |||
118 | diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c | ||
119 | index 824500b..912abda 100644 | ||
120 | <span class="hl kwb">--- a/hw/xfree86/drivers/modesetting/drmmode_display.c</span> | ||
121 | <span class="hl kwa">+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c</span> | ||
122 | @@ -396,10 +396,10 @@ drmmode_set_cursor(xf86CrtcPtr crtc) | ||
123 | drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, | ||
124 | handle, ms->cursor_width, ms->cursor_height, | ||
125 | cursor->bits->xhot, cursor->bits->yhot); | ||
126 | <span class="hl kwa">+ if (!ret)</span> | ||
127 | <span class="hl kwa">+ return;</span> | ||
128 | if (ret == -EINVAL) | ||
129 | use_set_cursor2 = FALSE; | ||
130 | <span class="hl kwb">- else</span> | ||
131 | <span class="hl kwb">- return;</span> | ||
132 | } | ||
133 | |||
134 | ret = drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, | ||
135 | <span class="hl kwb">-- </span> | ||
136 | 2.1.0 | ||
137 | |||
138 | </code></pre></td></tr></table> | ||
139 | </div> <!-- class=content --> | ||
140 | <div class="foot" style="padding-left:1em;padding-right:1em;"> | ||
141 | <p>Copyright © 2002-2014 <a href="mailto:jvinet@zeroflux.org" | ||
142 | title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" | ||
143 | title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo | ||
144 | are recognized trademarks. Some rights reserved. The registered trademark | ||
145 | Linux® is used pursuant to a sublicense from LMI, the exclusive licensee | ||
146 | of Linus Torvalds, owner of the mark on a world-wide basis.</p> | ||
147 | </div> | ||
148 | </div> <!-- id=cgit --> | ||
149 | </body> | ||
150 | </html> |