]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - glsdk/meta-ti-glsdk.git/blob - recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0135-nouveau-initialise-has_optimus-variable.patch
linux-ti33x-psp 3.2: update to 3.2.18
[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.17 / 0135-nouveau-initialise-has_optimus-variable.patch
1 From c6ecb5ef76bc2c141529aeab1ef2490b377e1906 Mon Sep 17 00:00:00 2001
2 From: Dave Airlie <airlied@redhat.com>
3 Date: Wed, 2 May 2012 20:26:24 +0100
4 Subject: [PATCH 135/165] nouveau: initialise has_optimus variable.
6 commit addde4ec31456c5f1e9b61aae3edcfeb0f338f87 upstream.
8 We should initialise this to 0 really to avoid getting false positives.
10 Signed-off-by: Dave Airlie <airlied@redhat.com>
11 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
12 ---
13  drivers/gpu/drm/nouveau/nouveau_acpi.c |    2 +-
14  1 files changed, 1 insertions(+), 1 deletions(-)
16 diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
17 index 525744d..3df56c7 100644
18 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
19 +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
20 @@ -245,7 +245,7 @@ static bool nouveau_dsm_detect(void)
21         struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};
22         struct pci_dev *pdev = NULL;
23         int has_dsm = 0;
24 -       int has_optimus;
25 +       int has_optimus = 0;
26         int vga_count = 0;
27         bool guid_valid;
28         int retval;
29 -- 
30 1.7.7.6