diff options
| -rw-r--r-- | 0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch | 118 | ||||
| -rw-r--r-- | 0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch | 2 | ||||
| -rw-r--r-- | 0001-kms-Fix-regression-by-audio-component-transition.patch | 82 | ||||
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 6 insertions, 205 deletions
diff --git a/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch b/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch deleted file mode 100644 index 192dbaeec..000000000 --- a/0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jon Hunter <jonathanh@nvidia.com> -Date: Mon, 24 Feb 2020 14:07:48 +0000 -Subject: [PATCH] backlight: lp855x: Ensure regulators are disabled on probe - failure - -If probing the LP885x backlight fails after the regulators have been -enabled, then the following warning is seen when releasing the -regulators ... - - WARNING: CPU: 1 PID: 289 at drivers/regulator/core.c:2051 _regulator_put.part.28+0x158/0x160 - Modules linked in: tegra_xudc lp855x_bl(+) host1x pwm_tegra ip_tables x_tables ipv6 nf_defrag_ipv6 - CPU: 1 PID: 289 Comm: systemd-udevd Not tainted 5.6.0-rc2-next-20200224 #1 - Hardware name: NVIDIA Jetson TX1 Developer Kit (DT) - - ... - - Call trace: - _regulator_put.part.28+0x158/0x160 - regulator_put+0x34/0x50 - devm_regulator_release+0x10/0x18 - release_nodes+0x12c/0x230 - devres_release_all+0x34/0x50 - really_probe+0x1c0/0x370 - driver_probe_device+0x58/0x100 - device_driver_attach+0x6c/0x78 - __driver_attach+0xb0/0xf0 - bus_for_each_dev+0x68/0xc8 - driver_attach+0x20/0x28 - bus_add_driver+0x160/0x1f0 - driver_register+0x60/0x110 - i2c_register_driver+0x40/0x80 - lp855x_driver_init+0x20/0x1000 [lp855x_bl] - do_one_initcall+0x58/0x1a0 - do_init_module+0x54/0x1d0 - load_module+0x1d80/0x21c8 - __do_sys_finit_module+0xe8/0x100 - __arm64_sys_finit_module+0x18/0x20 - el0_svc_common.constprop.3+0xb0/0x168 - do_el0_svc+0x20/0x98 - el0_sync_handler+0xf4/0x1b0 - el0_sync+0x140/0x180 - -Fix this by ensuring that the regulators are disabled, if enabled, on -probe failure. - -Finally, ensure that the vddio regulator is disabled in the driver -remove handler. - -Signed-off-by: Jon Hunter <jonathanh@nvidia.com> -Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> ---- - drivers/video/backlight/lp855x_bl.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c -index f68920131a4a..e94932c69f54 100644 ---- a/drivers/video/backlight/lp855x_bl.c -+++ b/drivers/video/backlight/lp855x_bl.c -@@ -456,7 +456,7 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) - ret = regulator_enable(lp->enable); - if (ret < 0) { - dev_err(lp->dev, "failed to enable vddio: %d\n", ret); -- return ret; -+ goto disable_supply; - } - - /* -@@ -471,24 +471,34 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id) - ret = lp855x_configure(lp); - if (ret) { - dev_err(lp->dev, "device config err: %d", ret); -- return ret; -+ goto disable_vddio; - } - - ret = lp855x_backlight_register(lp); - if (ret) { - dev_err(lp->dev, - "failed to register backlight. err: %d\n", ret); -- return ret; -+ goto disable_vddio; - } - - ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group); - if (ret) { - dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret); -- return ret; -+ goto disable_vddio; - } - - backlight_update_status(lp->bl); -+ - return 0; -+ -+disable_vddio: -+ if (lp->enable) -+ regulator_disable(lp->enable); -+disable_supply: -+ if (lp->supply) -+ regulator_disable(lp->supply); -+ -+ return ret; - } - - static int lp855x_remove(struct i2c_client *cl) -@@ -497,6 +507,8 @@ static int lp855x_remove(struct i2c_client *cl) - - lp->bl->props.brightness = 0; - backlight_update_status(lp->bl); -+ if (lp->enable) -+ regulator_disable(lp->enable); - if (lp->supply) - regulator_disable(lp->supply); - sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group); --- -2.26.2 - diff --git a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch index 56a9fa2d0..aad7ef066 100644 --- a/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch +++ b/0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch @@ -88,9 +88,9 @@ index c48d8f086382..0fc980a87ed0 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -33,6 +33,7 @@ - #include <linux/workqueue.h> #include <linux/uuid.h> #include <linux/nospec.h> + #include <linux/vmalloc.h> +#include <linux/dmi.h> #define IPMI_DRIVER_VERSION "39.2" diff --git a/0001-kms-Fix-regression-by-audio-component-transition.patch b/0001-kms-Fix-regression-by-audio-component-transition.patch deleted file mode 100644 index 198e0be9e..000000000 --- a/0001-kms-Fix-regression-by-audio-component-transition.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 16 Apr 2020 09:54:28 +0200 -Subject: [PATCH] kms: Fix regression by audio component transition - -Since the commit 742db30c4ee6 ("drm/nouveau: Add HD-audio component -notifier support"), the nouveau driver notifies and pokes the HD-audio -HPD and ELD via audio component, but this seems broken. The culprit -is the naive assumption that crtc->index corresponds to the HDA pin. -Actually this rather corresponds to the MST dev_id (alias "pipe" in -the audio component framework) while the actual port number is given -from the output ior id number. - -This patch corrects the assignment of port and dev_id arguments in the -audio component ops to recover from the HDMI/DP audio regression. - -Fixes: 742db30c4ee6 ("drm/nouveau: Add HD-audio component notifier support") -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207223 -Cc: <stable@vger.kernel.org> -Signed-off-by: Takashi Iwai <tiwai@suse.de> -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- - drivers/gpu/drm/nouveau/dispnv50/disp.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c -index 6be9df1820c5..2625ed84fc44 100644 ---- a/drivers/gpu/drm/nouveau/dispnv50/disp.c -+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c -@@ -482,15 +482,16 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe) - * audio component binding for ELD notification - */ - static void --nv50_audio_component_eld_notify(struct drm_audio_component *acomp, int port) -+nv50_audio_component_eld_notify(struct drm_audio_component *acomp, int port, -+ int dev_id) - { - if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) - acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, -- port, -1); -+ port, dev_id); - } - - static int --nv50_audio_component_get_eld(struct device *kdev, int port, int pipe, -+nv50_audio_component_get_eld(struct device *kdev, int port, int dev_id, - bool *enabled, unsigned char *buf, int max_bytes) - { - struct drm_device *drm_dev = dev_get_drvdata(kdev); -@@ -506,7 +507,8 @@ nv50_audio_component_get_eld(struct device *kdev, int port, int pipe, - nv_encoder = nouveau_encoder(encoder); - nv_connector = nouveau_encoder_connector_get(nv_encoder); - nv_crtc = nouveau_crtc(encoder->crtc); -- if (!nv_connector || !nv_crtc || nv_crtc->index != port) -+ if (!nv_connector || !nv_crtc || nv_encoder->or != port || -+ nv_crtc->index != dev_id) - continue; - *enabled = drm_detect_monitor_audio(nv_connector->edid); - if (*enabled) { -@@ -600,7 +602,8 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) - - nvif_mthd(&disp->disp->object, 0, &args, sizeof(args)); - -- nv50_audio_component_eld_notify(drm->audio.component, nv_crtc->index); -+ nv50_audio_component_eld_notify(drm->audio.component, nv_encoder->or, -+ nv_crtc->index); - } - - static void -@@ -634,7 +637,8 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_display_mode *mode) - nvif_mthd(&disp->disp->object, 0, &args, - sizeof(args.base) + drm_eld_size(args.data)); - -- nv50_audio_component_eld_notify(drm->audio.component, nv_crtc->index); -+ nv50_audio_component_eld_notify(drm->audio.component, nv_encoder->or, -+ nv_crtc->index); - } - - /****************************************************************************** --- -2.26.2 - diff --git a/kernel.spec b/kernel.spec index 0f447d525..86406ba3b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -92,7 +92,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 6 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -813,7 +813,6 @@ Patch36: 0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch Patch37: 0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch Patch58: 0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch Patch59: 0001-ARM-tegra-usb-no-reset.patch -Patch60: 0001-backlight-lp855x-Ensure-regulators-are-disabled-on-p.patch Patch61: 0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch Patch62: 0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch Patch63: 0001-Drop-that-for-now.patch @@ -839,7 +838,6 @@ Patch84: 0001-device-rework-mmio-mapping-code-to-get-rid-of-second.patch Patch85: 0001-device-detect-if-changing-endianness-failed.patch Patch86: 0001-device-detect-vGPUs.patch Patch87: 0001-device-use-regular-PRI-accessors-in-chipset-detectio.patch -Patch88: 0001-kms-Fix-regression-by-audio-component-transition.patch Patch89: 0001-disp-nv50-increase-timeout-on-pio-channel-free-polli.patch Patch90: 0001-disp-hda-gt215-pass-head-to-nvkm_ior.hda.eld.patch Patch91: 0001-disp-hda-gf119-add-HAL-for-programming-device-entry-.patch @@ -2958,6 +2956,9 @@ fi # # %changelog +* Wed Jun 24 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.6-200 +- Linux v5.7.6 + * Mon Jun 22 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.7.5-200 - Linux v5.7.5 @@ -1,2 +1,2 @@ SHA512 (linux-5.7.tar.xz) = 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6 -SHA512 (patch-5.7.5.xz) = 1bd2edc70856d9661192f0857e90de5ba79cd01be2f360fba37f7886dae0a5ecbd93c0172d40d7e682aba48ef9b9ebbfd586f399187c15c794c08279970ca090 +SHA512 (patch-5.7.6.xz) = 9805544822c083a7a2806c25fec94b6f784071ec69ad3c852c39576a1a2ab7dc15c71b59d9e25abc6ac6cadfed8418f6a5871ea6e5c9b025c34c5cc9aa74862e |