mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From c6ecb5ef76bc2c141529aeab1ef2490b377e1906 Mon Sep 17 00:00:00 2001
|
|
From: Dave Airlie <airlied@redhat.com>
|
|
Date: Wed, 2 May 2012 20:26:24 +0100
|
|
Subject: [PATCH 135/165] nouveau: initialise has_optimus variable.
|
|
|
|
commit addde4ec31456c5f1e9b61aae3edcfeb0f338f87 upstream.
|
|
|
|
We should initialise this to 0 really to avoid getting false positives.
|
|
|
|
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c
|
|
index 525744d..3df56c7 100644
|
|
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c
|
|
+++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c
|
|
@@ -245,7 +245,7 @@ static bool nouveau_dsm_detect(void)
|
|
struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};
|
|
struct pci_dev *pdev = NULL;
|
|
int has_dsm = 0;
|
|
- int has_optimus;
|
|
+ int has_optimus = 0;
|
|
int vga_count = 0;
|
|
bool guid_valid;
|
|
int retval;
|
|
--
|
|
1.7.7.6
|
|
|