Linux v3.14.12
This commit is contained in:
Josh Boyer
parent
69a3a75ac5
commit
24c69d188a
|
|
@ -1,43 +0,0 @@
|
|||
Bugzilla: 1106856
|
||||
Upstream-status: 3.16 and CC'd to stable
|
||||
|
||||
From 4adc9ea8915ff9904c3279b1b36478482d1c0825 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Czerner <lczerner@redhat.com>
|
||||
Date: Wed, 11 Jun 2014 12:28:43 -0400
|
||||
Subject: dm thin: update discard_granularity to reflect the thin-pool
|
||||
blocksize
|
||||
|
||||
DM thinp already checks whether the discard_granularity of the data
|
||||
device is a factor of the thin-pool block size. But when using the
|
||||
dm-thin-pool's discard passdown support, DM thinp was not selecting the
|
||||
max of the underlying data device's discard_granularity and the
|
||||
thin-pool's block size.
|
||||
|
||||
Update set_discard_limits() to set discard_granularity to the max of
|
||||
these values. This enables blkdev_issue_discard() to properly align the
|
||||
discards that are sent to the DM thin device on a full block boundary.
|
||||
As such each discard will now cover an entire DM thin-pool block and the
|
||||
block will be reclaimed.
|
||||
|
||||
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
|
||||
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
|
||||
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
|
||||
Cc: stable@vger.kernel.org
|
||||
|
||||
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
|
||||
index a0bdd56..fc9c848 100644
|
||||
--- a/drivers/md/dm-thin.c
|
||||
+++ b/drivers/md/dm-thin.c
|
||||
@@ -3094,7 +3094,8 @@ static void set_discard_limits(struct pool_c *pt, struct queue_limits *limits)
|
||||
*/
|
||||
if (pt->adjusted_pf.discard_passdown) {
|
||||
data_limits = &bdev_get_queue(pt->data_dev->bdev)->limits;
|
||||
- limits->discard_granularity = data_limits->discard_granularity;
|
||||
+ limits->discard_granularity = max(data_limits->discard_granularity,
|
||||
+ pool->sectors_per_block << SECTOR_SHIFT);
|
||||
} else
|
||||
limits->discard_granularity = pool->sectors_per_block << SECTOR_SHIFT;
|
||||
}
|
||||
--
|
||||
cgit v0.10.1
|
||||
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
Bugzilla: 1094066
|
||||
Upstream-status: Sent for 3.16 and CC'd to stable
|
||||
|
||||
Return-Path: intel-gfx-bounces@lists.freedesktop.org
|
||||
Received: from zmta02.collab.prod.int.phx2.redhat.com (LHLO
|
||||
zmta02.collab.prod.int.phx2.redhat.com) (10.5.81.9) by
|
||||
zmail15.collab.prod.int.phx2.redhat.com with LMTP; Mon, 9 Jun 2014 11:25:31
|
||||
-0400 (EDT)
|
||||
Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
|
||||
by zmta02.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 096281200BD;
|
||||
Mon, 9 Jun 2014 11:25:31 -0400 (EDT)
|
||||
Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.20])
|
||||
by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s59FPUv0027350;
|
||||
Mon, 9 Jun 2014 11:25:30 -0400
|
||||
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
|
||||
by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s59FPTet021179;
|
||||
Mon, 9 Jun 2014 11:25:29 -0400
|
||||
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
|
||||
by gabe.freedesktop.org (Postfix) with ESMTP id 7B8736E587;
|
||||
Mon, 9 Jun 2014 08:25:28 -0700 (PDT)
|
||||
X-Original-To: intel-gfx@lists.freedesktop.org
|
||||
Delivered-To: intel-gfx@lists.freedesktop.org
|
||||
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
|
||||
by gabe.freedesktop.org (Postfix) with ESMTP id D28006E587
|
||||
for <intel-gfx@lists.freedesktop.org>; Mon, 9 Jun 2014 08:25:27 -0700 (PDT)
|
||||
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
|
||||
by fmsmga102.fm.intel.com with ESMTP; 09 Jun 2014 08:24:37 -0700
|
||||
X-ExtLoop1: 1
|
||||
X-IronPort-AV: E=Sophos;i="4.98,1002,1392192000"; d="scan'208";a="552705861"
|
||||
Received: from jnikula-mobl1.fi.intel.com (HELO localhost) ([10.237.72.185])
|
||||
by fmsmga002.fm.intel.com with ESMTP; 09 Jun 2014 08:24:35 -0700
|
||||
From: Jani Nikula <jani.nikula@intel.com>
|
||||
To: intel-gfx@lists.freedesktop.org
|
||||
Date: Mon, 9 Jun 2014 18:24:34 +0300
|
||||
Message-Id: <1402327474-27930-1-git-send-email-jani.nikula@intel.com>
|
||||
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
|
||||
Cc: jani.nikula@intel.com, Marc Milgram <mmilgram@redhat.com>,
|
||||
Stable <stable@vger.kernel.org>, mcy@lm7.fr
|
||||
Subject: [Intel-gfx] [PATCH] drm/i915: set backlight duty cycle after
|
||||
backlight enable for gen4
|
||||
X-BeenThere: intel-gfx@lists.freedesktop.org
|
||||
X-Mailman-Version: 2.1.15
|
||||
Precedence: list
|
||||
List-Id: Intel graphics driver community testing & development
|
||||
<intel-gfx.lists.freedesktop.org>
|
||||
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
|
||||
<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
|
||||
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
|
||||
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
|
||||
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
|
||||
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
|
||||
<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="us-ascii"
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Errors-To: intel-gfx-bounces@lists.freedesktop.org
|
||||
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
|
||||
X-RedHat-Spam-Score: -5.25 (BAYES_00,DCC_REPUT_00_12,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,URIBL_BLOCKED)
|
||||
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26
|
||||
X-Scanned-By: MIMEDefang 2.68 on 10.5.110.20
|
||||
|
||||
For reasons I can't claim to fully understand gen4 seems to require
|
||||
backlight duty cycle setting after the backlight has been enabled, or
|
||||
else black screen follows. I don't have documentation for the correct
|
||||
sequence on gen4 either. Confirmed on Dell Latitude D630 and MacBook4,1.
|
||||
|
||||
This fixes a regression introduced by
|
||||
commit b35684b8fa94e04f55fd38bf672b737741d2f9e2
|
||||
Author: Jani Nikula <jani.nikula@intel.com>
|
||||
Date: Thu Nov 14 12:13:41 2013 +0200
|
||||
|
||||
drm/i915: do full backlight setup at enable time
|
||||
|
||||
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=75791
|
||||
Reported-and-tested-by: mcy@lm7.fr
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79423
|
||||
Reported-and-tested-by: Marc Milgram <mmilgram@redhat.com>
|
||||
Cc: Stable <stable@vger.kernel.org> # 3.14+
|
||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_panel.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
|
||||
index 5e6c888b4928..38a98570d10c 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_panel.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_panel.c
|
||||
@@ -798,9 +798,6 @@ static void i965_enable_backlight(struct intel_connector *connector)
|
||||
ctl = freq << 16;
|
||||
I915_WRITE(BLC_PWM_CTL, ctl);
|
||||
|
||||
- /* XXX: combine this into above write? */
|
||||
- intel_panel_actually_set_backlight(connector, panel->backlight.level);
|
||||
-
|
||||
ctl2 = BLM_PIPE(pipe);
|
||||
if (panel->backlight.combination_mode)
|
||||
ctl2 |= BLM_COMBINATION_MODE;
|
||||
@@ -809,6 +806,8 @@ static void i965_enable_backlight(struct intel_connector *connector)
|
||||
I915_WRITE(BLC_PWM_CTL2, ctl2);
|
||||
POSTING_READ(BLC_PWM_CTL2);
|
||||
I915_WRITE(BLC_PWM_CTL2, ctl2 | BLM_PWM_ENABLE);
|
||||
+
|
||||
+ intel_panel_actually_set_backlight(connector, panel->backlight.level);
|
||||
}
|
||||
|
||||
static void vlv_enable_backlight(struct intel_connector *connector)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
_______________________________________________
|
||||
Intel-gfx mailing list
|
||||
Intel-gfx@lists.freedesktop.org
|
||||
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
|
||||
17
kernel.spec
17
kernel.spec
|
|
@ -74,7 +74,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 11
|
||||
%define stable_update 12
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -748,16 +748,10 @@ Patch25087: jme-fix-dma-unmap-error.patch
|
|||
#rhbz 1051668
|
||||
Patch25092: Input-elantech-add-support-for-newer-elantech-touchpads.patch
|
||||
|
||||
#rhbz 1094066
|
||||
Patch25096: drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.patch
|
||||
|
||||
#rhbz 1064516
|
||||
Patch25097: e1000e-Fix-SHRA-register-access-for-82579.patch
|
||||
Patch25098: e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
|
||||
|
||||
#rhbz 1106856
|
||||
Patch25100: dm-thin-update-discard_granularity-to-reflect-the-thin-pool-blocksize.patch
|
||||
|
||||
Patch25102: intel_pstate-Fix-setting-VID.patch
|
||||
Patch25103: intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
|
||||
Patch25104: intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
|
||||
|
|
@ -1459,16 +1453,10 @@ ApplyPatch jme-fix-dma-unmap-error.patch
|
|||
#rhbz 1051668
|
||||
ApplyPatch Input-elantech-add-support-for-newer-elantech-touchpads.patch
|
||||
|
||||
#rhbz 1094066
|
||||
ApplyPatch drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.patch
|
||||
|
||||
#rhbz 1064516
|
||||
ApplyPatch e1000e-Fix-SHRA-register-access-for-82579.patch
|
||||
ApplyPatch e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
|
||||
|
||||
#rhbz 1106856
|
||||
ApplyPatch dm-thin-update-discard_granularity-to-reflect-the-thin-pool-blocksize.patch
|
||||
|
||||
ApplyPatch intel_pstate-Fix-setting-VID.patch
|
||||
ApplyPatch intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch
|
||||
ApplyPatch intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch
|
||||
|
|
@ -2291,6 +2279,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Mon Jul 14 2014 Josh Boyer <jwboyer@fedoraproject.rog> - 3.14.12-100
|
||||
- Linux v3.14.12
|
||||
|
||||
* Mon Jul 7 2014 Justin M. Forbes <jforbes@fedoraproject.org> - 3.14.11-100
|
||||
- Linux v3.14.11
|
||||
- Fixes CVE-2014-4715 (rhbz 1115767 1116362)
|
||||
|
|
|
|||
Loading…
Reference in New Issue