← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xserver-xorg-video-nv/trusty

« back to all changes in this revision

Viewing changes to debian/patches/110_do_not_crash_on_17.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-01-05 13:24:33 UTC
  • Revision ID: james.westby@ubuntu.com-20100105132433-yixwn0c3kigte7ex
Tags: 1:2.1.15-1ubuntu2
https://launchpad.net/bugs/494627
* debian/patches/110_do_not_crash_on_17.patch:
  - merge git fix for LP: #494627 
    (from http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/commit/?id=85638b2f0acc418aa77241dd123f7de76ea3ce8f)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/110_do_not_crash_on_17.patch
 
1
From 85638b2f0acc418aa77241dd123f7de76ea3ce8f Mon Sep 17 00:00:00 2001
 
2
From: Adam Jackson <ajax@redhat.com>
 
3
Date: Tue, 15 Dec 2009 21:42:15 +0000
 
4
Subject: g80: Add a no-op gamma hook so we don't crash on 1.7 servers
 
5
 
 
6
Signed-off-by: Adam Jackson <ajax@redhat.com>
 
7
---
 
8
diff --git a/src/g80_display.c b/src/g80_display.c
 
9
index 3cbaac3..0cb9860 100644
 
10
--- a/src/g80_display.c
 
11
+++ b/src/g80_display.c
 
12
@@ -645,6 +645,12 @@ G80CrtcCommit(xf86CrtcPtr crtc)
 
13
     C(0x00000080, 0);
 
14
 }
 
15
 
 
16
+static void
 
17
+G80DispGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
 
18
+               int size)
 
19
+{
 
20
+}
 
21
+
 
22
 static const xf86CrtcFuncsRec g80_crtc_funcs = {
 
23
     .dpms = G80CrtcDPMSSet,
 
24
     .save = NULL,
 
25
@@ -654,7 +660,7 @@ static const xf86CrtcFuncsRec g80_crtc_funcs = {
 
26
     .mode_fixup = G80CrtcModeFixup,
 
27
     .prepare = G80CrtcPrepare,
 
28
     .mode_set = G80CrtcModeSet,
 
29
-    // .gamma_set = G80DispGammaSet,
 
30
+    .gamma_set = G80DispGammaSet,
 
31
     .commit = G80CrtcCommit,
 
32
     .shadow_create = NULL,
 
33
     .shadow_destroy = NULL,
 
34
--
 
35
cgit v0.8.3-6-g21f6