Merge remote-tracking branch 'origin/f27' into f27-user-thl-vanilla-fedora

3 files changed, 3 insertions, 211 deletions

diff --git a/0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch b/0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch
deleted file mode 100644
index 836ce5050..000000000
--- a/0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 61f007850bec83ef8b065c10833ad766a3b98d93 Mon Sep 17 00:00:00 2001
-From: Fedora Kernel Team <kernel-team@fedoraproject.org>
-Date: Mon, 8 Oct 2018 16:50:35 -0500
-Subject: [PATCH] Revert drm/amd/pp: Send khz clock values to DC for smu7/8, it
- shouldn't have been backported
-
----
- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 8 ++++----
- drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 6 +++---
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
-index 77779ad..f8e866c 100644
---- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
-+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
-@@ -4555,12 +4555,12 @@ static int smu7_get_sclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
- 			return -EINVAL;
- 		dep_sclk_table = table_info->vdd_dep_on_sclk;
- 		for (i = 0; i < dep_sclk_table->count; i++)
--			clocks->clock[i] = dep_sclk_table->entries[i].clk * 10;
-+			clocks->clock[i] = dep_sclk_table->entries[i].clk;
- 		clocks->count = dep_sclk_table->count;
- 	} else if (hwmgr->pp_table_version == PP_TABLE_V0) {
- 		sclk_table = hwmgr->dyn_state.vddc_dependency_on_sclk;
- 		for (i = 0; i < sclk_table->count; i++)
--			clocks->clock[i] = sclk_table->entries[i].clk * 10;
-+			clocks->clock[i] = sclk_table->entries[i].clk;
- 		clocks->count = sclk_table->count;
- 	}
-
-@@ -4592,7 +4592,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
- 			return -EINVAL;
- 		dep_mclk_table = table_info->vdd_dep_on_mclk;
- 		for (i = 0; i < dep_mclk_table->count; i++) {
--			clocks->clock[i] = dep_mclk_table->entries[i].clk * 10;
-+			clocks->clock[i] = dep_mclk_table->entries[i].clk;
- 			clocks->latency[i] = smu7_get_mem_latency(hwmgr,
- 						dep_mclk_table->entries[i].clk);
- 		}
-@@ -4600,7 +4600,7 @@ static int smu7_get_mclks(struct pp_hwmgr *hwmgr, struct amd_pp_clocks *clocks)
- 	} else if (hwmgr->pp_table_version == PP_TABLE_V0) {
- 		mclk_table = hwmgr->dyn_state.vddc_dependency_on_mclk;
- 		for (i = 0; i < mclk_table->count; i++)
--			clocks->clock[i] = mclk_table->entries[i].clk * 10;
-+			clocks->clock[i] = mclk_table->entries[i].clk;
- 		clocks->count = mclk_table->count;
- 	}
- 	return 0;
-diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
-index 0adfc53..617557b 100644
---- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
-+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c
-@@ -1605,17 +1605,17 @@ static int smu8_get_clock_by_type(struct pp_hwmgr *hwmgr, enum amd_pp_clock_type
- 	switch (type) {
- 	case amd_pp_disp_clock:
- 		for (i = 0; i < clocks->count; i++)
--			clocks->clock[i] = data->sys_info.display_clock[i] * 10;
-+			clocks->clock[i] = data->sys_info.display_clock[i];
- 		break;
- 	case amd_pp_sys_clock:
- 		table = hwmgr->dyn_state.vddc_dependency_on_sclk;
- 		for (i = 0; i < clocks->count; i++)
--			clocks->clock[i] = table->entries[i].clk * 10;
-+			clocks->clock[i] = table->entries[i].clk;
- 		break;
- 	case amd_pp_mem_clock:
- 		clocks->count = SMU8_NUM_NBPMEMORYCLOCK;
- 		for (i = 0; i < clocks->count; i++)
--			clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i] * 10;
-+			clocks->clock[i] = data->sys_info.nbp_memory_clock[clocks->count - 1 - i];
- 		break;
- 	default:
- 		return -1;
--- 
-2.17.1
-
diff --git a/HID-intel-ish-hid-Enable-Sunrise-Point-H-ish-driver.patch b/HID-intel-ish-hid-Enable-Sunrise-Point-H-ish-driver.patch
deleted file mode 100644
index 7057843a6..000000000
--- a/HID-intel-ish-hid-Enable-Sunrise-Point-H-ish-driver.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From patchwork Fri Aug 17 20:16:00 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Andreas Bosch <linux@progandy.de>
-X-Patchwork-Id: 10569347
-Return-Path: <linux-input-owner@kernel.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
-	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E901E14BD
-	for <patchwork-linux-input@patchwork.kernel.org>;
- Fri, 17 Aug 2018 20:16:47 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
-	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D84002BE82
-	for <patchwork-linux-input@patchwork.kernel.org>;
- Fri, 17 Aug 2018 20:16:47 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
-	id C8F6E2BE8A; Fri, 17 Aug 2018 20:16:47 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
-	pdx-wl-mail.web.codeaurora.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED,
-	MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham
- version=3.3.1
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
-	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DBD32BE82
-	for <patchwork-linux-input@patchwork.kernel.org>;
- Fri, 17 Aug 2018 20:16:47 +0000 (UTC)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
-        id S1725825AbeHQXV2 (ORCPT
-        <rfc822;patchwork-linux-input@patchwork.kernel.org>);
-        Fri, 17 Aug 2018 19:21:28 -0400
-Received: from mail-wr1-f67.google.com ([209.85.221.67]:32902 "EHLO
-        mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-        with ESMTP id S1726340AbeHQXVZ (ORCPT
-        <rfc822;linux-input@vger.kernel.org>);
-        Fri, 17 Aug 2018 19:21:25 -0400
-Received: by mail-wr1-f67.google.com with SMTP id v90-v6so4880416wrc.0
-        for <linux-input@vger.kernel.org>;
- Fri, 17 Aug 2018 13:16:38 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=progandy-de.20150623.gappssmtp.com; s=20150623;
-        h=sender:from:to:cc:subject:date:message-id:in-reply-to:references;
-        bh=IJ8EglotdUjsPKwO9B0Nmn/N9+EameltWUM77Dxy0M4=;
-        b=rt2hYKBNvjEXfrvbOuPP6QJ+KtXVW+4g54jRTTyzuiFqqE60M9kSFwnVvQaTHRtoUq
-         cH0uV9utBhoUsH2vVl0lUSUWZ/Hi/dPtBjIT3dbKIvIwbwb8lW73NpHbftVy9Y2G+aXc
-         SDy6R8DnjfcWOEmXG02pBnEOivsUhrnjRGUnjiPbhJXRpxo5S85ZCBWjVQeRRDgyS/Hq
-         xI/C8Kupmdlu8AnoQlSie1GoClanvZncA45wBGUcIje35FhwicTahs37ij4dOADrkdyC
-         BtJsqLCXgdVnIsI7xKxthlW1dT6hTm6J5M5sMYyQlOcHeyk0LtWhLui0W6Ic3Mtup4cA
-         C/wA==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=1e100.net; s=20161025;
-        h=x-gm-message-state:sender:from:to:cc:subject:date:message-id
-         :in-reply-to:references;
-        bh=IJ8EglotdUjsPKwO9B0Nmn/N9+EameltWUM77Dxy0M4=;
-        b=npuvfosGYdhu4I/kCuiJzBZZTOv5UN8fg69cS4ahQ2zvtqRKAgWSwDIaeJZeaxSHey
-         Vd2RWfK952o/Z/95sm+CvJ4o6FqNRHW7o4oiqPxoUN+ihfotfiMxGBxs08VPPj08tzOy
-         cigHD1fVZ2F+cJkQdj/FneSkwXWiy6CzHcqPLIytgv/l+HMixZbHTTUyOXbxJ1ySsjnm
-         qFXUAWA6zU6h67ulhIGCTWV42aMNBIpJ45vSJdQa02zvOU3zmFKkro57ns/IeQO80BwZ
-         ZeAH95swkPYydu/9KdDndUty2SyZWE/IWJp3YazyJpdwTd5oZdHzVisJDxRYVu+PHCT8
-         8N1A==
-X-Gm-Message-State: AOUpUlE0RNAbVUi/LSvupC7WR6/r+kPBbA+k4Bx2tii6smtZdqTW6umO
-        8IT5MRN5ae8CWhigs8hlXht+jA==
-X-Google-Smtp-Source: 
- AA+uWPytoFgGk+AfiVYYdyHHaj0W645JTX4kXrozV+emI3TVthEIgCXHU02g61rjPAf+BcuhfF6rUw==
-X-Received: by 2002:adf:ed41:: with SMTP id
- u1-v6mr23695053wro.262.1534536997694;
-        Fri, 17 Aug 2018 13:16:37 -0700 (PDT)
-Received: from pamobile.localdomain (p54A175A0.dip0.t-ipconnect.de.
- [84.161.117.160])
-        by smtp.gmail.com with ESMTPSA id
- u9-v6sm3124789wrc.43.2018.08.17.13.16.36
-        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
-        Fri, 17 Aug 2018 13:16:37 -0700 (PDT)
-From: Andreas Bosch <linux@progandy.de>
-Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
-        Jiri Kosina <jikos@kernel.org>,
-        Benjamin Tissoires <benjamin.tissoires@redhat.com>,
-        Even Xu <even.xu@intel.com>, linux-input@vger.kernel.org,
-        linux-kernel@vger.kernel.org
-Subject: [PATCH] HID: intel-ish-hid: Enable Sunrise Point-H ish driver
-Date: Fri, 17 Aug 2018 22:16:00 +0200
-Message-Id: <20180817201614.11971-1-linux@progandy.de>
-X-Mailer: git-send-email 2.18.0
-In-Reply-To: <23171b1a3740407eac5d5c22548ce107d8edde59.camel@linux.intel.com>
-References: <23171b1a3740407eac5d5c22548ce107d8edde59.camel@linux.intel.com>
-To: unlisted-recipients:; (no To-header on input)
-Sender: linux-input-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-input.vger.kernel.org>
-X-Mailing-List: linux-input@vger.kernel.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-Added PCI ID for Sunrise Point-H ISH.
-
-Signed-off-by: Andreas Bosch <linux@progandy.de>
-Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
----
-I hope this patch arrives correctly.
----
- drivers/hid/intel-ish-hid/ipc/hw-ish.h  | 1 +
- drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
-index 97869b7410eb..da133716bed0 100644
---- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h
-+++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
-@@ -29,6 +29,7 @@
- #define CNL_Ax_DEVICE_ID	0x9DFC
- #define GLK_Ax_DEVICE_ID	0x31A2
- #define CNL_H_DEVICE_ID		0xA37C
-+#define SPT_H_DEVICE_ID		0xA135
- 
- #define	REVISION_ID_CHT_A0	0x6
- #define	REVISION_ID_CHT_Ax_SI	0x0
-diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
-index a2c53ea3b5ed..c7b8eb32b1ea 100644
---- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
-+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
-@@ -38,6 +38,7 @@ static const struct pci_device_id ish_pci_tbl[] = {
- 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_Ax_DEVICE_ID)},
- 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)},
- 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)},
-+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)},
- 	{0, }
- };
- MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
diff --git a/kernel.spec b/kernel.spec
index fd7c0fa91..480bb00f5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -641,13 +641,6 @@ Patch504: xsa270.patch
 Patch506: 0001-random-add-a-config-option-to-trust-the-CPU-s-hwrng.patch
 Patch507: 0001-random-make-CPU-trust-a-boot-parameter.patch
 
-# rhbz 1634250
-Patch510: HID-intel-ish-hid-Enable-Sunrise-Point-H-ish-driver.patch
-
-#rhbz 1636249
-Patch511: 0001-Revert-drm-amd-pp-Send-khz-clock-values-to-DC-for-sm.patch
-
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1900,6 +1893,9 @@ fi
 #
 #
 %changelog
+* Wed Oct 10 2018 Laura Abbott <labbott@redhat.com> - 4.18.13-300
+- Linux v4.18.13
+
 * Mon Oct 08 2018 Justin M. Forbes <jforbes@fedoraproject.org>
 - Revert drm/amd/pp: Send khz clock values to DC for smu7/8 (rhbz 1636249)