← Back to branch summary

~ubuntu-branches/ubuntu/quantal/plymouth/quantal

« back to all changes in this revision

Viewing changes to debian/patches/nouveau-framebuffer.patch

  • Committer: Steve Langasek
  • Date: 2012-05-05 01:22:57 UTC
  • Revision ID: steve.langasek@canonical.com-20120505012257-uo3d1kba674tdfuf
refresh patches for new upstream version

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/nouveau-framebuffer.patch
11
11
Forwarded: not-needed
12
12
Last-Update: 2011-03-18
13
13
 
14
 
Index: b/src/plugins/renderers/drm/plugin.c
 
14
Index: trunk/src/plugins/renderers/drm/plugin.c
15
15
===================================================================
16
 
--- a/src/plugins/renderers/drm/plugin.c
17
 
+++ b/src/plugins/renderers/drm/plugin.c
18
 
@@ -63,6 +63,10 @@
 
16
--- trunk.orig/src/plugins/renderers/drm/plugin.c
 
17
+++ trunk/src/plugins/renderers/drm/plugin.c
 
18
@@ -75,6 +75,10 @@
19
19
 
20
20
 #define BYTES_PER_PIXEL (4)
21
21
 
26
26
 struct _ply_renderer_head
27
27
 {
28
28
   ply_renderer_backend_t *backend;
29
 
@@ -428,6 +432,38 @@
 
29
@@ -490,6 +494,38 @@
30
30
 }
31
31
 
32
32
 static bool
65
65
 load_driver (ply_renderer_backend_t *backend)
66
66
 {
67
67
   char *driver_name;
68
 
@@ -457,8 +493,13 @@
69
 
   else if (strcmp (driver_name, "nouveau") == 0
70
 
            || strcmp (driver_name, "lbm-nouveau") == 0)
 
68
@@ -524,8 +560,13 @@
 
69
   if (backend->driver_interface == NULL && (strcmp (driver_name, "nouveau") == 0
 
70
                                             || strcmp (driver_name, "lbm-nouveau") == 0))
71
71
     {
72
72
-      backend->driver_interface = ply_renderer_nouveau_driver_get_interface ();
73
73
-      backend->driver_supports_mapping_console = false;
79
79
+      else
80
80
+        ply_trace("falling back to framebuffer for nouveau to avoid DRM hang");
81
81
     }
82
 
   free (driver_name);
 
82
 #endif
83
83