4.17-1
This commit is contained in:
Jan Alexander Steffens
parent
83b7319caf
commit
13f5fbf302
|
|
@ -1,8 +1,8 @@
|
|||
From ee91df95bf010fad44be5d2564e7d40038987f19 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
|
||||
From b7e3d341f20581dcd72d3640fa8f6f99fd766d21 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <b7e3d341f20581dcd72d3640fa8f6f99fd766d21.1528140572.git.jan.steffens@gmail.com>
|
||||
From: Serge Hallyn <serge.hallyn@canonical.com>
|
||||
Date: Fri, 31 May 2013 19:12:12 +0100
|
||||
Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by
|
||||
Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by
|
||||
default
|
||||
|
||||
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
|
||||
|
|
@ -15,7 +15,7 @@ Signed-off-by: Daniel Micay <danielmicay@gmail.com>
|
|||
3 files changed, 30 insertions(+)
|
||||
|
||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
||||
index e5d9d405ae4e..c4be89c51f25 100644
|
||||
index a5d21c42acfc..675eb3f3a1d1 100644
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -103,6 +103,11 @@
|
||||
|
|
@ -30,7 +30,7 @@ index e5d9d405ae4e..c4be89c51f25 100644
|
|||
|
||||
/*
|
||||
* Minimum number of threads to boot the kernel
|
||||
@@ -1591,6 +1596,10 @@ static __latent_entropy struct task_struct *copy_process(
|
||||
@@ -1592,6 +1597,10 @@ static __latent_entropy struct task_struct *copy_process(
|
||||
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ index e5d9d405ae4e..c4be89c51f25 100644
|
|||
/*
|
||||
* Thread groups must share signals as well, and detached threads
|
||||
* can only be started up within the thread group.
|
||||
@@ -2385,6 +2394,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
|
||||
@@ -2386,6 +2395,12 @@ int ksys_unshare(unsigned long unshare_flags)
|
||||
if (unshare_flags & CLONE_NEWNS)
|
||||
unshare_flags |= CLONE_FS;
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ index e5d9d405ae4e..c4be89c51f25 100644
|
|||
if (err)
|
||||
goto bad_unshare_out;
|
||||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
|
||||
index f98f28c12020..7256d339a32a 100644
|
||||
index 6a78cf70761d..35a1d24282f4 100644
|
||||
--- a/kernel/sysctl.c
|
||||
+++ b/kernel/sysctl.c
|
||||
@@ -105,6 +105,9 @@ extern int core_uses_pid;
|
||||
|
|
@ -68,7 +68,7 @@ index f98f28c12020..7256d339a32a 100644
|
|||
extern int pid_max;
|
||||
extern int pid_max_min, pid_max_max;
|
||||
extern int percpu_pagelist_fraction;
|
||||
@@ -515,6 +518,15 @@ static struct ctl_table kern_table[] = {
|
||||
@@ -519,6 +522,15 @@ static struct ctl_table kern_table[] = {
|
||||
.proc_handler = proc_dointvec,
|
||||
},
|
||||
#endif
|
||||
|
|
@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644
|
|||
static DEFINE_MUTEX(userns_state_mutex);
|
||||
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,125 +0,0 @@
|
|||
From f593e0bde601ff2b4f84b7363e4dfcbbda652e6d Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <f593e0bde601ff2b4f84b7363e4dfcbbda652e6d.1527290717.git.jan.steffens@gmail.com>
|
||||
In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
|
||||
References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
|
||||
From: Mika Westerberg <mika.westerberg@linux.intel.com>
|
||||
Date: Mon, 23 Apr 2018 14:16:03 +0300
|
||||
Subject: [PATCH 2/3] ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
|
||||
|
||||
WDAT table on Lenovo Z50-70 is using RTC SRAM (ports 0x70 and 0x71) to
|
||||
store state of the timer. This conflicts with Linux RTC driver
|
||||
(rtc-cmos.c) who fails to reserve those ports for itself preventing RTC
|
||||
from functioning. In addition the WDAT table seems not to be fully
|
||||
functional because it does not reset the system when the watchdog times
|
||||
out.
|
||||
|
||||
On this system iTCO_wdt works just fine so we simply prefer to use it
|
||||
instead of WDAT. This makes RTC working again and also results working
|
||||
watchdog via iTCO_wdt.
|
||||
|
||||
Reported-by: Peter Milley <pbmilley@gmail.com>
|
||||
Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033
|
||||
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
|
||||
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
||||
---
|
||||
drivers/acpi/acpi_watchdog.c | 59 ++++++++++++++++++++++++++++++------
|
||||
1 file changed, 49 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
|
||||
index ebb626ffb5fa..4bde16fb97d8 100644
|
||||
--- a/drivers/acpi/acpi_watchdog.c
|
||||
+++ b/drivers/acpi/acpi_watchdog.c
|
||||
@@ -12,41 +12,80 @@
|
||||
#define pr_fmt(fmt) "ACPI: watchdog: " fmt
|
||||
|
||||
#include <linux/acpi.h>
|
||||
+#include <linux/dmi.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
+static const struct dmi_system_id acpi_watchdog_skip[] = {
|
||||
+ {
|
||||
+ /*
|
||||
+ * On Lenovo Z50-70 there are two issues with the WDAT
|
||||
+ * table. First some of the instructions use RTC SRAM
|
||||
+ * to store persistent information. This does not work well
|
||||
+ * with Linux RTC driver. Second, more important thing is
|
||||
+ * that the instructions do not actually reset the system.
|
||||
+ *
|
||||
+ * On this particular system iTCO_wdt seems to work just
|
||||
+ * fine so we prefer that over WDAT for now.
|
||||
+ *
|
||||
+ * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033.
|
||||
+ */
|
||||
+ .ident = "Lenovo Z50-70",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "20354"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Z50-70"),
|
||||
+ },
|
||||
+ },
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
+static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void)
|
||||
+{
|
||||
+ const struct acpi_table_wdat *wdat = NULL;
|
||||
+ acpi_status status;
|
||||
+
|
||||
+ if (acpi_disabled)
|
||||
+ return NULL;
|
||||
+
|
||||
+ if (dmi_check_system(acpi_watchdog_skip))
|
||||
+ return NULL;
|
||||
+
|
||||
+ status = acpi_get_table(ACPI_SIG_WDAT, 0,
|
||||
+ (struct acpi_table_header **)&wdat);
|
||||
+ if (ACPI_FAILURE(status)) {
|
||||
+ /* It is fine if there is no WDAT */
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ return wdat;
|
||||
+}
|
||||
+
|
||||
/**
|
||||
* Returns true if this system should prefer ACPI based watchdog instead of
|
||||
* the native one (which are typically the same hardware).
|
||||
*/
|
||||
bool acpi_has_watchdog(void)
|
||||
{
|
||||
- struct acpi_table_header hdr;
|
||||
-
|
||||
- if (acpi_disabled)
|
||||
- return false;
|
||||
-
|
||||
- return ACPI_SUCCESS(acpi_get_table_header(ACPI_SIG_WDAT, 0, &hdr));
|
||||
+ return !!acpi_watchdog_get_wdat();
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(acpi_has_watchdog);
|
||||
|
||||
void __init acpi_watchdog_init(void)
|
||||
{
|
||||
const struct acpi_wdat_entry *entries;
|
||||
const struct acpi_table_wdat *wdat;
|
||||
struct list_head resource_list;
|
||||
struct resource_entry *rentry;
|
||||
struct platform_device *pdev;
|
||||
struct resource *resources;
|
||||
size_t nresources = 0;
|
||||
- acpi_status status;
|
||||
int i;
|
||||
|
||||
- status = acpi_get_table(ACPI_SIG_WDAT, 0,
|
||||
- (struct acpi_table_header **)&wdat);
|
||||
- if (ACPI_FAILURE(status)) {
|
||||
+ wdat = acpi_watchdog_get_wdat();
|
||||
+ if (!wdat) {
|
||||
/* It is fine if there is no WDAT */
|
||||
return;
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
|
@ -1,242 +0,0 @@
|
|||
From b7438d9dd645801027ab11470850033da0521338 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <b7438d9dd645801027ab11470850033da0521338.1527290717.git.jan.steffens@gmail.com>
|
||||
In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
|
||||
References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
|
||||
From: Jani Nikula <jani.nikula@intel.com>
|
||||
Date: Wed, 16 May 2018 11:01:10 +0300
|
||||
Subject: [PATCH 3/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP
|
||||
if available."
|
||||
|
||||
This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e.
|
||||
|
||||
Per the report, no matter what display mode you select with xrandr, the
|
||||
i915 driver will always select the alternate fixed mode. For the
|
||||
reporter this means that the display will always run at 40Hz which is
|
||||
quite annoying. This may be due to the mode comparison.
|
||||
|
||||
But there are some other potential issues. The choice of alt_fixed_mode
|
||||
seems dubious. It's the first non-preferred mode, but there are no
|
||||
guarantees that the only difference would be refresh rate. Similarly,
|
||||
there may be more than one preferred mode in the probed modes list, and
|
||||
the commit changes the preferred mode selection to choose the last one
|
||||
on the list instead of the first.
|
||||
|
||||
(Note that the probed modes list is the raw, unfiltered, unsorted list
|
||||
of modes from drm_add_edid_modes(), not the pretty result after a
|
||||
drm_helper_probe_single_connector_modes() call.)
|
||||
|
||||
Finally, we already have eerily similar code in place to find the
|
||||
downclock mode for DRRS that seems like could be reused here.
|
||||
|
||||
Back to the drawing board.
|
||||
|
||||
Note: This is a hand-crafted revert due to conflicts. If it fails to
|
||||
backport, please just try reverting the original commit directly.
|
||||
|
||||
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105469
|
||||
Reported-by: Rune Petersen <rune@megahurts.dk>
|
||||
Reported-by: Mark Spencer <n7u4722r35@ynzlx.anonbox.net>
|
||||
Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.")
|
||||
Cc: Clint Taylor <clinton.a.taylor@intel.com>
|
||||
Cc: David Weinehall <david.weinehall@linux.intel.com>
|
||||
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
|
||||
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
|
||||
Cc: Jani Nikula <jani.nikula@intel.com>
|
||||
Cc: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Cc: Jim Bride <jim.bride@linux.intel.com>
|
||||
Cc: Jani Nikula <jani.nikula@linux.intel.com>
|
||||
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
|
||||
Cc: intel-gfx@lists.freedesktop.org
|
||||
Cc: <stable@vger.kernel.org> # v4.14+
|
||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
||||
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
|
||||
Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani.nikula@intel.com
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_dp.c | 38 ++++--------------------------
|
||||
drivers/gpu/drm/i915/intel_drv.h | 2 --
|
||||
drivers/gpu/drm/i915/intel_dsi.c | 2 +-
|
||||
drivers/gpu/drm/i915/intel_dvo.c | 2 +-
|
||||
drivers/gpu/drm/i915/intel_lvds.c | 3 +--
|
||||
drivers/gpu/drm/i915/intel_panel.c | 6 -----
|
||||
6 files changed, 8 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
|
||||
index 79521da5d11d..de0d0f83551e 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_dp.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_dp.c
|
||||
@@ -1584,23 +1584,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,
|
||||
return bpp;
|
||||
}
|
||||
|
||||
-static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
|
||||
- struct drm_display_mode *m2)
|
||||
-{
|
||||
- bool bres = false;
|
||||
-
|
||||
- if (m1 && m2)
|
||||
- bres = (m1->hdisplay == m2->hdisplay &&
|
||||
- m1->hsync_start == m2->hsync_start &&
|
||||
- m1->hsync_end == m2->hsync_end &&
|
||||
- m1->htotal == m2->htotal &&
|
||||
- m1->vdisplay == m2->vdisplay &&
|
||||
- m1->vsync_start == m2->vsync_start &&
|
||||
- m1->vsync_end == m2->vsync_end &&
|
||||
- m1->vtotal == m2->vtotal);
|
||||
- return bres;
|
||||
-}
|
||||
-
|
||||
bool
|
||||
intel_dp_compute_config(struct intel_encoder *encoder,
|
||||
struct intel_crtc_state *pipe_config,
|
||||
@@ -1647,16 +1630,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
|
||||
pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON;
|
||||
|
||||
if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
|
||||
- struct drm_display_mode *panel_mode =
|
||||
- intel_connector->panel.alt_fixed_mode;
|
||||
- struct drm_display_mode *req_mode = &pipe_config->base.mode;
|
||||
-
|
||||
- if (!intel_edp_compare_alt_mode(req_mode, panel_mode))
|
||||
- panel_mode = intel_connector->panel.fixed_mode;
|
||||
-
|
||||
- drm_mode_debug_printmodeline(panel_mode);
|
||||
-
|
||||
- intel_fixed_panel_mode(panel_mode, adjusted_mode);
|
||||
+ intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
|
||||
+ adjusted_mode);
|
||||
|
||||
if (INTEL_GEN(dev_priv) >= 9) {
|
||||
int ret;
|
||||
@@ -5821,7 +5796,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
struct drm_connector *connector = &intel_connector->base;
|
||||
struct drm_display_mode *fixed_mode = NULL;
|
||||
- struct drm_display_mode *alt_fixed_mode = NULL;
|
||||
struct drm_display_mode *downclock_mode = NULL;
|
||||
bool has_dpcd;
|
||||
struct drm_display_mode *scan;
|
||||
@@ -5876,14 +5850,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
|
||||
}
|
||||
intel_connector->edid = edid;
|
||||
|
||||
- /* prefer fixed mode from EDID if available, save an alt mode also */
|
||||
+ /* prefer fixed mode from EDID if available */
|
||||
list_for_each_entry(scan, &connector->probed_modes, head) {
|
||||
if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {
|
||||
fixed_mode = drm_mode_duplicate(dev, scan);
|
||||
downclock_mode = intel_dp_drrs_init(
|
||||
intel_connector, fixed_mode);
|
||||
- } else if (!alt_fixed_mode) {
|
||||
- alt_fixed_mode = drm_mode_duplicate(dev, scan);
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5920,8 +5893,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
|
||||
pipe_name(pipe));
|
||||
}
|
||||
|
||||
- intel_panel_init(&intel_connector->panel, fixed_mode, alt_fixed_mode,
|
||||
- downclock_mode);
|
||||
+ intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
|
||||
intel_connector->panel.backlight.power = intel_edp_backlight_power;
|
||||
intel_panel_setup_backlight(connector, pipe);
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
|
||||
index 30f791f89d64..9b75b82a2956 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_drv.h
|
||||
+++ b/drivers/gpu/drm/i915/intel_drv.h
|
||||
@@ -264,7 +264,6 @@ struct intel_encoder {
|
||||
|
||||
struct intel_panel {
|
||||
struct drm_display_mode *fixed_mode;
|
||||
- struct drm_display_mode *alt_fixed_mode;
|
||||
struct drm_display_mode *downclock_mode;
|
||||
|
||||
/* backlight */
|
||||
@@ -1720,7 +1719,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv);
|
||||
/* intel_panel.c */
|
||||
int intel_panel_init(struct intel_panel *panel,
|
||||
struct drm_display_mode *fixed_mode,
|
||||
- struct drm_display_mode *alt_fixed_mode,
|
||||
struct drm_display_mode *downclock_mode);
|
||||
void intel_panel_fini(struct intel_panel *panel);
|
||||
void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
|
||||
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
|
||||
index f67d321376e4..551bf1c14093 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_dsi.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_dsi.c
|
||||
@@ -1851,7 +1851,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv)
|
||||
connector->display_info.width_mm = fixed_mode->width_mm;
|
||||
connector->display_info.height_mm = fixed_mode->height_mm;
|
||||
|
||||
- intel_panel_init(&intel_connector->panel, fixed_mode, NULL, NULL);
|
||||
+ intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
|
||||
intel_panel_setup_backlight(connector, INVALID_PIPE);
|
||||
|
||||
intel_dsi_add_properties(intel_connector);
|
||||
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
|
||||
index 754baa00bea9..05bd65e37cb5 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_dvo.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_dvo.c
|
||||
@@ -537,7 +537,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
|
||||
*/
|
||||
intel_panel_init(&intel_connector->panel,
|
||||
intel_dvo_get_current_mode(intel_encoder),
|
||||
- NULL, NULL);
|
||||
+ NULL);
|
||||
intel_dvo->panel_wants_dither = true;
|
||||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
|
||||
index 7ed6f7b69556..ab5a63f007eb 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_lvds.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_lvds.c
|
||||
@@ -1128,8 +1128,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
|
||||
out:
|
||||
mutex_unlock(&dev->mode_config.mutex);
|
||||
|
||||
- intel_panel_init(&intel_connector->panel, fixed_mode, NULL,
|
||||
- downclock_mode);
|
||||
+ intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
|
||||
intel_panel_setup_backlight(connector, INVALID_PIPE);
|
||||
|
||||
lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
|
||||
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
|
||||
index fa6831f8c004..c0ac6d6bf8ef 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_panel.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_panel.c
|
||||
@@ -1924,30 +1924,24 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
|
||||
|
||||
int intel_panel_init(struct intel_panel *panel,
|
||||
struct drm_display_mode *fixed_mode,
|
||||
- struct drm_display_mode *alt_fixed_mode,
|
||||
struct drm_display_mode *downclock_mode)
|
||||
{
|
||||
intel_panel_init_backlight_funcs(panel);
|
||||
|
||||
panel->fixed_mode = fixed_mode;
|
||||
- panel->alt_fixed_mode = alt_fixed_mode;
|
||||
panel->downclock_mode = downclock_mode;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void intel_panel_fini(struct intel_panel *panel)
|
||||
{
|
||||
struct intel_connector *intel_connector =
|
||||
container_of(panel, struct intel_connector, panel);
|
||||
|
||||
if (panel->fixed_mode)
|
||||
drm_mode_destroy(intel_connector->base.dev, panel->fixed_mode);
|
||||
|
||||
- if (panel->alt_fixed_mode)
|
||||
- drm_mode_destroy(intel_connector->base.dev,
|
||||
- panel->alt_fixed_mode);
|
||||
-
|
||||
if (panel->downclock_mode)
|
||||
drm_mode_destroy(intel_connector->base.dev,
|
||||
panel->downclock_mode);
|
||||
--
|
||||
2.17.0
|
||||
|
||||
29
PKGBUILD
29
PKGBUILD
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
pkgbase=linux # Build stock -ARCH kernel
|
||||
#pkgbase=linux-custom # Build kernel with a different name
|
||||
_srcname=linux-4.16
|
||||
pkgver=4.16.13
|
||||
pkgrel=2
|
||||
_srcname=linux-4.17
|
||||
pkgver=4.17
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
url="https://www.kernel.org/"
|
||||
license=('GPL2')
|
||||
|
|
@ -13,30 +13,26 @@ makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
|
|||
options=('!strip')
|
||||
source=(
|
||||
https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.{xz,sign}
|
||||
https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign}
|
||||
#https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign}
|
||||
config # the main kernel config file
|
||||
60-linux.hook # pacman hook for depmod
|
||||
90-linux.hook # pacman hook for initramfs regeneration
|
||||
linux.preset # standard config files for mkinitcpio ramdisk
|
||||
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
|
||||
0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
|
||||
0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
|
||||
0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
|
||||
)
|
||||
validpgpkeys=(
|
||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
|
||||
)
|
||||
sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
|
||||
sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13'
|
||||
'SKIP'
|
||||
'9efa0a74eb61240da53bd01a3a23759e0065811de53d22de7d679eabf847f323'
|
||||
'SKIP'
|
||||
'e39c02fd021f125a6202f7e4c0692dfd3ced93d404ecb6c8dca6994c8e17b227'
|
||||
'0269d9a56f0d0306c9bd5c179a7e32214b0a1c082d3bca581661203b27305f17'
|
||||
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
|
||||
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
|
||||
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
|
||||
'8d6a5f34b3d79e75b0cb888c6bcf293f84c5cbb2757f7bdadafee7e0ea77d7dd'
|
||||
'2454c1ee5e0f5aa119fafb4c8d3b402c5e4e10b2e868fe3e4ced3b1e2aa48446'
|
||||
'8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e')
|
||||
'0b77e6bef12735bc91e3f0e8232512e973688466f2e8a2c3a93502cb2d4b4eed'
|
||||
'92615acad59cbef9fd43b2710f5a77ffea45a86543ccff1b12eb676a9c8058cc')
|
||||
|
||||
_kernelname=${pkgbase#linux}
|
||||
: ${_kernelname:=-ARCH}
|
||||
|
|
@ -45,7 +41,7 @@ prepare() {
|
|||
cd ${_srcname}
|
||||
|
||||
# add upstream patch
|
||||
patch -p1 -i ../patch-${pkgver}
|
||||
#patch -p1 -i ../patch-${pkgver}
|
||||
|
||||
# add latest fixes from stable queue, if needed
|
||||
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||
|
|
@ -53,11 +49,8 @@ prepare() {
|
|||
# disable USER_NS for non-root users by default
|
||||
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
|
||||
|
||||
# https://bugs.archlinux.org/task/56780
|
||||
patch -Np1 -i ../0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
|
||||
|
||||
# https://bugs.archlinux.org/task/56711
|
||||
patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
|
||||
patch -Np1 -i ../0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
|
||||
|
||||
cat ../config - >.config <<END
|
||||
CONFIG_LOCALVERSION="${_kernelname}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue