Linux 3.1-rc4
This commit is contained in:
parent
ccdeeb8a3a
commit
fe5d1cd9dd
@ -1,44 +0,0 @@
|
|||||||
From: Kamal Mostafa <kamal@canonical.com>
|
|
||||||
To: Linux Kernel <linux-kernel@vger.kernel.org>,
|
|
||||||
intel-gfx@lists.freedesktop.org
|
|
||||||
Cc: Matthew Garrett <mjg@redhat.com>,
|
|
||||||
Keith Packard <keithp@keithp.com>,
|
|
||||||
Kamal Mostafa <kamal@canonical.com>
|
|
||||||
Subject: [PATCH] i915: do not setup intel_backlight twice
|
|
||||||
Date: Mon, 22 Aug 2011 12:39:10 -0700
|
|
||||||
Message-Id: <1314041950-12433-1-git-send-email-kamal@canonical.com>
|
|
||||||
X-Mailer: git-send-email 1.7.4.1
|
|
||||||
In-Reply-To: <20110817141010.GA21479@redhat.com>
|
|
||||||
References: <20110817141010.GA21479@redhat.com>
|
|
||||||
Sender: linux-kernel-owner@vger.kernel.org
|
|
||||||
Precedence: bulk
|
|
||||||
List-ID: <linux-kernel.vger.kernel.org>
|
|
||||||
X-Mailing-List: linux-kernel@vger.kernel.org
|
|
||||||
|
|
||||||
The commit "Not all systems expose a firmware or platform mechanism for
|
|
||||||
changing the backlight intensity on i915, so add native driver support"
|
|
||||||
adds calls to intel_panel_setup_backlight() from intel_{lvds,dp}_init
|
|
||||||
so do not call it again from intel_setup_outputs().
|
|
||||||
|
|
||||||
BugLink: http://bugs.launchpad.net/bugs/831542
|
|
||||||
|
|
||||||
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/i915/intel_display.c | 2 --
|
|
||||||
1 files changed, 0 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
index ee1d701..5a1ae9f 100644
|
|
||||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
@@ -7238,8 +7238,6 @@ static void intel_setup_outputs(struct drm_device *dev)
|
|
||||||
intel_encoder_clones(dev, encoder->clone_mask);
|
|
||||||
}
|
|
||||||
|
|
||||||
- intel_panel_setup_backlight(dev);
|
|
||||||
-
|
|
||||||
/* disable all the possible outputs/crtcs before entering KMS mode */
|
|
||||||
drm_helper_disable_unused_functions(dev);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.7.4.1
|
|
@ -82,9 +82,9 @@ Summary: The Linux kernel
|
|||||||
# The next upstream release sublevel (base_sublevel+1)
|
# The next upstream release sublevel (base_sublevel+1)
|
||||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||||
# The rc snapshot level
|
# The rc snapshot level
|
||||||
%define rcrev 3
|
%define rcrev 4
|
||||||
# The git snapshot level
|
# The git snapshot level
|
||||||
%define gitrev 6
|
%define gitrev 0
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%define rpmversion 3.%{upstream_sublevel}.0
|
%define rpmversion 3.%{upstream_sublevel}.0
|
||||||
%endif
|
%endif
|
||||||
@ -713,7 +713,6 @@ Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
|
|||||||
Patch12026: block-stray-block-put-after-teardown.patch
|
Patch12026: block-stray-block-put-after-teardown.patch
|
||||||
Patch12027: usb-add-quirk-for-logitech-webcams.patch
|
Patch12027: usb-add-quirk-for-logitech-webcams.patch
|
||||||
Patch12029: crypto-register-cryptd-first.patch
|
Patch12029: crypto-register-cryptd-first.patch
|
||||||
Patch12030: fix-intel-duplicate-backlight.patch
|
|
||||||
|
|
||||||
Patch12303: dmar-disable-when-ricoh-multifunction.patch
|
Patch12303: dmar-disable-when-ricoh-multifunction.patch
|
||||||
|
|
||||||
@ -1316,7 +1315,6 @@ ApplyPatch block-stray-block-put-after-teardown.patch
|
|||||||
ApplyPatch usb-add-quirk-for-logitech-webcams.patch
|
ApplyPatch usb-add-quirk-for-logitech-webcams.patch
|
||||||
|
|
||||||
ApplyPatch crypto-register-cryptd-first.patch
|
ApplyPatch crypto-register-cryptd-first.patch
|
||||||
ApplyPatch fix-intel-duplicate-backlight.patch
|
|
||||||
|
|
||||||
# rhbz#605888
|
# rhbz#605888
|
||||||
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
|
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
|
||||||
@ -2035,6 +2033,9 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 29 2011 Josh Boyer <jwboyer@redhat.com>
|
||||||
|
- Linux 3.1-rc4
|
||||||
|
|
||||||
* Sat Aug 27 2011 Dave Jones <davej@redhat.com>
|
* Sat Aug 27 2011 Dave Jones <davej@redhat.com>
|
||||||
- Fix get_gate_vma usage in i386 NX emulation
|
- Fix get_gate_vma usage in i386 NX emulation
|
||||||
- Bring back the 32bit mmap randomization patch for now.
|
- Bring back the 32bit mmap randomization patch for now.
|
||||||
|
Loading…
Reference in New Issue
Block a user