← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/05_only_call_gamma_set_if_nonnull.diff

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen, Bryce Harrington, Robert Hooker, Timo Aaltonen, Robert Collins
  • Date: 2010-02-19 13:24:15 UTC
  • mfrom: (1.1.31 upstream) (0.11.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100219132415-4eovyfajq7ac45n3
Tags: 2:1.7.5-1ubuntu1
[ Bryce Harrington ]
[Robert Hooker]
* Add 106_nouveau_autodetect.patch: makes nouveau the default driver
  for supported cards when not explicitly named in xorg.conf.

[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 101, included in Debian.

[Robert Collins]
* Add 199_xfvb-help-typo.patch to fix typo in help for xvfb (fdo #32990)
* Add 200_randr-null.patch to clarify a pointer initialization (fdo #26389)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_only_call_gamma_set_if_nonnull.diff
 
1
Bug#564203
 
2
 
 
3
From 8ca4233017e9f441303088e7054b6a7c4f171d80 Mon Sep 17 00:00:00 2001
 
4
From: Michael Vogt <mvo@ubuntu.com>
 
5
Date: Wed, 6 Jan 2010 14:40:34 +0100
 
6
Subject: [PATCH] * hw/xfree86/modes/xf86Crtc.c:
 
7
   - only call gamma_set if its non NULL
 
8
 
 
9
---
 
10
 hw/xfree86/modes/xf86Crtc.c |    2 +-
 
11
 1 files changed, 1 insertions(+), 1 deletions(-)
 
12
 
 
13
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
 
14
index d015c6a..573fe96 100644
 
15
--- a/hw/xfree86/modes/xf86Crtc.c
 
16
+++ b/hw/xfree86/modes/xf86Crtc.c
 
17
@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 
18
     }
 
19
 
 
20
     /* Only upload when needed, to avoid unneeded delays. */
 
21
-    if (!crtc->active)
 
22
+    if (!crtc->active && crtc->funcs->gamma_set)
 
23
        crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
 
24
                                             crtc->gamma_blue, crtc->gamma_size);
 
25