From 7885dbca86b58e3bf039e132f21cdc0cb982ca27 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 22 Aug 2011 17:15:34 -0400 Subject: [PATCH] 3.1-rc3. Add patch to fix duplicate backlight registration on i915 --- btrfs-use-do_div.patch | 38 ------------------------- fix-intel-duplicate-backlight.patch | 44 +++++++++++++++++++++++++++++ kernel.spec | 14 +++++---- sources | 3 +- 4 files changed, 54 insertions(+), 45 deletions(-) delete mode 100644 btrfs-use-do_div.patch create mode 100644 fix-intel-duplicate-backlight.patch diff --git a/btrfs-use-do_div.patch b/btrfs-use-do_div.patch deleted file mode 100644 index e32907ddb..000000000 --- a/btrfs-use-do_div.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Liu Bo cn.fujitsu.com> -Subject: [PATCH] Btrfs: use do_div to avoid compile errors on 32bit box -Date: 2011-08-19 09:48:44 GMT (3 hours and 36 minutes ago) - -When doing div operation of u64 type, we need to be careful and use do_div -to avoid compile ERROR on 32bit box: - -"ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined! -make[1]: *** [__modpost] Error 1 - -Signed-off-by: Liu Bo cn.fujitsu.com> ---- - fs/btrfs/extent-tree.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c -index 80d6148..9b495ce 100644 ---- a/fs/btrfs/extent-tree.c -+++ b/fs/btrfs/extent-tree.c -@@ -6796,14 +6796,14 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr) - index = get_block_group_index(block_group); - if (index == 0) { - dev_min = 4; -- min_free /= 2; -+ do_div(min_free, 2); - } else if (index == 1) { - dev_min = 2; - } else if (index == 2) { - min_free *= 2; - } else if (index == 3) { - dev_min = fs_devices->rw_devices; -- min_free /= dev_min; -+ do_div(min_free, dev_min); - } - - mutex_lock(&root->fs_info->chunk_mutex); --- -1.6.5.2 diff --git a/fix-intel-duplicate-backlight.patch b/fix-intel-duplicate-backlight.patch new file mode 100644 index 000000000..c33e92ec2 --- /dev/null +++ b/fix-intel-duplicate-backlight.patch @@ -0,0 +1,44 @@ +From: Kamal Mostafa +To: Linux Kernel , + intel-gfx@lists.freedesktop.org +Cc: Matthew Garrett , + Keith Packard , + Kamal Mostafa +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: +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 +--- + 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 diff --git a/kernel.spec b/kernel.spec index bfa767391..9ae502c69 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 2 +%global baserelease 0 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -82,9 +82,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 2 +%define rcrev 3 # The git snapshot level -%define gitrev 7 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -719,7 +719,7 @@ Patch12025: rcu-avoid-just-onlined-cpu-resched.patch Patch12026: block-stray-block-put-after-teardown.patch Patch12027: usb-add-quirk-for-logitech-webcams.patch Patch12029: crypto-register-cryptd-first.patch -Patch12030: btrfs-use-do_div.patch +Patch12030: fix-intel-duplicate-backlight.patch # Runtime power management Patch12203: linux-2.6-usb-pci-autosuspend.patch @@ -1349,7 +1349,7 @@ ApplyPatch block-stray-block-put-after-teardown.patch ApplyPatch usb-add-quirk-for-logitech-webcams.patch ApplyPatch crypto-register-cryptd-first.patch -ApplyPatch btrfs-use-do_div.patch +ApplyPatch fix-intel-duplicate-backlight.patch # Runtime PM #ApplyPatch linux-2.6-usb-pci-autosuspend.patch @@ -2066,6 +2066,10 @@ fi # and build. %changelog +* Mon Aug 22 2011 Josh Boyer +- Linux 3.1-rc3 +- Add patch to fix duplicate backlight registration (rhbz 732202) + * Mon Aug 22 2011 Dave Jones - Avoid false quiescent states in rcutree with CONFIG_RCU_FAST_NO_HZ. (rhbz 577968) diff --git a/sources b/sources index c60442bdf..c733b510b 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 -f358c354ab6d3b0da1265b504f85ec50 patch-3.1-rc2.bz2 -a617a4b89580d5e4e5be5033f8c3285b patch-3.1-rc2-git7.bz2 +b9a15f79846c4d01fa3019a3112a8d04 patch-3.1-rc3.bz2