mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #759 from MilhouseVH/linux480
linux: Update to 4.8.1
This commit is contained in:
commit
4fab0660ea
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="ec63df1"
|
||||
PKG_VERSION="a021d6e"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
@ -0,0 +1,18 @@
|
||||
diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
|
||||
--- a/os_dep/linux/ioctl_cfg80211.c 2016-09-11 01:43:17.669610692 +0100
|
||||
+++ b/os_dep/linux/ioctl_cfg80211.c 2016-09-11 01:45:09.268139751 +0100
|
||||
@@ -1789,7 +1789,14 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = aborted
|
||||
+ };
|
||||
+ cfg80211_scan_done(pwdev_priv->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
|
||||
+#endif
|
||||
}
|
||||
|
||||
pwdev_priv->scan_request = NULL;
|
@ -0,0 +1,18 @@
|
||||
diff -Naur a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c
|
||||
--- a/os_dep/ioctl_cfg80211.c 2016-09-11 01:51:12.796375013 +0100
|
||||
+++ b/os_dep/ioctl_cfg80211.c 2016-09-11 01:52:39.942348529 +0100
|
||||
@@ -1425,7 +1425,14 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = aborted
|
||||
+ };
|
||||
+ cfg80211_scan_done(pwdev_priv->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
|
||||
+#endif
|
||||
}
|
||||
|
||||
pwdev_priv->scan_request = NULL;
|
@ -0,0 +1,18 @@
|
||||
diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
|
||||
--- a/os_dep/linux/ioctl_cfg80211.c 2016-09-11 01:54:30.184844740 +0100
|
||||
+++ b/os_dep/linux/ioctl_cfg80211.c 2016-09-11 01:55:58.426842518 +0100
|
||||
@@ -1891,7 +1891,14 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = aborted
|
||||
+ };
|
||||
+ cfg80211_scan_done(pwdev_priv->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
|
||||
+#endif
|
||||
}
|
||||
|
||||
pwdev_priv->scan_request = NULL;
|
@ -0,0 +1,18 @@
|
||||
diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
|
||||
--- a/os_dep/linux/ioctl_cfg80211.c 2016-09-11 01:57:03.868327247 +0100
|
||||
+++ b/os_dep/linux/ioctl_cfg80211.c 2016-09-11 01:58:00.381610662 +0100
|
||||
@@ -2019,7 +2019,14 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = aborted
|
||||
+ };
|
||||
+ cfg80211_scan_done(pwdev_priv->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(pwdev_priv->scan_request, aborted);
|
||||
+#endif
|
||||
}
|
||||
|
||||
pwdev_priv->scan_request = NULL;
|
@ -0,0 +1,96 @@
|
||||
diff -Naur a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
|
||||
--- a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c 2016-09-11 01:59:36.987804240 +0100
|
||||
+++ b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c 2016-09-11 02:02:44.876069294 +0100
|
||||
@@ -2387,7 +2387,14 @@
|
||||
|
||||
if (wl->scan_request) {
|
||||
WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = true
|
||||
+ };
|
||||
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(wl->scan_request, true);
|
||||
+#endif
|
||||
wl->scan_request = NULL;
|
||||
}
|
||||
|
||||
@@ -2488,7 +2495,14 @@
|
||||
|
||||
scan_done_out:
|
||||
if (wl->scan_request) {
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = false
|
||||
+ };
|
||||
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(wl->scan_request, false);
|
||||
+#endif
|
||||
wl->scan_request = NULL;
|
||||
}
|
||||
rtnl_unlock();
|
||||
@@ -2913,7 +2927,14 @@
|
||||
s32 err = 0;
|
||||
|
||||
if (wl->scan_request) {
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = true
|
||||
+ };
|
||||
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(wl->scan_request, true);
|
||||
+#endif
|
||||
wl->scan_request = NULL;
|
||||
}
|
||||
|
||||
diff -Naur a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
|
||||
--- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c 2016-09-11 01:59:50.796117742 +0100
|
||||
+++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c 2016-09-11 02:04:12.290053058 +0100
|
||||
@@ -2387,7 +2387,14 @@
|
||||
|
||||
if (wl->scan_request) {
|
||||
WL_DBG(("%s: Aborting scan\n", __FUNCTION__));
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = true
|
||||
+ };
|
||||
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(wl->scan_request, true);
|
||||
+#endif
|
||||
wl->scan_request = NULL;
|
||||
}
|
||||
|
||||
@@ -2488,7 +2495,14 @@
|
||||
|
||||
scan_done_out:
|
||||
if (wl->scan_request) {
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = false
|
||||
+ };
|
||||
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(wl->scan_request, false);
|
||||
+#endif
|
||||
wl->scan_request = NULL;
|
||||
}
|
||||
rtnl_unlock();
|
||||
@@ -2913,7 +2927,14 @@
|
||||
s32 err = 0;
|
||||
|
||||
if (wl->scan_request) {
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0)
|
||||
+ struct cfg80211_scan_info info = {
|
||||
+ .aborted = true
|
||||
+ };
|
||||
+ cfg80211_scan_done(wl->scan_request, &info);
|
||||
+#else
|
||||
cfg80211_scan_done(wl->scan_request, true);
|
||||
+#endif
|
||||
wl->scan_request = NULL;
|
||||
}
|
||||
|
@ -60,7 +60,7 @@ case "$LINUX" in
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="4.7.6"
|
||||
PKG_VERSION="4.8.1"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
esac
|
||||
|
@ -1,51 +0,0 @@
|
||||
From: cvh <namerp@googlemail.com>
|
||||
Date: Sun, 29 May 2016 23:00:40 +0200
|
||||
Subject: [PATCH] [media] Add support for Terratec Cinergy S2 Rev.3
|
||||
|
||||
---
|
||||
drivers/media/usb/dvb-usb/dw2102.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
|
||||
index 49b55d7..961f64e 100644
|
||||
--- a/drivers/media/usb/dvb-usb/dw2102.c
|
||||
+++ b/drivers/media/usb/dvb-usb/dw2102.c
|
||||
@@ -1641,6 +1641,7 @@ enum dw2102_table_entry {
|
||||
TEVII_S421,
|
||||
TEVII_S632,
|
||||
TERRATEC_CINERGY_S2_R2,
|
||||
+ TERRATEC_CINERGY_S2_R3,
|
||||
GOTVIEW_SAT_HD,
|
||||
GENIATECH_T220,
|
||||
TECHNOTREND_S2_4600,
|
||||
@@ -1669,6 +1670,7 @@ static struct usb_device_id dw2102_table[] = {
|
||||
[TEVII_S421] = {USB_DEVICE(0x9022, USB_PID_TEVII_S421)},
|
||||
[TEVII_S632] = {USB_DEVICE(0x9022, USB_PID_TEVII_S632)},
|
||||
[TERRATEC_CINERGY_S2_R2] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R2)},
|
||||
+ [TERRATEC_CINERGY_S2_R3] = {USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_S2_R3)},
|
||||
[GOTVIEW_SAT_HD] = {USB_DEVICE(0x1FE1, USB_PID_GOTVIEW_SAT_HD)},
|
||||
[GENIATECH_T220] = {USB_DEVICE(0x1f4d, 0xD220)},
|
||||
[TECHNOTREND_S2_4600] = {USB_DEVICE(USB_VID_TECHNOTREND,
|
||||
@@ -2083,7 +2085,7 @@ static struct dvb_usb_device_properties su3000_properties = {
|
||||
}},
|
||||
}
|
||||
},
|
||||
- .num_device_descs = 5,
|
||||
+ .num_device_descs = 6,
|
||||
.devices = {
|
||||
{ "SU3000HD DVB-S USB2.0",
|
||||
{ &dw2102_table[GENIATECH_SU3000], NULL },
|
||||
@@ -2101,6 +2103,10 @@ static struct dvb_usb_device_properties su3000_properties = {
|
||||
{ &dw2102_table[TERRATEC_CINERGY_S2_R2], NULL },
|
||||
{ NULL },
|
||||
},
|
||||
+ { "Terratec Cinergy S2 USB HD Rev.3",
|
||||
+ { &dw2102_table[TERRATEC_CINERGY_S2_R3], NULL },
|
||||
+ { NULL },
|
||||
+ },
|
||||
{ "GOTVIEW Satellite HD",
|
||||
{ &dw2102_table[GOTVIEW_SAT_HD], NULL },
|
||||
{ NULL },
|
||||
--
|
||||
2.7.4
|
||||
|
@ -1,51 +1,3 @@
|
||||
drivers/media/dvb-core/Makefile | 2 +-
|
||||
drivers/media/dvb-core/dvb_ca_en50221.c | 128 +-
|
||||
drivers/media/dvb-core/dvb_ca_en50221.h | 7 +
|
||||
drivers/media/dvb-core/dvb_frontend.c | 15 +
|
||||
drivers/media/dvb-core/dvb_frontend.h | 4 +
|
||||
drivers/media/dvb-core/dvb_netstream.c | 259 +
|
||||
drivers/media/dvb-core/dvb_netstream.h | 93 +
|
||||
drivers/media/dvb-core/dvbdev.c | 3 +-
|
||||
drivers/media/dvb-core/dvbdev.h | 4 +
|
||||
drivers/media/dvb-frontends/Kconfig | 41 +
|
||||
drivers/media/dvb-frontends/Makefile | 5 +
|
||||
drivers/media/dvb-frontends/cxd2843.c | 2063 ++++++++
|
||||
drivers/media/dvb-frontends/cxd2843.h | 30 +
|
||||
drivers/media/dvb-frontends/mxl5xx.c | 1738 +++++++
|
||||
drivers/media/dvb-frontends/mxl5xx.h | 39 +
|
||||
drivers/media/dvb-frontends/mxl5xx_defs.h | 818 ++++
|
||||
drivers/media/dvb-frontends/mxl5xx_regs.h | 941 ++++
|
||||
drivers/media/dvb-frontends/stv0367dd.c | 1874 +++++++
|
||||
drivers/media/dvb-frontends/stv0367dd.h | 31 +
|
||||
drivers/media/dvb-frontends/stv0367dd_regs.h | 3429 +++++++++++++
|
||||
drivers/media/dvb-frontends/stv0910.c | 1526 ++++++
|
||||
drivers/media/dvb-frontends/stv0910.h | 31 +
|
||||
drivers/media/dvb-frontends/stv0910_regs.h | 3997 +++++++++++++++
|
||||
drivers/media/dvb-frontends/stv6111.c | 684 +++
|
||||
drivers/media/dvb-frontends/stv6111.h | 20 +
|
||||
drivers/media/pci/ddbridge/Kconfig | 29 +-
|
||||
drivers/media/pci/ddbridge/Makefile | 4 +-
|
||||
drivers/media/pci/ddbridge/ddbridge-core.c | 5105 +++++++++++++++-----
|
||||
drivers/media/pci/ddbridge/ddbridge-i2c.c | 290 ++
|
||||
drivers/media/pci/ddbridge/ddbridge-i2c.h | 116 +
|
||||
drivers/media/pci/ddbridge/ddbridge-mod.c | 1118 +++++
|
||||
drivers/media/pci/ddbridge/ddbridge-ns.c | 491 ++
|
||||
drivers/media/pci/ddbridge/ddbridge-regs.h | 355 +-
|
||||
drivers/media/pci/ddbridge/ddbridge.c | 541 +++
|
||||
drivers/media/pci/ddbridge/ddbridge.h | 579 ++-
|
||||
drivers/media/pci/ddbridge/octonet.c | 262 +
|
||||
.../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 1 +
|
||||
drivers/media/tuners/tda18212.c | 5 +
|
||||
drivers/media/tuners/tda18212.h | 7 +
|
||||
drivers/media/usb/dvb-usb-v2/anysee.c | 2 +
|
||||
drivers/media/usb/em28xx/em28xx-dvb.c | 1 +
|
||||
drivers/staging/media/cxd2099/cxd2099.c | 234 +-
|
||||
drivers/staging/media/cxd2099/cxd2099.h | 6 +-
|
||||
include/uapi/linux/dvb/frontend.h | 7 +-
|
||||
include/uapi/linux/dvb/mod.h | 22 +
|
||||
include/uapi/linux/dvb/ns.h | 69 +
|
||||
46 files changed, 25615 insertions(+), 1411 deletions(-)
|
||||
|
||||
diff --git a/drivers/media/dvb-core/Makefile b/drivers/media/dvb-core/Makefile
|
||||
index 8f22bcd..5ff851a 100644
|
||||
--- a/drivers/media/dvb-core/Makefile
|
||||
@ -59,10 +11,10 @@ index 8f22bcd..5ff851a 100644
|
||||
|
||||
obj-$(CONFIG_DVB_CORE) += dvb-core.o
|
||||
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
|
||||
index f82cd1f..4849156 100644
|
||||
index b5b5b19..2cb8415 100644
|
||||
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
|
||||
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
|
||||
@@ -315,7 +315,7 @@ static int dvb_ca_en50221_link_init(struct dvb_ca_private *ca, int slot)
|
||||
@@ -344,7 +344,7 @@ static int dvb_ca_en50221_link_init(struct dvb_ca_private *ca, int slot)
|
||||
/* read the buffer size from the CAM */
|
||||
if ((ret = ca->pub->write_cam_control(ca->pub, slot, CTRLIF_COMMAND, IRQEN | CMDREG_SR)) != 0)
|
||||
return ret;
|
||||
@ -71,7 +23,7 @@ index f82cd1f..4849156 100644
|
||||
return ret;
|
||||
if ((ret = dvb_ca_en50221_read_data(ca, slot, buf, 2)) != 2)
|
||||
return -EIO;
|
||||
@@ -612,65 +612,78 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb
|
||||
@@ -641,65 +641,78 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb
|
||||
}
|
||||
}
|
||||
|
||||
@ -200,7 +152,7 @@ index f82cd1f..4849156 100644
|
||||
}
|
||||
|
||||
/* OK, add it to the receive buffer, or copy into external buffer if supplied */
|
||||
@@ -722,6 +735,9 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * b
|
||||
@@ -751,6 +764,9 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, u8 * b
|
||||
if (bytes_write > ca->slot_info[slot].link_buf_size)
|
||||
return -EINVAL;
|
||||
|
||||
@ -210,7 +162,7 @@ index f82cd1f..4849156 100644
|
||||
/* it is possible we are dealing with a single buffer implementation,
|
||||
thus if there is data available for read or if there is even a read
|
||||
already in progress, we do nothing but awake the kernel thread to
|
||||
@@ -1057,7 +1073,8 @@ static int dvb_ca_en50221_thread(void *data)
|
||||
@@ -1086,7 +1102,8 @@ static int dvb_ca_en50221_thread(void *data)
|
||||
|
||||
printk("dvb_ca adapter %d: Invalid PC card inserted :(\n",
|
||||
ca->dvbdev->adapter->num);
|
||||
@ -220,7 +172,7 @@ index f82cd1f..4849156 100644
|
||||
dvb_ca_en50221_thread_update_delay(ca);
|
||||
break;
|
||||
}
|
||||
@@ -1087,7 +1104,10 @@ static int dvb_ca_en50221_thread(void *data)
|
||||
@@ -1116,7 +1133,10 @@ static int dvb_ca_en50221_thread(void *data)
|
||||
if (time_after(jiffies, ca->slot_info[slot].timeout)) {
|
||||
printk("dvb_ca adapter %d: DVB CAM did not respond :(\n",
|
||||
ca->dvbdev->adapter->num);
|
||||
@ -232,7 +184,7 @@ index f82cd1f..4849156 100644
|
||||
dvb_ca_en50221_thread_update_delay(ca);
|
||||
break;
|
||||
}
|
||||
@@ -1113,7 +1133,7 @@ static int dvb_ca_en50221_thread(void *data)
|
||||
@@ -1142,7 +1162,7 @@ static int dvb_ca_en50221_thread(void *data)
|
||||
}
|
||||
|
||||
printk("dvb_ca adapter %d: DVB CAM link initialisation failed :(\n", ca->dvbdev->adapter->num);
|
||||
@ -267,10 +219,10 @@ index 1e4bbbd..056d10c 100644
|
||||
int (*slot_shutdown)(struct dvb_ca_en50221 *ca, int slot);
|
||||
int (*slot_ts_enable)(struct dvb_ca_en50221 *ca, int slot);
|
||||
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
|
||||
index c014261..6047f4f 100644
|
||||
index be99c8d..254f89d 100644
|
||||
--- a/drivers/media/dvb-core/dvb_frontend.c
|
||||
+++ b/drivers/media/dvb-core/dvb_frontend.c
|
||||
@@ -1019,6 +1019,7 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
|
||||
@@ -1037,6 +1037,7 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
|
||||
_DTV_CMD(DTV_STREAM_ID, 1, 0),
|
||||
_DTV_CMD(DTV_DVBT2_PLP_ID_LEGACY, 1, 0),
|
||||
_DTV_CMD(DTV_LNA, 1, 0),
|
||||
@ -278,7 +230,7 @@ index c014261..6047f4f 100644
|
||||
|
||||
/* Get */
|
||||
_DTV_CMD(DTV_DISEQC_SLAVE_REPLY, 0, 1),
|
||||
@@ -1449,6 +1450,14 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
|
||||
@@ -1467,6 +1468,14 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
|
||||
tvp->u.data = c->lna;
|
||||
break;
|
||||
|
||||
@ -293,7 +245,7 @@ index c014261..6047f4f 100644
|
||||
/* Fill quality measures */
|
||||
case DTV_STAT_SIGNAL_STRENGTH:
|
||||
tvp->u.st = c->strength;
|
||||
@@ -1884,6 +1893,12 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
|
||||
@@ -1902,6 +1911,12 @@ static int dtv_property_process_set(struct dvb_frontend *fe,
|
||||
c->lna = LNA_AUTO;
|
||||
break;
|
||||
|
||||
@ -307,10 +259,10 @@ index c014261..6047f4f 100644
|
||||
return -EINVAL;
|
||||
}
|
||||
diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h
|
||||
index 9592573..c93aff5 100644
|
||||
index fb6e848..3efb21b 100644
|
||||
--- a/drivers/media/dvb-core/dvb_frontend.h
|
||||
+++ b/drivers/media/dvb-core/dvb_frontend.h
|
||||
@@ -471,6 +471,7 @@ struct dvb_frontend_ops {
|
||||
@@ -452,6 +452,7 @@ struct dvb_frontend_ops {
|
||||
int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
|
||||
int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire);
|
||||
int (*set_lna)(struct dvb_frontend *);
|
||||
@ -318,7 +270,7 @@ index 9592573..c93aff5 100644
|
||||
|
||||
/*
|
||||
* These callbacks are for devices that implement their own
|
||||
@@ -483,6 +484,8 @@ struct dvb_frontend_ops {
|
||||
@@ -464,6 +465,8 @@ struct dvb_frontend_ops {
|
||||
|
||||
int (*set_property)(struct dvb_frontend* fe, struct dtv_property* tvp);
|
||||
int (*get_property)(struct dvb_frontend* fe, struct dtv_property* tvp);
|
||||
@ -327,7 +279,7 @@ index 9592573..c93aff5 100644
|
||||
};
|
||||
|
||||
#ifdef __DVB_CORE__
|
||||
@@ -632,6 +635,7 @@ struct dtv_frontend_properties {
|
||||
@@ -613,6 +616,7 @@ struct dtv_frontend_properties {
|
||||
u8 atscmh_sccc_code_mode_d;
|
||||
|
||||
u32 lna;
|
||||
@ -712,7 +664,7 @@ index 75a3f4b..3f309b4 100644
|
||||
};
|
||||
|
||||
#ifdef CONFIG_DVB_DYNAMIC_MINORS
|
||||
@@ -900,6 +900,7 @@ out:
|
||||
@@ -900,6 +900,7 @@ int dvb_usercopy(struct file *file,
|
||||
kfree(mbuf);
|
||||
return err;
|
||||
}
|
||||
@ -736,7 +688,7 @@ index 4aff7bd..ae4f4d1 100644
|
||||
#define DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr) \
|
||||
static short adapter_nr[] = \
|
||||
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
|
||||
index a82f77c..3692927 100644
|
||||
index c645aa8..f5ff222 100644
|
||||
--- a/drivers/media/dvb-frontends/Kconfig
|
||||
+++ b/drivers/media/dvb-frontends/Kconfig
|
||||
@@ -28,6 +28,14 @@ config DVB_STV090x
|
||||
@ -776,7 +728,7 @@ index a82f77c..3692927 100644
|
||||
config DVB_M88DS3103
|
||||
tristate "Montage Technology M88DS3103"
|
||||
depends on DVB_CORE && I2C && I2C_MUX
|
||||
@@ -81,6 +104,24 @@ config DVB_MN88473
|
||||
@@ -89,6 +112,24 @@ config DVB_MN88473
|
||||
help
|
||||
Say Y when you want to support this frontend.
|
||||
|
||||
@ -802,10 +754,10 @@ index a82f77c..3692927 100644
|
||||
depends on DVB_CORE
|
||||
|
||||
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
|
||||
index eb7191f..1749be8 100644
|
||||
index e90165a..d3fed98 100644
|
||||
--- a/drivers/media/dvb-frontends/Makefile
|
||||
+++ b/drivers/media/dvb-frontends/Makefile
|
||||
@@ -110,6 +110,11 @@ obj-$(CONFIG_DVB_CXD2820R) += cxd2820r.o
|
||||
@@ -111,6 +111,11 @@ obj-$(CONFIG_DVB_CXD2820R) += cxd2820r.o
|
||||
obj-$(CONFIG_DVB_CXD2841ER) += cxd2841er.o
|
||||
obj-$(CONFIG_DVB_DRXK) += drxk.o
|
||||
obj-$(CONFIG_DVB_TDA18271C2DD) += tda18271c2dd.o
|
||||
@ -2924,10 +2876,10 @@ index 0000000..2467a6b
|
||||
+#endif /* _CXD2843_H_ */
|
||||
diff --git a/drivers/media/dvb-frontends/mxl5xx.c b/drivers/media/dvb-frontends/mxl5xx.c
|
||||
new file mode 100644
|
||||
index 0000000..29bebed
|
||||
index 0000000..4413fd2
|
||||
--- /dev/null
|
||||
+++ b/drivers/media/dvb-frontends/mxl5xx.c
|
||||
@@ -0,0 +1,1738 @@
|
||||
@@ -0,0 +1,1749 @@
|
||||
+/*
|
||||
+ * Driver for the Maxlinear MX58x family of tuners/demods
|
||||
+ *
|
||||
@ -3382,53 +3334,6 @@ index 0000000..29bebed
|
||||
+ return stat;
|
||||
+}
|
||||
+
|
||||
+static int get_stats(struct dvb_frontend *fe);
|
||||
+
|
||||
+static int read_status(struct dvb_frontend *fe, enum fe_status *status)
|
||||
+{
|
||||
+ struct mxl *state = fe->demodulator_priv;
|
||||
+
|
||||
+ int stat;
|
||||
+ u32 regData = 0;
|
||||
+
|
||||
+ mutex_lock(&state->base->status_lock);
|
||||
+ HYDRA_DEMOD_STATUS_LOCK(state, state->demod);
|
||||
+ stat = read_register(state, (HYDRA_DMD_LOCK_STATUS_ADDR_OFFSET +
|
||||
+ HYDRA_DMD_STATUS_OFFSET(state->demod)),
|
||||
+ ®Data);
|
||||
+ HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod);
|
||||
+ mutex_unlock(&state->base->status_lock);
|
||||
+
|
||||
+ *status = (regData == 1) ? 0x1f : 0;
|
||||
+ get_stats(fe);
|
||||
+ return stat;
|
||||
+}
|
||||
+
|
||||
+static int tune(struct dvb_frontend *fe, bool re_tune,
|
||||
+ unsigned int mode_flags,
|
||||
+ unsigned int *delay, enum fe_status *status)
|
||||
+{
|
||||
+ struct mxl *state = fe->demodulator_priv;
|
||||
+ int r = 0;
|
||||
+
|
||||
+ *delay = HZ / 2;
|
||||
+ if (re_tune) {
|
||||
+ r = set_parameters(fe);
|
||||
+ if (r)
|
||||
+ return r;
|
||||
+ state->tune_time = jiffies;
|
||||
+ return 0;
|
||||
+ }
|
||||
+ if (*status & FE_HAS_LOCK)
|
||||
+ return 0;
|
||||
+
|
||||
+ r = read_status(fe, status);
|
||||
+ if (r)
|
||||
+ return r;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int enable_tuner(struct mxl *state, u32 tuner, u32 enable);
|
||||
+
|
||||
+static int sleep(struct dvb_frontend *fe)
|
||||
@ -3465,10 +3370,14 @@ index 0000000..29bebed
|
||||
+ ®Data);
|
||||
+ HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod);
|
||||
+ mutex_unlock(&state->base->status_lock);
|
||||
+ *snr = (s16) (regData & 0xFFFF); /* 100x dB */
|
||||
+
|
||||
+ p->cnr.len = 1;
|
||||
+ p->cnr.stat[0].scale = FE_SCALE_DECIBEL;
|
||||
+ p->cnr.stat[0].uvalue = 10 * (s64) *snr;
|
||||
+ p->cnr.stat[0].svalue = (s16)regData * 10;
|
||||
+
|
||||
+ if (regData > 2000) regData = 2000;
|
||||
+ *snr = (s16)(regData/10) * 328; /* 20dB = 100% */
|
||||
+
|
||||
+ return stat;
|
||||
+}
|
||||
+
|
||||
@ -3476,52 +3385,64 @@ index 0000000..29bebed
|
||||
+{
|
||||
+ struct mxl *state = fe->demodulator_priv;
|
||||
+ struct dtv_frontend_properties *p = &fe->dtv_property_cache;
|
||||
+ u32 reg[8], reg2[4];
|
||||
+ u32 reg[8];
|
||||
+ int stat;
|
||||
+
|
||||
+ *ber = 0;
|
||||
+ mutex_lock(&state->base->status_lock);
|
||||
+ HYDRA_DEMOD_STATUS_LOCK(state, state->demod);
|
||||
+ stat = read_register_block(state,
|
||||
+ (HYDRA_DMD_DVBS_1ST_CORR_RS_ERRORS_ADDR_OFFSET +
|
||||
+ HYDRA_DMD_STATUS_OFFSET(state->demod)),
|
||||
+ (4 * sizeof(u32)),
|
||||
+ (u8 *) ®[0]);
|
||||
+ HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod);
|
||||
+
|
||||
+ switch (p->delivery_system) {
|
||||
+ case SYS_DSS:
|
||||
+ case SYS_DVBS:
|
||||
+ p->pre_bit_error.len = 1;
|
||||
+ p->pre_bit_error.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->pre_bit_error.stat[0].uvalue = reg[2];
|
||||
+ p->pre_bit_count.len = 1;
|
||||
+ p->pre_bit_count.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->pre_bit_count.stat[0].uvalue = reg[3];
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ stat = read_register_block(state,
|
||||
+ (HYDRA_DMD_DVBS2_CRC_ERRORS_ADDR_OFFSET +
|
||||
+ HYDRA_DMD_STATUS_OFFSET(state->demod)),
|
||||
+ (7 * sizeof(u32)),
|
||||
+ (u8 *) ®[0]);
|
||||
+ stat = read_register_block(state,
|
||||
+ (HYDRA_DMD_DVBS_1ST_CORR_RS_ERRORS_ADDR_OFFSET +
|
||||
+ HYDRA_DMD_STATUS_OFFSET(state->demod)),
|
||||
+ (4 * sizeof(u32)),
|
||||
+ (u8 *) ®2[0]);
|
||||
+ HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod);
|
||||
+ mutex_unlock(&state->base->status_lock);
|
||||
+
|
||||
+
|
||||
+ switch (p->delivery_system) {
|
||||
+ case SYS_DSS:
|
||||
+ break;
|
||||
+ case SYS_DVBS:
|
||||
+ p->pre_bit_error.len = 1;
|
||||
+ p->pre_bit_error.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->pre_bit_error.stat[0].uvalue = reg[5];
|
||||
+ p->pre_bit_count.len = 1;
|
||||
+ p->pre_bit_count.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->pre_bit_count.stat[0].uvalue = reg[6] * 188 * 8;
|
||||
+ p->post_bit_error.len = 1;
|
||||
+ p->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->post_bit_error.stat[0].uvalue = reg[5];
|
||||
+ p->post_bit_count.len = 1;
|
||||
+ p->post_bit_count.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->post_bit_count.stat[0].uvalue = reg[6];
|
||||
+ break;
|
||||
+ case SYS_DVBS2:
|
||||
+ p->post_bit_error.len = 1;
|
||||
+ p->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->post_bit_error.stat[0].uvalue = reg[1];
|
||||
+ p->post_bit_count.len = 1;
|
||||
+ p->post_bit_count.stat[0].scale = FE_SCALE_COUNTER;
|
||||
+ p->post_bit_count.stat[0].uvalue = reg[2];
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ pr_debug("ber %08x %08x %08x %08x %08x %08x %08x\n",
|
||||
+ reg[0], reg[1], reg[2], reg[3], reg[4], reg[5], reg[6]);
|
||||
+ pr_debug("ber2 %08x %08x %08x %08x\n",
|
||||
+ reg[0], reg[1], reg[2], reg[3]);
|
||||
+ /*
|
||||
+ * pre_bit_error, pre_bit_count
|
||||
+ * post_bit_error, post_bit_count;
|
||||
+ * block_error block_count;
|
||||
+ * reset_fec_counter(state);
|
||||
+ */
|
||||
+
|
||||
+ *ber = p->post_bit_error.stat[0].uvalue;
|
||||
+
|
||||
+ mutex_unlock(&state->base->status_lock);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
@ -3539,10 +3460,12 @@ index 0000000..29bebed
|
||||
+ ®Data);
|
||||
+ HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod);
|
||||
+ mutex_unlock(&state->base->status_lock);
|
||||
+ *strength = (u16) (regData & 0xFFFF); /* 10x dBm */
|
||||
+
|
||||
+ p->strength.len = 1;
|
||||
+ p->strength.stat[0].scale = FE_SCALE_DECIBEL;
|
||||
+ p->strength.stat[0].uvalue = 10 * (s64) (s16) (regData & 0xFFFF);
|
||||
+ p->strength.stat[0].svalue = (s16)regData *10;
|
||||
+
|
||||
+ *strength = (100 + (s16)regData/100) * 656;
|
||||
+ return stat;
|
||||
+}
|
||||
+
|
||||
@ -3551,14 +3474,54 @@ index 0000000..29bebed
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int get_stats(struct dvb_frontend *fe)
|
||||
+static int read_status(struct dvb_frontend *fe, enum fe_status *status)
|
||||
+{
|
||||
+ u16 val;
|
||||
+ u32 val32;
|
||||
+ struct mxl *state = fe->demodulator_priv;
|
||||
+
|
||||
+ int stat;
|
||||
+ u32 regData = 0;
|
||||
+ u16 val;
|
||||
+
|
||||
+ mutex_lock(&state->base->status_lock);
|
||||
+ HYDRA_DEMOD_STATUS_LOCK(state, state->demod);
|
||||
+ stat = read_register(state, (HYDRA_DMD_LOCK_STATUS_ADDR_OFFSET +
|
||||
+ HYDRA_DMD_STATUS_OFFSET(state->demod)),
|
||||
+ ®Data);
|
||||
+ HYDRA_DEMOD_STATUS_UNLOCK(state, state->demod);
|
||||
+ mutex_unlock(&state->base->status_lock);
|
||||
+
|
||||
+ *status = (regData == 1) ? 0x1f : 0;
|
||||
+ read_signal_strength(fe, &val);
|
||||
+ read_snr(fe, &val);
|
||||
+ read_ber(fe, &val32);
|
||||
+ if (*status) {
|
||||
+ read_snr(fe, &val);
|
||||
+ read_ber(fe, ®Data);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int tune(struct dvb_frontend *fe, bool re_tune,
|
||||
+ unsigned int mode_flags,
|
||||
+ unsigned int *delay, enum fe_status *status)
|
||||
+{
|
||||
+ struct mxl *state = fe->demodulator_priv;
|
||||
+ int r = 0;
|
||||
+
|
||||
+ *delay = HZ / 2;
|
||||
+ if (re_tune) {
|
||||
+ r = set_parameters(fe);
|
||||
+ if (r)
|
||||
+ return r;
|
||||
+ state->tune_time = jiffies;
|
||||
+ return 0;
|
||||
+ }
|
||||
+ if (*status & FE_HAS_LOCK)
|
||||
+ return 0;
|
||||
+
|
||||
+ r = read_status(fe, status);
|
||||
+ if (r)
|
||||
+ return r;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
@ -18189,7 +18152,7 @@ index 7446c8b..28e89f0 100644
|
||||
ccflags-y += -Idrivers/media/dvb-core/
|
||||
ccflags-y += -Idrivers/media/dvb-frontends/
|
||||
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
|
||||
index 6e995ef..82c1938 100644
|
||||
index 47def73..82c1938 100644
|
||||
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
|
||||
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
|
||||
@@ -1,7 +1,10 @@
|
||||
@ -20069,7 +20032,7 @@ index 6e995ef..82c1938 100644
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -759,1000 +1576,3010 @@ static int start_feed(struct dvb_demux_feed *dvbdmxfeed)
|
||||
@@ -759,999 +1576,3010 @@ static int start_feed(struct dvb_demux_feed *dvbdmxfeed)
|
||||
{
|
||||
struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
|
||||
struct ddb_input *input = dvbdmx->priv;
|
||||
@ -23465,10 +23428,9 @@ index 6e995ef..82c1938 100644
|
||||
- if (pci_enable_device(pdev) < 0)
|
||||
- return -ENODEV;
|
||||
-
|
||||
- dev = vmalloc(sizeof(struct ddb));
|
||||
- dev = vzalloc(sizeof(struct ddb));
|
||||
- if (dev == NULL)
|
||||
- return -ENOMEM;
|
||||
- memset(dev, 0, sizeof(struct ddb));
|
||||
-
|
||||
- dev->pdev = pdev;
|
||||
- pci_set_drvdata(pdev, dev);
|
||||
@ -27881,7 +27843,7 @@ index ae917c0..02d22eb 100644
|
||||
|
||||
static struct cx24116_config anysee_cx24116_config = {
|
||||
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
|
||||
index 1a5c012..335d16a 100644
|
||||
index 8cedef0..7bc7778 100644
|
||||
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
|
||||
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
|
||||
@@ -376,6 +376,7 @@ static struct tda18271_config kworld_ub435q_v2_config = {
|
184
packages/linux/patches/4.8.1/linux-999-i915-Fix-random-GPU-hang-Bug-156851.patch
vendored
Normal file
184
packages/linux/patches/4.8.1/linux-999-i915-Fix-random-GPU-hang-Bug-156851.patch
vendored
Normal file
@ -0,0 +1,184 @@
|
||||
From patchwork Thu Sep 15 07:27:32 2016
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: DRM: i915: Fix random GPU hang, Bug 156851
|
||||
From: bobcao3 <bobcaocheng@163.com>
|
||||
X-Patchwork-Id: 9332989
|
||||
Message-Id: <20160915072732.11950-1-bobcaocheng@163.com>
|
||||
To: Daniel Vetter <daniel.vetter@intel.com>,
|
||||
Jani Nikula <jani.nikula@linux.intel.com>, David Airlie <airlied@linux.ie>
|
||||
Cc: Cheng Cao <bobcaocheng@163.com>, intel-gfx@lists.freedesktop.org,
|
||||
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
|
||||
Icenowy Zheng <icenowy@aosc.xyz>
|
||||
Date: Thu, 15 Sep 2016 15:27:32 +0800
|
||||
|
||||
Signed-off-by: Cheng Cao <bobcaocheng@163.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ++++
|
||||
drivers/gpu/drm/i915/i915_gem_stolen.c | 61 ++++++++++++++++-----------------
|
||||
drivers/gpu/drm/i915/i915_reg.h | 6 ++++
|
||||
drivers/gpu/drm/i915/intel_ringbuffer.c | 20 ++++++++++-
|
||||
4 files changed, 60 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
|
||||
index 7a30af7..0b05dd9 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
|
||||
@@ -2907,6 +2907,12 @@ static unsigned int gen8_get_total_gtt_size(u16 bdw_gmch_ctl)
|
||||
if (bdw_gmch_ctl > 4)
|
||||
bdw_gmch_ctl = 4;
|
||||
#endif
|
||||
+#ifdef CONFIG_X86_64
|
||||
+ /* Limit 64b platforms to a 4GB GGTT */
|
||||
+ /* DMA 4GB protection */
|
||||
+ if (bdw_gmch_ctl > 8)
|
||||
+ bdw_gmch_ctl = 8;
|
||||
+#endif
|
||||
|
||||
return bdw_gmch_ctl << 20;
|
||||
}
|
||||
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
|
||||
index 66be299a1..da272ae 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
|
||||
@@ -352,47 +352,44 @@ static void gen8_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
||||
unsigned long *base, unsigned long *size)
|
||||
{
|
||||
uint32_t reg_val = I915_READ(GEN6_STOLEN_RESERVED);
|
||||
+ unsigned long stolen_top;
|
||||
+ struct i915_ggtt *ggtt = &dev_priv->ggtt;
|
||||
|
||||
*base = reg_val & GEN6_STOLEN_RESERVED_ADDR_MASK;
|
||||
|
||||
switch (reg_val & GEN8_STOLEN_RESERVED_SIZE_MASK) {
|
||||
case GEN8_STOLEN_RESERVED_1M:
|
||||
- *size = 1024 * 1024;
|
||||
+ *size = 1 << 10 << 10;
|
||||
break;
|
||||
case GEN8_STOLEN_RESERVED_2M:
|
||||
- *size = 2 * 1024 * 1024;
|
||||
+ *size = 2 << 10 << 10;
|
||||
break;
|
||||
case GEN8_STOLEN_RESERVED_4M:
|
||||
- *size = 4 * 1024 * 1024;
|
||||
+ *size = 4 << 10 << 10;
|
||||
break;
|
||||
case GEN8_STOLEN_RESERVED_8M:
|
||||
- *size = 8 * 1024 * 1024;
|
||||
+ *size = 8 << 10 << 10;
|
||||
break;
|
||||
default:
|
||||
- *size = 8 * 1024 * 1024;
|
||||
- MISSING_CASE(reg_val & GEN8_STOLEN_RESERVED_SIZE_MASK);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void bdw_get_stolen_reserved(struct drm_i915_private *dev_priv,
|
||||
- unsigned long *base, unsigned long *size)
|
||||
-{
|
||||
- struct i915_ggtt *ggtt = &dev_priv->ggtt;
|
||||
- uint32_t reg_val = I915_READ(GEN6_STOLEN_RESERVED);
|
||||
- unsigned long stolen_top;
|
||||
+ /* Whatever if it is a BDW device or SKL device
|
||||
+ * Or others devices..
|
||||
+ * This way is always going to work on 5th
|
||||
+ * generation Intel Processer
|
||||
+ */
|
||||
+ stolen_top = dev_priv->mm.stolen_base + ggtt->stolen_size;
|
||||
|
||||
- stolen_top = dev_priv->mm.stolen_base + ggtt->stolen_size;
|
||||
+ *base = reg_val & GEN6_STOLEN_RESERVED_ADDR_MASK;
|
||||
|
||||
- *base = reg_val & GEN6_STOLEN_RESERVED_ADDR_MASK;
|
||||
+ /* MLIMIT - MBASE => PEG */
|
||||
+ /* -- mobile-5th-gen-core-family-datasheet-vol-2.pdf */
|
||||
+ if (*base == 0) {
|
||||
+ *size = 0;
|
||||
+ MISSING_CASE(reg_val & GEN8_STOLEN_RESERVED_SIZE_MASK);
|
||||
+ } else
|
||||
+ *size = stolen_top - *base;
|
||||
|
||||
- /* On these platforms, the register doesn't have a size field, so the
|
||||
- * size is the distance between the base and the top of the stolen
|
||||
- * memory. We also have the genuine case where base is zero and there's
|
||||
- * nothing reserved. */
|
||||
- if (*base == 0)
|
||||
- *size = 0;
|
||||
- else
|
||||
- *size = stolen_top - *base;
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
|
||||
int i915_gem_init_stolen(struct drm_device *dev)
|
||||
@@ -442,14 +439,14 @@ int i915_gem_init_stolen(struct drm_device *dev)
|
||||
gen7_get_stolen_reserved(dev_priv, &reserved_base,
|
||||
&reserved_size);
|
||||
break;
|
||||
+ case 8:
|
||||
+ gen8_get_stolen_reserved(dev_priv, &reserved_base,
|
||||
+ &reserved_size);
|
||||
+ break;
|
||||
default:
|
||||
- if (IS_BROADWELL(dev_priv) ||
|
||||
- IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev))
|
||||
- bdw_get_stolen_reserved(dev_priv, &reserved_base,
|
||||
- &reserved_size);
|
||||
- else
|
||||
- gen8_get_stolen_reserved(dev_priv, &reserved_base,
|
||||
- &reserved_size);
|
||||
+ // FIXME: This seemed like going to work
|
||||
+ gen8_get_stolen_reserved(dev_priv, &reserved_base,
|
||||
+ &reserved_size);
|
||||
break;
|
||||
}
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
|
||||
index bf2cad3..3dce37b 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_reg.h
|
||||
+++ b/drivers/gpu/drm/i915/i915_reg.h
|
||||
@@ -1748,6 +1748,12 @@ enum skl_disp_power_wells {
|
||||
#define RING_INDIRECT_CTX_OFFSET(base) _MMIO((base)+0x1c8) /* gen8+ */
|
||||
#define RING_CTX_TIMESTAMP(base) _MMIO((base)+0x3a8) /* gen8+ */
|
||||
|
||||
+// 64 bit, low 32 preserved
|
||||
+#define IOTLB_INVALID(base) _MMIO((base)+0x508 + 4) /* gen8+ */
|
||||
+#define IOTLB_INVALID_IVT (1<<31)
|
||||
+#define IOTLB_GLOBAL_INV_REQ (1<<28)
|
||||
+#define IOTLB_INVALID_IAIG (1<<25)
|
||||
+
|
||||
#define ERROR_GEN6 _MMIO(0x40a0)
|
||||
#define GEN7_ERR_INT _MMIO(0x44040)
|
||||
#define ERR_INT_POISON (1<<31)
|
||||
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
|
||||
index 1d3161b..84dafcb 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
|
||||
@@ -498,7 +498,25 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
|
||||
* arises: do we still need this and if so how should we go about
|
||||
* invalidating the TLB?
|
||||
*/
|
||||
- if (IS_GEN(dev_priv, 6, 7)) {
|
||||
+ /* Respond to this question:
|
||||
+ * According to mobile-5th-gen-core-family-datasheet-vol-2 from Intel
|
||||
+ * There are registers for invalidation, set those registers will
|
||||
+ * cause the hardware to perform IOTLB invalidation.
|
||||
+ */
|
||||
+ if (IS_GEN8(dev_priv)) {
|
||||
+ i915_reg_t reg = IOTLB_INVALID(engine->mmio_base);
|
||||
+
|
||||
+ /* ring should be idle before issuing a sync flush*/
|
||||
+ WARN_ON((I915_READ_MODE(engine) & MODE_IDLE) == 0);
|
||||
+
|
||||
+ I915_WRITE(reg, 0x0 | IOTLB_INVALID_IVT | IOTLB_GLOBAL_INV_REQ);
|
||||
+
|
||||
+ if (intel_wait_for_register(dev_priv,
|
||||
+ reg, IOTLB_INVALID_IAIG, 0,
|
||||
+ 1000))
|
||||
+ DRM_ERROR("%s: wait for TLB invalidation timed out\n",
|
||||
+ engine->name);
|
||||
+ } else if (IS_GEN(dev_priv, 6, 7)) {
|
||||
i915_reg_t reg = RING_INSTPM(engine->mmio_base);
|
||||
|
||||
/* ring should be idle before issuing a sync flush*/
|
113
packages/linux/patches/4.8.1/linux-999-i915-fixes-and-diagnostics-for-braswell.patch
vendored
Normal file
113
packages/linux/patches/4.8.1/linux-999-i915-fixes-and-diagnostics-for-braswell.patch
vendored
Normal file
@ -0,0 +1,113 @@
|
||||
From 0db9810b18ffc46709ad00831c426712d5489aea Mon Sep 17 00:00:00 2001
|
||||
From: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Date: Sat, 13 Aug 2016 21:32:17 +0100
|
||||
Subject: [PATCH 1/2] drm/i915: Show RPS autotuning thresholds along waitboost
|
||||
|
||||
---
|
||||
drivers/gpu/drm/i915/i915_debugfs.c | 62 +++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 62 insertions(+)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
|
||||
index 1035468..2cff44a 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_debugfs.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
|
||||
@@ -2434,6 +2434,68 @@ static int i915_rps_boost_info(struct seq_file *m, void *data)
|
||||
spin_unlock(&dev_priv->rps.client_lock);
|
||||
mutex_unlock(&dev->filelist_mutex);
|
||||
|
||||
+ if (INTEL_INFO(dev)->gen >= 6) {
|
||||
+ u32 rpmodectl, rpinclimit, rpdeclimit;
|
||||
+ u32 rpstat, cagf;
|
||||
+ u32 rpupei, rpcurup, rpprevup;
|
||||
+ u32 rpdownei, rpcurdown, rpprevdown;
|
||||
+
|
||||
+ intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
|
||||
+
|
||||
+ rpmodectl = I915_READ(GEN6_RP_CONTROL);
|
||||
+ rpinclimit = I915_READ(GEN6_RP_UP_THRESHOLD);
|
||||
+ rpdeclimit = I915_READ(GEN6_RP_DOWN_THRESHOLD);
|
||||
+
|
||||
+ rpstat = I915_READ(GEN6_RPSTAT1);
|
||||
+ rpupei = I915_READ(GEN6_RP_CUR_UP_EI) & GEN6_CURICONT_MASK;
|
||||
+ rpcurup = I915_READ(GEN6_RP_CUR_UP) & GEN6_CURBSYTAVG_MASK;
|
||||
+ rpprevup = I915_READ(GEN6_RP_PREV_UP) & GEN6_CURBSYTAVG_MASK;
|
||||
+ rpdownei = I915_READ(GEN6_RP_CUR_DOWN_EI) & GEN6_CURIAVG_MASK;
|
||||
+ rpcurdown = I915_READ(GEN6_RP_CUR_DOWN) & GEN6_CURBSYTAVG_MASK;
|
||||
+ rpprevdown = I915_READ(GEN6_RP_PREV_DOWN) & GEN6_CURBSYTAVG_MASK;
|
||||
+ intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
|
||||
+
|
||||
+ if (IS_GEN9(dev))
|
||||
+ cagf = (rpstat & GEN9_CAGF_MASK) >> GEN9_CAGF_SHIFT;
|
||||
+ else if (IS_HASWELL(dev) || IS_BROADWELL(dev))
|
||||
+ cagf = (rpstat & HSW_CAGF_MASK) >> HSW_CAGF_SHIFT;
|
||||
+ else
|
||||
+ cagf = (rpstat & GEN6_CAGF_MASK) >> GEN6_CAGF_SHIFT;
|
||||
+ cagf = intel_gpu_freq(dev_priv, cagf);
|
||||
+
|
||||
+
|
||||
+ seq_printf(m, "RP CUR UP EI: %d (%dus)\n",
|
||||
+ rpupei, GT_PM_INTERVAL_TO_US(dev_priv, rpupei));
|
||||
+ seq_printf(m, "RP CUR UP: %d (%dus)\n",
|
||||
+ rpcurup, GT_PM_INTERVAL_TO_US(dev_priv, rpcurup));
|
||||
+ seq_printf(m, "RP PREV UP: %d (%dus)\n",
|
||||
+ rpprevup, GT_PM_INTERVAL_TO_US(dev_priv, rpprevup));
|
||||
+ seq_printf(m, "Up threshold: %d%%\n",
|
||||
+ dev_priv->rps.up_threshold);
|
||||
+
|
||||
+ seq_printf(m, "RP CUR DOWN EI: %d (%dus)\n",
|
||||
+ rpdownei, GT_PM_INTERVAL_TO_US(dev_priv, rpdownei));
|
||||
+ seq_printf(m, "RP CUR DOWN: %d (%dus)\n",
|
||||
+ rpcurdown, GT_PM_INTERVAL_TO_US(dev_priv, rpcurdown));
|
||||
+ seq_printf(m, "RP PREV DOWN: %d (%dus)\n",
|
||||
+ rpprevdown, GT_PM_INTERVAL_TO_US(dev_priv, rpprevdown));
|
||||
+ seq_printf(m, "Down threshold: %d%%\n",
|
||||
+ dev_priv->rps.down_threshold);
|
||||
+
|
||||
+ seq_printf(m, "Current freq: %d MHz\n",
|
||||
+ intel_gpu_freq(dev_priv, dev_priv->rps.cur_freq));
|
||||
+ seq_printf(m, "Actual freq: %d MHz\n", cagf);
|
||||
+ seq_printf(m, "Idle freq: %d MHz\n",
|
||||
+ intel_gpu_freq(dev_priv, dev_priv->rps.idle_freq));
|
||||
+ seq_printf(m, "Min freq: %d MHz\n",
|
||||
+ intel_gpu_freq(dev_priv, dev_priv->rps.min_freq));
|
||||
+ seq_printf(m, "Max freq: %d MHz\n",
|
||||
+ intel_gpu_freq(dev_priv, dev_priv->rps.max_freq));
|
||||
+ seq_printf(m,
|
||||
+ "efficient (RPe) frequency: %d MHz\n",
|
||||
+ intel_gpu_freq(dev_priv, dev_priv->rps.efficient_freq));
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
From d77c081cd5ea0d278b314ee2043556d2bd9aacaf Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <peter.fruehberger@gmail.com>
|
||||
Date: Sat, 13 Aug 2016 22:56:37 +0200
|
||||
Subject: [PATCH 2/2] drm/i915: intel-pm enable thresholds
|
||||
|
||||
---
|
||||
drivers/gpu/drm/i915/intel_pm.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
|
||||
index 2863b92..f3aaef2 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_pm.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_pm.c
|
||||
@@ -4511,8 +4511,7 @@ static void valleyview_set_rps(struct drm_device *dev, u8 val)
|
||||
|
||||
if (val != dev_priv->rps.cur_freq) {
|
||||
vlv_punit_write(dev_priv, PUNIT_REG_GPU_FREQ_REQ, val);
|
||||
- if (!IS_CHERRYVIEW(dev_priv))
|
||||
- gen6_set_rps_thresholds(dev_priv, val);
|
||||
+ gen6_set_rps_thresholds(dev_priv, val);
|
||||
}
|
||||
|
||||
dev_priv->rps.cur_freq = val;
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
@ -1,32 +1,20 @@
|
||||
From 7fa7c0b24aa134d5fdb65dc2a984c734b499f70e Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <peter.fruehberger@gmail.com>
|
||||
Date: Sun, 29 Nov 2015 16:38:14 +0100
|
||||
Subject: [PATCH] Intel: Implement Video Color Range (testing)
|
||||
|
||||
---
|
||||
drivers/gpu/drm/i915/i915_drv.h | 1 +
|
||||
drivers/gpu/drm/i915/intel_drv.h | 8 ++++++++
|
||||
drivers/gpu/drm/i915/intel_hdmi.c | 17 +++++++++++++++--
|
||||
drivers/gpu/drm/i915/intel_modes.c | 1 +
|
||||
4 files changed, 25 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
|
||||
index a01e515..9e4b8d0 100644
|
||||
index f68c789..a6b6dfe 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_drv.h
|
||||
+++ b/drivers/gpu/drm/i915/i915_drv.h
|
||||
@@ -3450,6 +3450,7 @@ int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);
|
||||
@@ -3948,6 +3948,7 @@ __raw_write(64, q)
|
||||
#define INTEL_BROADCAST_RGB_AUTO 0
|
||||
#define INTEL_BROADCAST_RGB_FULL 1
|
||||
#define INTEL_BROADCAST_RGB_LIMITED 2
|
||||
+#define INTEL_BROADCAST_RGB_VIDEO 3
|
||||
|
||||
static inline uint32_t i915_vgacntrl_reg(struct drm_device *dev)
|
||||
static inline i915_reg_t i915_vgacntrl_reg(struct drm_device *dev)
|
||||
{
|
||||
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
|
||||
index f2a1142..210e7a7 100644
|
||||
index ff399b9..f2ac0ff 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_drv.h
|
||||
+++ b/drivers/gpu/drm/i915/intel_drv.h
|
||||
@@ -372,6 +372,13 @@ struct intel_crtc_state {
|
||||
@@ -522,6 +522,13 @@ struct intel_crtc_state {
|
||||
*/
|
||||
bool limited_color_range;
|
||||
|
||||
@ -37,11 +25,11 @@ index f2a1142..210e7a7 100644
|
||||
+ */
|
||||
+ bool video_color_range;
|
||||
+
|
||||
/* DP has a bunch of special case unfortunately, so mark the pipe
|
||||
* accordingly. */
|
||||
bool has_dp_encoder;
|
||||
@@ -682,6 +689,7 @@ struct intel_hdmi {
|
||||
int ddc_bus;
|
||||
/* Bitmask of encoder types (enum intel_output_type)
|
||||
* driven by the pipe.
|
||||
*/
|
||||
@@ -805,6 +812,7 @@ struct intel_hdmi {
|
||||
} dp_dual_mode;
|
||||
bool limited_color_range;
|
||||
bool color_range_auto;
|
||||
+ bool color_range_video;
|
||||
@ -49,10 +37,10 @@ index f2a1142..210e7a7 100644
|
||||
bool has_audio;
|
||||
enum hdmi_force_audio force_audio;
|
||||
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
index 81cdd9f..417f9be 100644
|
||||
index 4df9f38..8b64508 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
@@ -464,7 +464,8 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
|
||||
@@ -462,7 +462,8 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder,
|
||||
}
|
||||
|
||||
if (intel_hdmi->rgb_quant_range_selectable) {
|
||||
@ -62,16 +50,16 @@ index 81cdd9f..417f9be 100644
|
||||
frame.avi.quantization_range =
|
||||
HDMI_QUANTIZATION_RANGE_LIMITED;
|
||||
else
|
||||
@@ -1266,6 +1267,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
|
||||
@@ -1308,6 +1309,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
|
||||
pipe_config->limited_color_range =
|
||||
intel_hdmi->limited_color_range;
|
||||
}
|
||||
+ if (intel_hdmi->color_range_video)
|
||||
+ pipe_config->video_color_range = true;
|
||||
+ pipe_config->video_color_range = true;
|
||||
|
||||
if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK) {
|
||||
pipe_config->pixel_multiplier = 2;
|
||||
@@ -1485,25 +1488,35 @@ intel_hdmi_set_property(struct drm_connector *connector,
|
||||
@@ -1588,25 +1591,35 @@ intel_hdmi_set_property(struct drm_connector *connector,
|
||||
if (property == dev_priv->broadcast_rgb_property) {
|
||||
bool old_auto = intel_hdmi->color_range_auto;
|
||||
bool old_range = intel_hdmi->limited_color_range;
|
||||
@ -109,7 +97,7 @@ index 81cdd9f..417f9be 100644
|
||||
|
||||
goto done;
|
||||
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
|
||||
index 38a4c8c..c49681a 100644
|
||||
index f2584d0..5a6f853 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_modes.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_modes.c
|
||||
@@ -103,6 +103,7 @@ static const struct drm_prop_enum_list broadcast_rgb_names[] = {
|
||||
@ -120,5 +108,3 @@ index 38a4c8c..c49681a 100644
|
||||
};
|
||||
|
||||
void
|
||||
--
|
||||
2.5.0
|
138
packages/sysutils/lirc/patches/lirc-0006-kernel-4.8.patch
Normal file
138
packages/sysutils/lirc/patches/lirc-0006-kernel-4.8.patch
Normal file
@ -0,0 +1,138 @@
|
||||
From 31fcc8aa39f62c5cbf0e4af19d253764c905e4d4 Mon Sep 17 00:00:00 2001
|
||||
From: Alec Leamas <leamas.alec@gmail.com>
|
||||
Date: Fri, 19 Aug 2016 04:48:02 +0200
|
||||
Subject: [PATCH 1/2] lircd: Remove use of functions killed in kernel 4.8.0
|
||||
|
||||
From 4.8.0 the kernel no longer supports LIRC_NOTIFY_DECODE,
|
||||
LIRC_SETUP_START/LIRC_SETUP_END and several constants related
|
||||
to initiating filters. Remove corresponding calls from lircd.
|
||||
---
|
||||
daemons/lircd.cpp | 51 ++-------------------------------------------------
|
||||
lib/driver.h | 7 +++++++
|
||||
2 files changed, 9 insertions(+), 49 deletions(-)
|
||||
|
||||
diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
|
||||
index a7dbc94..a50d11f 100644
|
||||
--- a/daemons/lircd.cpp
|
||||
+++ b/daemons/lircd.cpp
|
||||
@@ -464,50 +464,6 @@ static int setup_timeout(void)
|
||||
}
|
||||
|
||||
|
||||
-static int setup_filter(void)
|
||||
-{
|
||||
- int ret1, ret2;
|
||||
- lirc_t min_pulse_supported = 0, max_pulse_supported = 0;
|
||||
- lirc_t min_space_supported = 0, max_space_supported = 0;
|
||||
-
|
||||
- if (!(curr_driver->features & LIRC_CAN_SET_REC_FILTER))
|
||||
- return 1;
|
||||
- if (curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_PULSE,
|
||||
- &min_pulse_supported) == -1 ||
|
||||
- curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_PULSE, &max_pulse_supported) == -1
|
||||
- || curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_SPACE, &min_space_supported) == -1
|
||||
- || curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_SPACE, &max_space_supported) == -1) {
|
||||
- log_error("could not get filter range");
|
||||
- log_perror_err(__func__);
|
||||
- }
|
||||
-
|
||||
- if (setup_min_pulse > max_pulse_supported)
|
||||
- setup_min_pulse = max_pulse_supported;
|
||||
- else if (setup_min_pulse < min_pulse_supported)
|
||||
- setup_min_pulse = 0; /* disable filtering */
|
||||
-
|
||||
- if (setup_min_space > max_space_supported)
|
||||
- setup_min_space = max_space_supported;
|
||||
- else if (setup_min_space < min_space_supported)
|
||||
- setup_min_space = 0; /* disable filtering */
|
||||
-
|
||||
- ret1 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_PULSE, &setup_min_pulse);
|
||||
- ret2 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_SPACE, &setup_min_space);
|
||||
- if (ret1 == -1 || ret2 == -1) {
|
||||
- if (curr_driver->
|
||||
- drvctl_func(LIRC_SET_REC_FILTER,
|
||||
- setup_min_pulse < setup_min_space ? &setup_min_pulse : &setup_min_space) == -1) {
|
||||
- log_error("could not set filter");
|
||||
- log_perror_err(__func__);
|
||||
- return 0;
|
||||
- }
|
||||
- }
|
||||
- return 1;
|
||||
-}
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
static int setup_hardware(void)
|
||||
{
|
||||
int ret = 1;
|
||||
@@ -516,10 +472,7 @@ static int setup_hardware(void)
|
||||
if ((curr_driver->features & LIRC_CAN_SET_REC_CARRIER)
|
||||
|| (curr_driver->features & LIRC_CAN_SET_REC_TIMEOUT)
|
||||
|| (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) {
|
||||
- (void)curr_driver->drvctl_func(LIRC_SETUP_START, NULL);
|
||||
- ret = setup_frequency() && setup_timeout()
|
||||
- && setup_filter();
|
||||
- (void)curr_driver->drvctl_func(LIRC_SETUP_END, NULL);
|
||||
+ ret = setup_frequency() && setup_timeout();
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
@@ -2162,7 +2115,7 @@ void loop(void)
|
||||
int reps;
|
||||
|
||||
if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE))
|
||||
- curr_driver->drvctl_func(LIRC_NOTIFY_DECODE, NULL);
|
||||
+ curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE, NULL);
|
||||
|
||||
get_release_data(&remote_name, &button_name, &reps);
|
||||
|
||||
diff --git a/lib/driver.h b/lib/driver.h
|
||||
index c7c4a6a..fc7318e 100644
|
||||
--- a/lib/driver.h
|
||||
+++ b/lib/driver.h
|
||||
@@ -97,6 +97,13 @@ int drv_handle_options(const char* options);
|
||||
/** drvctl cmd: Free memory in argument obtained using DRVCTL_GET_DEVICES. */
|
||||
#define DRVCTL_FREE_DEVICES 6
|
||||
|
||||
+/**
|
||||
+ * The former LIRC_NOTIFY_DECODE, informs drier that signal is successfully
|
||||
+ * decoded e. g., to initiate some visual feedback through a LED.
|
||||
+ */
|
||||
+
|
||||
+#define DRVCTL_NOTIFY_DECODE 7
|
||||
+
|
||||
/** Last well-known command. Remaining is used in driver-specific controls.*/
|
||||
#define DRVCTL_MAX 128
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
From 55cd30e16a46bde49ccbbce1dea8bc734362170d Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Fri, 30 Sep 2016 01:53:50 +0100
|
||||
Subject: [PATCH 2/2] build hack
|
||||
|
||||
Hack to build with 4.8 backport above. Including "driver.h"
|
||||
isn't enough, but this works. Can all be dropped once lirc
|
||||
0.9.5 is released.
|
||||
---
|
||||
daemons/lircd.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
|
||||
index a50d11f..8b46bc0 100644
|
||||
--- a/daemons/lircd.cpp
|
||||
+++ b/daemons/lircd.cpp
|
||||
@@ -71,6 +71,7 @@
|
||||
#endif
|
||||
|
||||
#include "lirc_private.h"
|
||||
+#define DRVCTL_NOTIFY_DECODE 7
|
||||
|
||||
#ifdef HAVE_INT_GETGROUPLIST_GROUPS
|
||||
#define lirc_gid int
|
||||
--
|
||||
2.7.4
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="ec63df1"
|
||||
PKG_VERSION="a021d6e"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
@ -0,0 +1,49 @@
|
||||
diff -Naur a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
|
||||
--- a/kernel/nvidia-drm/nvidia-drm-drv.c 2016-07-12 00:53:45.000000000 -0400
|
||||
+++ b/kernel/nvidia-drm/nvidia-drm-drv.c 2016-08-03 20:19:16.536783934 -0400
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "nvidia-drm-ioctl.h"
|
||||
|
||||
#include <drm/drmP.h>
|
||||
+#include <drm/drm_auth.h>
|
||||
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
|
||||
@@ -419,7 +420,7 @@
|
||||
|
||||
static
|
||||
void nvidia_drm_master_drop(struct drm_device *dev,
|
||||
- struct drm_file *file_priv, bool from_release)
|
||||
+ struct drm_file *file_priv)
|
||||
{
|
||||
struct nvidia_drm_device *nv_dev = dev->dev_private;
|
||||
int ret;
|
||||
@@ -452,7 +453,7 @@
|
||||
mutex_lock(&dev->master_mutex);
|
||||
|
||||
if (!file_priv->is_master ||
|
||||
- !file_priv->minor->master)
|
||||
+ !file_priv->minor->dev->master)
|
||||
{
|
||||
goto done;
|
||||
}
|
||||
@@ -473,7 +474,7 @@
|
||||
* NVKMS modeset ownership, because nvidia_drm_master_set()'s call to
|
||||
* grabOwnership() will fail.
|
||||
*/
|
||||
- drm_master_put(&file_priv->minor->master);
|
||||
+ drm_master_put(&file_priv->minor->dev->master);
|
||||
file_priv->is_master = 0;
|
||||
|
||||
ret = 0;
|
||||
diff -Naur a/kernel/nvidia-drm/nvidia-drm-modeset.c b/kernel/nvidia-drm/nvidia-drm-modeset.c
|
||||
--- a/kernel/nvidia-drm/nvidia-drm-modeset.c 2016-07-12 00:53:45.000000000 -0400
|
||||
+++ b/kernel/nvidia-drm/nvidia-drm-modeset.c 2016-08-03 20:14:18.058238340 -0400
|
||||
@@ -675,7 +675,7 @@
|
||||
goto failed;
|
||||
}
|
||||
|
||||
- drm_atomic_helper_swap_state(dev, state);
|
||||
+ drm_atomic_helper_swap_state(state, async);
|
||||
|
||||
nvidia_drm_update_head_mode_config(state, requested_config);
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.7.4 Kernel Configuration
|
||||
# Linux/x86_64 4.8.1 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
@ -38,7 +38,6 @@ CONFIG_AUDIT_ARCH=y
|
||||
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
|
||||
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
|
||||
CONFIG_X86_64_SMP=y
|
||||
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
@ -234,6 +233,7 @@ CONFIG_SLUB_DEBUG=y
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
# CONFIG_SLOB is not set
|
||||
# CONFIG_SLAB_FREELIST_RANDOM is not set
|
||||
CONFIG_SLUB_CPU_PARTIAL=y
|
||||
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
|
||||
# CONFIG_PROFILING is not set
|
||||
@ -274,11 +274,14 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
|
||||
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_GCC_PLUGINS=y
|
||||
# CONFIG_GCC_PLUGINS is not set
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
# CONFIG_CC_STACKPROTECTOR is not set
|
||||
CONFIG_CC_STACKPROTECTOR_NONE=y
|
||||
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
|
||||
# CONFIG_CC_STACKPROTECTOR_STRONG is not set
|
||||
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
|
||||
CONFIG_HAVE_CONTEXT_TRACKING=y
|
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
||||
@ -502,6 +505,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
||||
CONFIG_TRANSPARENT_HUGEPAGE=y
|
||||
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
|
||||
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
|
||||
CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
|
||||
CONFIG_CLEANCACHE=y
|
||||
# CONFIG_FRONTSWAP is not set
|
||||
# CONFIG_CMA is not set
|
||||
@ -597,6 +601,7 @@ CONFIG_ACPI_VIDEO=y
|
||||
CONFIG_ACPI_FAN=y
|
||||
# CONFIG_ACPI_DOCK is not set
|
||||
CONFIG_ACPI_CPU_FREQ_PSS=y
|
||||
CONFIG_ACPI_PROCESSOR_CSTATE=y
|
||||
CONFIG_ACPI_PROCESSOR_IDLE=y
|
||||
CONFIG_ACPI_PROCESSOR=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
@ -604,6 +609,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
|
||||
CONFIG_ACPI_THERMAL=y
|
||||
CONFIG_ACPI_NUMA=y
|
||||
# CONFIG_ACPI_CUSTOM_DSDT is not set
|
||||
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
|
||||
CONFIG_ACPI_TABLE_UPGRADE=y
|
||||
# CONFIG_ACPI_DEBUG is not set
|
||||
# CONFIG_ACPI_PCI_SLOT is not set
|
||||
@ -619,7 +625,9 @@ CONFIG_ACPI_HOTPLUG_IOAPIC=y
|
||||
CONFIG_HAVE_ACPI_APEI=y
|
||||
CONFIG_HAVE_ACPI_APEI_NMI=y
|
||||
# CONFIG_ACPI_APEI is not set
|
||||
# CONFIG_DPTF_POWER is not set
|
||||
# CONFIG_PMIC_OPREGION is not set
|
||||
# CONFIG_ACPI_CONFIGFS is not set
|
||||
# CONFIG_SFI is not set
|
||||
|
||||
#
|
||||
@ -1028,6 +1036,7 @@ CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_HSR is not set
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
# CONFIG_NET_L3_MASTER_DEV is not set
|
||||
# CONFIG_NET_NCSI is not set
|
||||
CONFIG_RPS=y
|
||||
CONFIG_RFS_ACCEL=y
|
||||
CONFIG_XPS=y
|
||||
@ -1214,7 +1223,6 @@ CONFIG_BLK_DEV_NVME=y
|
||||
# CONFIG_ISL29003 is not set
|
||||
# CONFIG_ISL29020 is not set
|
||||
# CONFIG_SENSORS_TSL2550 is not set
|
||||
# CONFIG_SENSORS_BH1780 is not set
|
||||
# CONFIG_SENSORS_BH1770 is not set
|
||||
# CONFIG_SENSORS_APDS990X is not set
|
||||
# CONFIG_HMC6352 is not set
|
||||
@ -1285,8 +1293,7 @@ CONFIG_ALTERA_STAPL=m
|
||||
# CONFIG_GENWQE is not set
|
||||
# CONFIG_ECHO is not set
|
||||
# CONFIG_CXL_BASE is not set
|
||||
# CONFIG_CXL_KERNEL_API is not set
|
||||
# CONFIG_CXL_EEH is not set
|
||||
# CONFIG_CXL_AFU_DRIVER_OPS is not set
|
||||
CONFIG_HAVE_IDE=y
|
||||
# CONFIG_IDE is not set
|
||||
|
||||
@ -1683,6 +1690,7 @@ CONFIG_REALTEK_PHY=y
|
||||
# CONFIG_MDIO_OCTEON is not set
|
||||
# CONFIG_MDIO_THUNDER is not set
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
# CONFIG_INTEL_XWAY_PHY is not set
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
@ -2072,6 +2080,9 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
|
||||
# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2004 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2007 is not set
|
||||
# CONFIG_TOUCHSCREEN_RM_TS is not set
|
||||
# CONFIG_TOUCHSCREEN_SILEAD is not set
|
||||
# CONFIG_TOUCHSCREEN_SIS_I2C is not set
|
||||
CONFIG_TOUCHSCREEN_ST1232=m
|
||||
# CONFIG_TOUCHSCREEN_SUR40 is not set
|
||||
# CONFIG_TOUCHSCREEN_SX8654 is not set
|
||||
@ -2215,6 +2226,7 @@ CONFIG_I2C_MUX=m
|
||||
# CONFIG_I2C_MUX_PINCTRL is not set
|
||||
# CONFIG_I2C_MUX_REG is not set
|
||||
CONFIG_I2C_HELPER_AUTO=y
|
||||
CONFIG_I2C_SMBUS=y
|
||||
CONFIG_I2C_ALGOBIT=y
|
||||
|
||||
#
|
||||
@ -2322,7 +2334,6 @@ CONFIG_PINCTRL_BAYTRAIL=y
|
||||
CONFIG_PINCTRL_CHERRYVIEW=y
|
||||
# CONFIG_PINCTRL_BROXTON is not set
|
||||
# CONFIG_PINCTRL_SUNRISEPOINT is not set
|
||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_DEVRES=y
|
||||
CONFIG_GPIO_ACPI=y
|
||||
@ -2369,14 +2380,12 @@ CONFIG_GPIOLIB_IRQCHIP=y
|
||||
#
|
||||
# CONFIG_GPIO_AMD8111 is not set
|
||||
# CONFIG_GPIO_BT8XX is not set
|
||||
# CONFIG_GPIO_INTEL_MID is not set
|
||||
# CONFIG_GPIO_ML_IOH is not set
|
||||
# CONFIG_GPIO_RDC321X is not set
|
||||
|
||||
#
|
||||
# SPI or I2C GPIO expanders
|
||||
#
|
||||
# CONFIG_GPIO_MCP23S08 is not set
|
||||
|
||||
#
|
||||
# USB GPIO expanders
|
||||
@ -2499,6 +2508,7 @@ CONFIG_SENSORS_IT87=m
|
||||
# CONFIG_PMBUS is not set
|
||||
# CONFIG_SENSORS_SHT15 is not set
|
||||
# CONFIG_SENSORS_SHT21 is not set
|
||||
# CONFIG_SENSORS_SHT3x is not set
|
||||
# CONFIG_SENSORS_SHTC1 is not set
|
||||
# CONFIG_SENSORS_SIS5595 is not set
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
@ -2516,6 +2526,7 @@ CONFIG_SENSORS_IT87=m
|
||||
# CONFIG_SENSORS_AMC6821 is not set
|
||||
# CONFIG_SENSORS_INA209 is not set
|
||||
# CONFIG_SENSORS_INA2XX is not set
|
||||
# CONFIG_SENSORS_INA3221 is not set
|
||||
# CONFIG_SENSORS_TC74 is not set
|
||||
# CONFIG_SENSORS_THMC50 is not set
|
||||
# CONFIG_SENSORS_TMP102 is not set
|
||||
@ -2644,7 +2655,6 @@ CONFIG_MFD_RTSX_PCI=y
|
||||
# CONFIG_MFD_RT5033 is not set
|
||||
CONFIG_MFD_RTSX_USB=y
|
||||
# CONFIG_MFD_RC5T583 is not set
|
||||
# CONFIG_MFD_RN5T618 is not set
|
||||
# CONFIG_MFD_SEC_CORE is not set
|
||||
# CONFIG_MFD_SI476X_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
@ -3049,6 +3059,8 @@ CONFIG_DVB_M88DS3103=m
|
||||
CONFIG_DVB_DRXK=m
|
||||
CONFIG_DVB_TDA18271C2DD=m
|
||||
CONFIG_DVB_SI2165=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
CONFIG_DVB_MN88473=m
|
||||
CONFIG_DVB_STV0367DD=m
|
||||
CONFIG_DVB_CXD2843=m
|
||||
|
||||
@ -3196,7 +3208,6 @@ CONFIG_DRM_TTM=y
|
||||
#
|
||||
# I2C encoder or helper chips
|
||||
#
|
||||
# CONFIG_DRM_I2C_ADV7511 is not set
|
||||
# CONFIG_DRM_I2C_CH7006 is not set
|
||||
# CONFIG_DRM_I2C_SIL164 is not set
|
||||
# CONFIG_DRM_I2C_NXP_TDA998X is not set
|
||||
@ -3219,6 +3230,7 @@ CONFIG_DRM_AMD_ACP=y
|
||||
CONFIG_DRM_I915=y
|
||||
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
||||
CONFIG_DRM_I915_USERPTR=y
|
||||
# CONFIG_DRM_I915_GVT is not set
|
||||
|
||||
#
|
||||
# drm/i915 Debugging
|
||||
@ -3530,7 +3542,10 @@ CONFIG_SND_SST_IPC_ACPI=m
|
||||
CONFIG_SND_SOC_INTEL_SST=m
|
||||
CONFIG_SND_SOC_INTEL_SST_ACPI=m
|
||||
CONFIG_SND_SOC_INTEL_SST_MATCH=m
|
||||
# CONFIG_SND_SOC_INTEL_HASWELL_MACH is not set
|
||||
# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
|
||||
# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
|
||||
# CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||
# CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
|
||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
|
||||
@ -3544,6 +3559,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
|
||||
# Allwinner SoC Audio support
|
||||
#
|
||||
# CONFIG_SND_SUN4I_CODEC is not set
|
||||
# CONFIG_SND_SUN4I_I2S is not set
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
|
||||
@ -3552,12 +3568,15 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
#
|
||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
# CONFIG_SND_SOC_ADAU7002 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
# CONFIG_SND_SOC_ALC5623 is not set
|
||||
# CONFIG_SND_SOC_BT_SCO is not set
|
||||
# CONFIG_SND_SOC_CS35L32 is not set
|
||||
# CONFIG_SND_SOC_CS35L33 is not set
|
||||
# CONFIG_SND_SOC_CS42L51_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
@ -3567,10 +3586,13 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_ES8328 is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
CONFIG_SND_SOC_MAX98090=m
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
# CONFIG_SND_SOC_PCM179X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM3168A_I2C is not set
|
||||
@ -3616,7 +3638,9 @@ CONFIG_SND_SOC_TS3A227E=m
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8974 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_WM8985 is not set
|
||||
# CONFIG_SND_SOC_TPA6130A2 is not set
|
||||
CONFIG_SND_SIMPLE_CARD_UTILS=m
|
||||
CONFIG_SND_SIMPLE_CARD=m
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_AC97_BUS=m
|
||||
@ -3667,6 +3691,7 @@ CONFIG_HID_GYRATION=y
|
||||
CONFIG_HID_TWINHAN=y
|
||||
CONFIG_HID_KENSINGTON=y
|
||||
CONFIG_HID_LCPOWER=y
|
||||
# CONFIG_HID_LED is not set
|
||||
CONFIG_HID_LENOVO=y
|
||||
CONFIG_HID_LOGITECH=y
|
||||
CONFIG_HID_LOGITECH_DJ=y
|
||||
@ -3678,7 +3703,7 @@ CONFIG_LOGIWHEELS_FF=y
|
||||
# CONFIG_HID_MAGICMOUSE is not set
|
||||
CONFIG_HID_MICROSOFT=y
|
||||
CONFIG_HID_MONTEREY=y
|
||||
# CONFIG_HID_MULTITOUCH is not set
|
||||
CONFIG_HID_MULTITOUCH=m
|
||||
# CONFIG_HID_NTRIG is not set
|
||||
CONFIG_HID_ORTEK=y
|
||||
CONFIG_HID_OUYA=y
|
||||
@ -3712,6 +3737,7 @@ CONFIG_HID_XINMO=y
|
||||
# CONFIG_HID_ZEROPLUS is not set
|
||||
CONFIG_HID_ZYDACRON=y
|
||||
# CONFIG_HID_SENSOR_HUB is not set
|
||||
# CONFIG_HID_ALPS is not set
|
||||
|
||||
#
|
||||
# USB HID support
|
||||
@ -3879,7 +3905,6 @@ CONFIG_USB_SERIAL_PL2303=m
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
# CONFIG_USB_LCD is not set
|
||||
# CONFIG_USB_LED is not set
|
||||
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||
# CONFIG_USB_CYTHERM is not set
|
||||
# CONFIG_USB_IDMOUSE is not set
|
||||
@ -3970,6 +3995,7 @@ CONFIG_LEDS_CLASS_FLASH=y
|
||||
# CONFIG_LEDS_PCA9532 is not set
|
||||
# CONFIG_LEDS_GPIO is not set
|
||||
# CONFIG_LEDS_LP3944 is not set
|
||||
# CONFIG_LEDS_LP3952 is not set
|
||||
# CONFIG_LEDS_LP5521 is not set
|
||||
# CONFIG_LEDS_LP5523 is not set
|
||||
# CONFIG_LEDS_LP5562 is not set
|
||||
@ -3996,6 +4022,7 @@ CONFIG_LEDS_CLASS_FLASH=y
|
||||
CONFIG_LEDS_TRIGGERS=y
|
||||
# CONFIG_LEDS_TRIGGER_TIMER is not set
|
||||
# CONFIG_LEDS_TRIGGER_ONESHOT is not set
|
||||
# CONFIG_LEDS_TRIGGER_DISK is not set
|
||||
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
|
||||
# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
|
||||
# CONFIG_LEDS_TRIGGER_CPU is not set
|
||||
@ -4014,6 +4041,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
# CONFIG_EDAC is not set
|
||||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RTC_MC146818_LIB=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_HCTOSYS=y
|
||||
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
|
||||
@ -4173,8 +4201,8 @@ CONFIG_VT6656=m
|
||||
#
|
||||
# CONFIG_SPEAKUP is not set
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
# CONFIG_MEDIA_CEC is not set
|
||||
CONFIG_DVB_CXD2099=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
# CONFIG_VIDEO_TW686X_KH is not set
|
||||
CONFIG_LIRC_STAGING=y
|
||||
# CONFIG_LIRC_BT829 is not set
|
||||
@ -4198,6 +4226,7 @@ CONFIG_LIRC_XBOX=m
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
# CONFIG_WILC1000_SDIO is not set
|
||||
# CONFIG_MOST is not set
|
||||
# CONFIG_KS7010 is not set
|
||||
# CONFIG_X86_PLATFORM_DEVICES is not set
|
||||
# CONFIG_CHROME_PLATFORMS is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
@ -4213,7 +4242,7 @@ CONFIG_COMMON_CLK=y
|
||||
# CONFIG_COMMON_CLK_NXP is not set
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
# CONFIG_COMMON_CLK_OXNAS is not set
|
||||
# CONFIG_SUNXI_CCU is not set
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
@ -4244,6 +4273,10 @@ CONFIG_CLKBLD_I8253=y
|
||||
#
|
||||
# SOC (System On Chip) specific Drivers
|
||||
#
|
||||
|
||||
#
|
||||
# Broadcom SoC drivers
|
||||
#
|
||||
# CONFIG_SUNXI_SRAM is not set
|
||||
# CONFIG_SOC_TI is not set
|
||||
# CONFIG_PM_DEVFREQ is not set
|
||||
@ -4319,6 +4352,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
|
||||
# File systems
|
||||
#
|
||||
CONFIG_DCACHE_WORD_ACCESS=y
|
||||
CONFIG_FS_IOMAP=y
|
||||
# CONFIG_EXT2_FS is not set
|
||||
# CONFIG_EXT3_FS is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
@ -4361,6 +4395,7 @@ CONFIG_F2FS_CHECK_FS=y
|
||||
# CONFIG_FS_DAX is not set
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_EXPORTFS=y
|
||||
# CONFIG_EXPORTFS_BLOCK_OPS is not set
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_MANDATORY_FILE_LOCKING=y
|
||||
# CONFIG_FS_ENCRYPTION is not set
|
||||
@ -4671,8 +4706,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
||||
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
|
||||
# CONFIG_FAULT_INJECTION is not set
|
||||
# CONFIG_LATENCYTOP is not set
|
||||
CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
|
||||
# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
|
||||
CONFIG_USER_STACKTRACE_SUPPORT=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
@ -4763,6 +4796,9 @@ CONFIG_KEYS=y
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
# CONFIG_SECURITY is not set
|
||||
# CONFIG_SECURITYFS is not set
|
||||
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
||||
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY is not set
|
||||
CONFIG_DEFAULT_SECURITY_DAC=y
|
||||
CONFIG_DEFAULT_SECURITY=""
|
||||
CONFIG_XOR_BLOCKS=y
|
||||
@ -4783,7 +4819,10 @@ CONFIG_CRYPTO_RNG=m
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_KPP2=y
|
||||
# CONFIG_CRYPTO_RSA is not set
|
||||
# CONFIG_CRYPTO_DH is not set
|
||||
# CONFIG_CRYPTO_ECDH is not set
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
# CONFIG_CRYPTO_USER is not set
|
||||
@ -4850,8 +4889,11 @@ CONFIG_CRYPTO_SHA1=m
|
||||
# CONFIG_CRYPTO_SHA256_SSSE3 is not set
|
||||
# CONFIG_CRYPTO_SHA512_SSSE3 is not set
|
||||
# CONFIG_CRYPTO_SHA1_MB is not set
|
||||
# CONFIG_CRYPTO_SHA256_MB is not set
|
||||
# CONFIG_CRYPTO_SHA512_MB is not set
|
||||
CONFIG_CRYPTO_SHA256=y
|
||||
# CONFIG_CRYPTO_SHA512 is not set
|
||||
# CONFIG_CRYPTO_SHA3 is not set
|
||||
# CONFIG_CRYPTO_TGR192 is not set
|
||||
# CONFIG_CRYPTO_WP512 is not set
|
||||
# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
|
||||
|
@ -1,4 +1,4 @@
|
||||
From d7c07ade8f6b82a3fd299e749f98381f3c3c2057 Mon Sep 17 00:00:00 2001
|
||||
From 982a9c5bbe16cabc297e75d6d9e8d2926f5641b8 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Wed, 2 Mar 2016 14:30:44 -0600
|
||||
Subject: [PATCH 01/12] drm: i915: remove intel_hdmi variable declaration
|
||||
@ -12,10 +12,10 @@ Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
index a884470..2adcc15 100644
|
||||
index 4df9f38..34e497f 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
@@ -1514,7 +1514,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
@@ -1496,7 +1496,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
intel_hdmi_unset_edid(connector);
|
||||
|
||||
if (intel_hdmi_set_edid(connector, live_status)) {
|
||||
@ -25,7 +25,7 @@ index a884470..2adcc15 100644
|
||||
hdmi_to_dig_port(intel_hdmi)->base.type = INTEL_OUTPUT_HDMI;
|
||||
status = connector_status_connected;
|
||||
|
||||
From 0dffccdf5025a92d38f18c1698e542a8bd2de903 Mon Sep 17 00:00:00 2001
|
||||
From 9a4bb140fbca791441bcf93ddf0a2ae062bc9945 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Tue, 1 Mar 2016 16:25:04 -0600
|
||||
Subject: [PATCH 02/12] drm/i915: Add headers for non-HDAudio HDMI interface
|
||||
@ -43,10 +43,10 @@ Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
||||
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/hdmi_audio_if.h | 125 +++++++++++++++++++++++++++++++++++
|
||||
drivers/gpu/drm/i915/i915_drv.h | 32 +++++++++
|
||||
drivers/gpu/drm/i915/i915_drv.h | 31 +++++++++
|
||||
drivers/gpu/drm/i915/i915_reg.h | 22 ++++++
|
||||
drivers/gpu/drm/i915/intel_drv.h | 13 ++++
|
||||
4 files changed, 192 insertions(+)
|
||||
4 files changed, 191 insertions(+)
|
||||
create mode 100644 drivers/gpu/drm/i915/hdmi_audio_if.h
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/hdmi_audio_if.h b/drivers/gpu/drm/i915/hdmi_audio_if.h
|
||||
@ -181,19 +181,18 @@ index 0000000..165bba5
|
||||
+
|
||||
+#endif /* __HDMI_AUDIO_IF_H */
|
||||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
|
||||
index bc3f2e6..7c2577d 100644
|
||||
index f68c789..4c682fae 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_drv.h
|
||||
+++ b/drivers/gpu/drm/i915/i915_drv.h
|
||||
@@ -61,6 +61,8 @@
|
||||
#include "i915_gem_gtt.h"
|
||||
@@ -63,6 +63,7 @@
|
||||
#include "i915_gem_render_state.h"
|
||||
|
||||
#include "intel_gvt.h"
|
||||
+#include "hdmi_audio_if.h"
|
||||
+
|
||||
|
||||
/* General customization:
|
||||
*/
|
||||
|
||||
@@ -1165,6 +1167,18 @@ struct intel_gen6_power_mgmt {
|
||||
@@ -1208,6 +1209,18 @@ struct intel_gen6_power_mgmt {
|
||||
struct mutex hw_lock;
|
||||
};
|
||||
|
||||
@ -212,7 +211,7 @@ index bc3f2e6..7c2577d 100644
|
||||
/* defined intel_pm.c */
|
||||
extern spinlock_t mchdev_lock;
|
||||
|
||||
@@ -1997,6 +2011,19 @@ struct drm_i915_private {
|
||||
@@ -2066,6 +2079,19 @@ struct drm_i915_private {
|
||||
|
||||
struct intel_encoder *dig_port_map[I915_MAX_PORTS];
|
||||
|
||||
@ -232,7 +231,7 @@ index bc3f2e6..7c2577d 100644
|
||||
/*
|
||||
* NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
|
||||
* will be rejected. Instead look for a better place.
|
||||
@@ -3634,6 +3661,11 @@ int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);
|
||||
@@ -3903,6 +3929,11 @@ int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);
|
||||
} while (upper != old_upper && loop++ < 2); \
|
||||
(u64)upper << 32 | lower; })
|
||||
|
||||
@ -245,10 +244,10 @@ index bc3f2e6..7c2577d 100644
|
||||
#define POSTING_READ16(reg) (void)I915_READ16_NOTRACE(reg)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
|
||||
index 3fcf7dd..d3e5935 100644
|
||||
index bf2cad3..bb0378f2d 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_reg.h
|
||||
+++ b/drivers/gpu/drm/i915/i915_reg.h
|
||||
@@ -2113,7 +2113,25 @@ enum skl_disp_power_wells {
|
||||
@@ -2131,7 +2131,25 @@ enum skl_disp_power_wells {
|
||||
#define I915_WINVALID_INTERRUPT (1<<1)
|
||||
#define I915_USER_INTERRUPT (1<<1)
|
||||
#define I915_ASLE_INTERRUPT (1<<0)
|
||||
@ -274,7 +273,7 @@ index 3fcf7dd..d3e5935 100644
|
||||
|
||||
#define GEN6_BSD_RNCID _MMIO(0x12198)
|
||||
|
||||
@@ -3433,6 +3451,9 @@ enum skl_disp_power_wells {
|
||||
@@ -3468,6 +3486,9 @@ enum {
|
||||
#define _GEN3_SDVOC 0x61160
|
||||
#define GEN3_SDVOB _MMIO(_GEN3_SDVOB)
|
||||
#define GEN3_SDVOC _MMIO(_GEN3_SDVOC)
|
||||
@ -284,7 +283,7 @@ index 3fcf7dd..d3e5935 100644
|
||||
#define GEN4_HDMIB GEN3_SDVOB
|
||||
#define GEN4_HDMIC GEN3_SDVOC
|
||||
#define VLV_HDMIB _MMIO(VLV_DISPLAY_BASE + 0x61140)
|
||||
@@ -3442,6 +3463,7 @@ enum skl_disp_power_wells {
|
||||
@@ -3477,6 +3498,7 @@ enum {
|
||||
#define PCH_HDMIB PCH_SDVOB
|
||||
#define PCH_HDMIC _MMIO(0xe1150)
|
||||
#define PCH_HDMID _MMIO(0xe1160)
|
||||
@ -293,10 +292,10 @@ index 3fcf7dd..d3e5935 100644
|
||||
#define PORT_DFT_I9XX _MMIO(0x61150)
|
||||
#define DC_BALANCE_RESET (1 << 25)
|
||||
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
|
||||
index f7f0f01..2820ef2 100644
|
||||
index ff399b9..83915b1 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_drv.h
|
||||
+++ b/drivers/gpu/drm/i915/intel_drv.h
|
||||
@@ -751,6 +751,14 @@ struct cxsr_latency {
|
||||
@@ -796,6 +796,14 @@ struct cxsr_latency {
|
||||
#define to_intel_plane_state(x) container_of(x, struct intel_plane_state, base)
|
||||
#define intel_fb_obj(x) (x ? to_intel_framebuffer(x)->obj : NULL)
|
||||
|
||||
@ -311,7 +310,7 @@ index f7f0f01..2820ef2 100644
|
||||
struct intel_hdmi {
|
||||
i915_reg_t hdmi_reg;
|
||||
int ddc_bus;
|
||||
@@ -766,6 +774,9 @@ struct intel_hdmi {
|
||||
@@ -811,6 +819,9 @@ struct intel_hdmi {
|
||||
bool rgb_quant_range_selectable;
|
||||
enum hdmi_picture_aspect aspect_ratio;
|
||||
struct intel_connector *attached_connector;
|
||||
@ -321,7 +320,7 @@ index f7f0f01..2820ef2 100644
|
||||
void (*write_infoframe)(struct drm_encoder *encoder,
|
||||
enum hdmi_infoframe_type type,
|
||||
const void *frame, ssize_t len);
|
||||
@@ -1196,6 +1207,8 @@ intel_rotation_90_or_270(unsigned int rotation)
|
||||
@@ -1263,6 +1274,8 @@ intel_rotation_90_or_270(unsigned int rotation)
|
||||
|
||||
void intel_create_rotation_property(struct drm_device *dev,
|
||||
struct intel_plane *plane);
|
||||
@ -331,7 +330,7 @@ index f7f0f01..2820ef2 100644
|
||||
void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,
|
||||
enum pipe pipe);
|
||||
|
||||
From fdb02b86d0cc7c9ec341efdc3086aa703637f2b6 Mon Sep 17 00:00:00 2001
|
||||
From 0aca8e42f07b0f84970a39d7f91b33a9899001a9 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Tue, 1 Mar 2016 16:25:04 -0600
|
||||
Subject: [PATCH 03/12] drm/i915: changes for non-HDAudio HDMI interface
|
||||
@ -361,15 +360,15 @@ Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Signed-off-by: Toyo Abe <toyo.abe@gmail.com>
|
||||
---
|
||||
drivers/gpu/drm/i915/i915_irq.c | 169 +++++++++++++++++++++++++++-
|
||||
drivers/gpu/drm/i915/intel_display.c | 103 ++++++++++++++++-
|
||||
drivers/gpu/drm/i915/intel_hdmi.c | 211 ++++++++++++++++++++++++++++++++++-
|
||||
3 files changed, 479 insertions(+), 4 deletions(-)
|
||||
drivers/gpu/drm/i915/intel_display.c | 100 +++++++++++++++++
|
||||
drivers/gpu/drm/i915/intel_hdmi.c | 212 ++++++++++++++++++++++++++++++++++-
|
||||
3 files changed, 478 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
|
||||
index aab47f7..3ef0d14 100644
|
||||
index 1c2aec3..93ad21e 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_irq.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_irq.c
|
||||
@@ -603,6 +603,42 @@ i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
|
||||
@@ -587,6 +587,42 @@ i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
|
||||
__i915_disable_pipestat(dev_priv, pipe, enable_mask, status_mask);
|
||||
}
|
||||
|
||||
@ -382,7 +381,7 @@ index aab47f7..3ef0d14 100644
|
||||
+ mask = dev_priv->hdmi_audio_interrupt_mask;
|
||||
+ mask |= I915_HDMI_AUDIO_UNDERRUN | I915_HDMI_AUDIO_BUFFER_DONE;
|
||||
+ /* Enable the interrupt, clear any pending status */
|
||||
+ if (IS_CHERRYVIEW(dev_priv->dev)) {
|
||||
+ if (IS_CHERRYVIEW(dev_priv)) {
|
||||
+ I915_WRITE(I915_LPE_AUDIO_HDMI_STATUS_C, mask);
|
||||
+ POSTING_READ(I915_LPE_AUDIO_HDMI_STATUS_C);
|
||||
+ } else {
|
||||
@ -399,7 +398,7 @@ index aab47f7..3ef0d14 100644
|
||||
+ mask = dev_priv->hdmi_audio_interrupt_mask;
|
||||
+ mask |= I915_HDMI_AUDIO_UNDERRUN | I915_HDMI_AUDIO_BUFFER_DONE;
|
||||
+ /* Disable the interrupt, clear any pending status */
|
||||
+ if (IS_CHERRYVIEW(dev_priv->dev)) {
|
||||
+ if (IS_CHERRYVIEW(dev_priv)) {
|
||||
+ I915_WRITE(I915_LPE_AUDIO_HDMI_STATUS_C, mask);
|
||||
+ POSTING_READ(I915_LPE_AUDIO_HDMI_STATUS_C);
|
||||
+
|
||||
@ -411,9 +410,9 @@ index aab47f7..3ef0d14 100644
|
||||
+
|
||||
/**
|
||||
* i915_enable_asle_pipestat - enable ASLE pipestat for OpRegion
|
||||
* @dev: drm device
|
||||
@@ -1651,6 +1687,24 @@ static bool intel_pipe_handle_vblank(struct drm_device *dev, enum pipe pipe)
|
||||
return true;
|
||||
* @dev_priv: i915 device private
|
||||
@@ -1618,6 +1654,24 @@ static bool intel_pipe_handle_vblank(struct drm_i915_private *dev_priv,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static inline
|
||||
@ -434,15 +433,15 @@ index aab47f7..3ef0d14 100644
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static void valleyview_pipestat_irq_ack(struct drm_device *dev, u32 iir,
|
||||
u32 pipe_stats[I915_MAX_PIPES])
|
||||
static void valleyview_pipestat_irq_ack(struct drm_i915_private *dev_priv,
|
||||
u32 iir, u32 pipe_stats[I915_MAX_PIPES])
|
||||
{
|
||||
@@ -1853,6 +1907,23 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
|
||||
i9xx_hpd_irq_handler(dev, hotplug_status);
|
||||
@@ -1817,6 +1871,23 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
|
||||
i9xx_hpd_irq_handler(dev_priv, hotplug_status);
|
||||
|
||||
valleyview_pipestat_irq_handler(dev, pipe_stats);
|
||||
valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
|
||||
+
|
||||
+ if (IS_CHERRYVIEW(dev)) {
|
||||
+ if (IS_CHERRYVIEW(dev_priv)) {
|
||||
+ // FIXME: plb: why are pipes and status mapped this way?
|
||||
+ if (iir & I915_LPE_PIPE_C_INTERRUPT)
|
||||
+ i915_notify_audio_buffer_status(dev,
|
||||
@ -461,12 +460,12 @@ index aab47f7..3ef0d14 100644
|
||||
} while (0);
|
||||
|
||||
enable_rpm_wakeref_asserts(dev_priv);
|
||||
@@ -1930,6 +2001,23 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
|
||||
i9xx_hpd_irq_handler(dev, hotplug_status);
|
||||
@@ -1894,6 +1965,23 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
|
||||
i9xx_hpd_irq_handler(dev_priv, hotplug_status);
|
||||
|
||||
valleyview_pipestat_irq_handler(dev, pipe_stats);
|
||||
valleyview_pipestat_irq_handler(dev_priv, pipe_stats);
|
||||
+
|
||||
+ if (IS_CHERRYVIEW(dev)) {
|
||||
+ if (IS_CHERRYVIEW(dev_priv)) {
|
||||
+ // FIXME: plb: why are pipes and status mapped this way?
|
||||
+ if (iir & I915_LPE_PIPE_C_INTERRUPT)
|
||||
+ i915_notify_audio_buffer_status(dev,
|
||||
@ -485,7 +484,7 @@ index aab47f7..3ef0d14 100644
|
||||
} while (0);
|
||||
|
||||
enable_rpm_wakeref_asserts(dev_priv);
|
||||
@@ -2861,6 +2949,72 @@ static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
||||
@@ -2803,6 +2891,72 @@ static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)
|
||||
spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
|
||||
}
|
||||
|
||||
@ -502,7 +501,7 @@ index aab47f7..3ef0d14 100644
|
||||
+
|
||||
+ imr = I915_READ(VLV_IMR);
|
||||
+
|
||||
+ if (IS_CHERRYVIEW(dev_priv->dev)) {
|
||||
+ if (IS_CHERRYVIEW(dev_priv)) {
|
||||
+ // FIXME: plb: looks wrong
|
||||
+
|
||||
+ //imr &= ~I915_LPE_PIPE_C_INTERRUPT;
|
||||
@ -534,7 +533,7 @@ index aab47f7..3ef0d14 100644
|
||||
+ spin_lock_irqsave(&dev_priv->irq_lock, irqflags);
|
||||
+ imr = I915_READ(VLV_IMR);
|
||||
+
|
||||
+ if (IS_CHERRYVIEW(dev_priv->dev)) {
|
||||
+ if (IS_CHERRYVIEW(dev_priv)) {
|
||||
+ // FIXME: plb: looks wrong, should have other interrupts as well?
|
||||
+ //imr |= I915_LPE_PIPE_C_INTERRUPT;
|
||||
+ int_bit = (pipe ? (I915_LPE_PIPE_B_INTERRUPT >>
|
||||
@ -558,7 +557,7 @@ index aab47f7..3ef0d14 100644
|
||||
static bool
|
||||
ring_idle(struct intel_engine_cs *engine, u32 seqno)
|
||||
{
|
||||
@@ -3371,7 +3525,8 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
|
||||
@@ -3293,7 +3447,8 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
|
||||
u32 pipestat_mask;
|
||||
u32 enable_mask;
|
||||
enum pipe pipe;
|
||||
@ -568,11 +567,11 @@ index aab47f7..3ef0d14 100644
|
||||
pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
|
||||
PIPE_CRC_DONE_INTERRUPT_STATUS;
|
||||
|
||||
@@ -3385,6 +3540,18 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
|
||||
@@ -3307,6 +3462,18 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
|
||||
if (IS_CHERRYVIEW(dev_priv))
|
||||
enable_mask |= I915_DISPLAY_PIPE_C_EVENT_INTERRUPT;
|
||||
|
||||
+ if (IS_CHERRYVIEW(dev_priv->dev))
|
||||
+ if (IS_CHERRYVIEW(dev_priv))
|
||||
+ // FIXME: plb: looks wrong: what about other interrupts
|
||||
+ enable_mask |= I915_LPE_PIPE_C_INTERRUPT;
|
||||
+
|
||||
@ -580,7 +579,7 @@ index aab47f7..3ef0d14 100644
|
||||
+ I915_HDMI_AUDIO_BUFFER_DONE;
|
||||
+ I915_WRITE(I915_LPE_AUDIO_HDMI_STATUS_A, lpe_status_clear);
|
||||
+ I915_WRITE(I915_LPE_AUDIO_HDMI_STATUS_B, lpe_status_clear);
|
||||
+ if (IS_CHERRYVIEW(dev_priv->dev))
|
||||
+ if (IS_CHERRYVIEW(dev_priv))
|
||||
+ I915_WRITE(I915_LPE_AUDIO_HDMI_STATUS_C, lpe_status_clear);
|
||||
+
|
||||
+
|
||||
@ -588,28 +587,28 @@ index aab47f7..3ef0d14 100644
|
||||
|
||||
dev_priv->irq_mask = ~enable_mask;
|
||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
||||
index 3074c56..5d162b8 100644
|
||||
index 175595f..d4499ff 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
||||
@@ -7964,6 +7964,8 @@ static int chv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
@@ -8096,6 +8096,8 @@ static int chv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
{
|
||||
int refclk = 100000;
|
||||
const intel_limit_t *limit = &intel_limits_chv;
|
||||
const struct intel_limit *limit = &intel_limits_chv;
|
||||
+ struct drm_device *dev = crtc->base.dev;
|
||||
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
|
||||
memset(&crtc_state->dpll_hw_state, 0,
|
||||
sizeof(crtc_state->dpll_hw_state));
|
||||
@@ -7977,6 +7979,16 @@ static int chv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
@@ -8109,6 +8111,16 @@ static int chv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
|
||||
chv_compute_dpll(crtc, crtc_state);
|
||||
|
||||
+ /* Added for HDMI Audio */
|
||||
+ if ((IS_CHERRYVIEW(dev)) || (IS_VALLEYVIEW(dev))) {
|
||||
+ if (intel_pipe_will_have_type(crtc_state, INTEL_OUTPUT_HDMI)) {
|
||||
+ if ((IS_CHERRYVIEW(dev_priv)) || (IS_VALLEYVIEW(dev_priv))) {
|
||||
+ if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
|
||||
+ dev_priv->tmds_clock_speed = crtc_state->port_clock;
|
||||
+
|
||||
+ mid_hdmi_audio_signal_event(dev_priv->dev,
|
||||
+ mid_hdmi_audio_signal_event(dev,
|
||||
+ HAD_EVENT_MODE_CHANGING);
|
||||
+ }
|
||||
+ }
|
||||
@ -617,27 +616,25 @@ index 3074c56..5d162b8 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -7985,7 +7997,9 @@ static int vlv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
@@ -8117,6 +8129,8 @@ static int vlv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
{
|
||||
int refclk = 100000;
|
||||
const intel_limit_t *limit = &intel_limits_vlv;
|
||||
-
|
||||
const struct intel_limit *limit = &intel_limits_vlv;
|
||||
+ struct drm_device *dev = crtc->base.dev;
|
||||
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
+
|
||||
|
||||
memset(&crtc_state->dpll_hw_state, 0,
|
||||
sizeof(crtc_state->dpll_hw_state));
|
||||
|
||||
@@ -7998,6 +8012,16 @@ static int vlv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
@@ -8130,6 +8144,16 @@ static int vlv_crtc_compute_clock(struct intel_crtc *crtc,
|
||||
|
||||
vlv_compute_dpll(crtc, crtc_state);
|
||||
|
||||
+ /* Added for HDMI Audio */
|
||||
+ if ((IS_CHERRYVIEW(dev)) || (IS_VALLEYVIEW(dev))) {
|
||||
+ if (intel_pipe_will_have_type(crtc_state, INTEL_OUTPUT_HDMI)) {
|
||||
+ if ((IS_CHERRYVIEW(dev_priv)) || (IS_VALLEYVIEW(dev_priv))) {
|
||||
+ if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
|
||||
+ dev_priv->tmds_clock_speed = crtc_state->port_clock;
|
||||
+
|
||||
+ mid_hdmi_audio_signal_event(dev_priv->dev,
|
||||
+ mid_hdmi_audio_signal_event(dev,
|
||||
+ HAD_EVENT_MODE_CHANGING);
|
||||
+ }
|
||||
+ }
|
||||
@ -645,15 +642,14 @@ index 3074c56..5d162b8 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -14678,6 +14702,83 @@ static void intel_setup_outputs(struct drm_device *dev)
|
||||
@@ -14913,6 +14937,82 @@ static void intel_setup_outputs(struct drm_device *dev)
|
||||
drm_helper_move_panel_connectors_to_head(dev);
|
||||
}
|
||||
|
||||
+void chv_set_lpe_audio_reg_pipe(struct drm_device *dev,
|
||||
+ int encoder_type, enum port port)
|
||||
+{
|
||||
+ struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
+ struct intel_encoder *intel_encoder;
|
||||
+ struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
+ struct hdmi_audio_priv *hdmi_priv = get_hdmi_priv();
|
||||
+
|
||||
+ if(!hdmi_priv) {
|
||||
@ -730,7 +726,7 @@ index 3074c56..5d162b8 100644
|
||||
{
|
||||
struct drm_device *dev = fb->dev;
|
||||
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
index 2adcc15..c4ec79e 100644
|
||||
index 34e497f..67cbf17 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
|
||||
@@ -38,6 +38,8 @@
|
||||
@ -742,7 +738,7 @@ index 2adcc15..c4ec79e 100644
|
||||
static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)
|
||||
{
|
||||
return hdmi_to_dig_port(intel_hdmi)->base.base.dev;
|
||||
@@ -1479,6 +1481,124 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force)
|
||||
@@ -1461,6 +1463,124 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force)
|
||||
return connected;
|
||||
}
|
||||
|
||||
@ -867,7 +863,7 @@ index 2adcc15..c4ec79e 100644
|
||||
static enum drm_connector_status
|
||||
intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
@@ -1487,6 +1607,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
@@ -1469,6 +1589,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
||||
bool live_status = false;
|
||||
unsigned int try;
|
||||
@ -876,7 +872,7 @@ index 2adcc15..c4ec79e 100644
|
||||
|
||||
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
|
||||
connector->base.id, connector->name);
|
||||
@@ -1523,6 +1645,31 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
@@ -1505,6 +1627,31 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
|
||||
|
||||
intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
|
||||
|
||||
@ -897,7 +893,7 @@ index 2adcc15..c4ec79e 100644
|
||||
+ /* Send a disconnect event to audio */
|
||||
+ if (inform_audio) {
|
||||
+ DRM_DEBUG_DRIVER("Sending event to audio");
|
||||
+ mid_hdmi_audio_signal_event(dev_priv->dev,
|
||||
+ mid_hdmi_audio_signal_event(dev,
|
||||
+ HAD_EVENT_HOT_UNPLUG);
|
||||
+ }
|
||||
+ }
|
||||
@ -908,7 +904,7 @@ index 2adcc15..c4ec79e 100644
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -1546,12 +1693,29 @@ intel_hdmi_force(struct drm_connector *connector)
|
||||
@@ -1528,12 +1675,29 @@ intel_hdmi_force(struct drm_connector *connector)
|
||||
static int intel_hdmi_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct edid *edid;
|
||||
@ -918,7 +914,7 @@ index 2adcc15..c4ec79e 100644
|
||||
+ hdmi_to_dig_port(intel_hdmi);
|
||||
+ struct drm_device *dev = connector->dev;
|
||||
+ int ret;
|
||||
+ struct drm_i915_private *dev_priv = connector->dev->dev_private;
|
||||
+
|
||||
|
||||
edid = to_intel_connector(connector)->detect_edid;
|
||||
if (edid == NULL)
|
||||
@ -930,7 +926,7 @@ index 2adcc15..c4ec79e 100644
|
||||
+ if (i915_notify_had) {
|
||||
+ chv_set_lpe_audio_reg_pipe(dev, INTEL_OUTPUT_HDMI,
|
||||
+ intel_dig_port->port);
|
||||
+ mid_hdmi_audio_signal_event(dev_priv->dev,
|
||||
+ mid_hdmi_audio_signal_event(dev,
|
||||
+ HAD_EVENT_HOT_PLUG);
|
||||
+ i915_notify_had = 0;
|
||||
+ }
|
||||
@ -939,7 +935,7 @@ index 2adcc15..c4ec79e 100644
|
||||
}
|
||||
|
||||
static bool
|
||||
@@ -2258,6 +2422,20 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
|
||||
@@ -1907,6 +2071,21 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
|
||||
u32 temp = I915_READ(PEG_BAND_GAP_DATA);
|
||||
I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
|
||||
}
|
||||
@ -952,15 +948,16 @@ index 2adcc15..c4ec79e 100644
|
||||
+{
|
||||
+ struct drm_i915_private *dev_priv = container_of(work,
|
||||
+ struct drm_i915_private, hdmi_audio_wq);
|
||||
+ struct drm_device *dev = &dev_priv->drm;
|
||||
+
|
||||
+ if (i915_hdmi_state == connector_status_connected) {
|
||||
+ mid_hdmi_audio_signal_event(dev_priv->dev,
|
||||
+ HAD_EVENT_HOT_PLUG);
|
||||
+ mid_hdmi_audio_signal_event(dev,
|
||||
+ HAD_EVENT_HOT_PLUG);
|
||||
+ }
|
||||
}
|
||||
|
||||
void intel_hdmi_init(struct drm_device *dev,
|
||||
@@ -2266,7 +2444,10 @@ void intel_hdmi_init(struct drm_device *dev,
|
||||
@@ -1915,7 +2094,10 @@ void intel_hdmi_init(struct drm_device *dev,
|
||||
struct intel_digital_port *intel_dig_port;
|
||||
struct intel_encoder *intel_encoder;
|
||||
struct intel_connector *intel_connector;
|
||||
@ -972,7 +969,7 @@ index 2adcc15..c4ec79e 100644
|
||||
intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
|
||||
if (!intel_dig_port)
|
||||
return;
|
||||
@@ -2277,6 +2458,7 @@ void intel_hdmi_init(struct drm_device *dev,
|
||||
@@ -1926,6 +2108,7 @@ void intel_hdmi_init(struct drm_device *dev,
|
||||
return;
|
||||
}
|
||||
|
||||
@ -980,7 +977,7 @@ index 2adcc15..c4ec79e 100644
|
||||
intel_encoder = &intel_dig_port->base;
|
||||
|
||||
drm_encoder_init(dev, &intel_encoder->base, &intel_hdmi_enc_funcs,
|
||||
@@ -2336,4 +2518,29 @@ void intel_hdmi_init(struct drm_device *dev,
|
||||
@@ -1985,4 +2168,29 @@ void intel_hdmi_init(struct drm_device *dev,
|
||||
intel_dig_port->max_lanes = 4;
|
||||
|
||||
intel_hdmi_init_connector(intel_dig_port, intel_connector);
|
||||
@ -1011,7 +1008,7 @@ index 2adcc15..c4ec79e 100644
|
||||
+
|
||||
}
|
||||
|
||||
From bea9d15e00603196e4d138af691327bbf6a86af0 Mon Sep 17 00:00:00 2001
|
||||
From c2fc8a0fadd274be5b75f6ca10c3ca35c381d611 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Tue, 1 Mar 2016 16:25:04 -0600
|
||||
Subject: [PATCH 04/12] drm/i915: power-related changes non-HDAudio HDMI
|
||||
@ -1516,10 +1513,10 @@ index 0000000..511311c
|
||||
+
|
||||
+#endif /*CONFIG_PM_RUNTIME*/
|
||||
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
|
||||
index 2863b92..883b13c 100644
|
||||
index 2d24813..23206de 100644
|
||||
--- a/drivers/gpu/drm/i915/intel_pm.c
|
||||
+++ b/drivers/gpu/drm/i915/intel_pm.c
|
||||
@@ -31,6 +31,17 @@
|
||||
@@ -32,6 +32,17 @@
|
||||
#include "../../../platform/x86/intel_ips.h"
|
||||
#include <linux/module.h>
|
||||
|
||||
@ -1537,15 +1534,15 @@ index 2863b92..883b13c 100644
|
||||
/**
|
||||
* DOC: RC6
|
||||
*
|
||||
@@ -7264,6 +7275,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
|
||||
@@ -7774,6 +7785,7 @@ void intel_init_clock_gating_hooks(struct drm_i915_private *dev_priv)
|
||||
void intel_init_pm(struct drm_device *dev)
|
||||
{
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
struct drm_i915_private *dev_priv = to_i915(dev);
|
||||
+ gdev = dev;
|
||||
|
||||
intel_fbc_init(dev_priv);
|
||||
|
||||
@@ -7496,3 +7508,44 @@ void intel_pm_setup(struct drm_device *dev)
|
||||
@@ -8088,3 +8100,44 @@ void intel_pm_setup(struct drm_device *dev)
|
||||
atomic_set(&dev_priv->pm.wakeref_count, 0);
|
||||
atomic_set(&dev_priv->pm.atomic_seq, 0);
|
||||
}
|
||||
@ -1591,7 +1588,7 @@ index 2863b92..883b13c 100644
|
||||
+}
|
||||
+EXPORT_SYMBOL(ospm_power_using_hw_end);
|
||||
|
||||
From b172cffb536124dba41ff37793a67dc6f9a6a39c Mon Sep 17 00:00:00 2001
|
||||
From d37021d5405ce4eb5f42328b575f07fa5d6f34a9 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Thu, 3 Mar 2016 11:08:10 -0600
|
||||
Subject: [PATCH 05/12] drm/i915: Add API code for non-HDAudio HDMI interface
|
||||
@ -1614,7 +1611,7 @@ Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/hdmi_audio_if.c b/drivers/gpu/drm/i915/hdmi_audio_if.c
|
||||
new file mode 100644
|
||||
index 0000000..c7c5f8f
|
||||
index 0000000..d176b25
|
||||
--- /dev/null
|
||||
+++ b/drivers/gpu/drm/i915/hdmi_audio_if.c
|
||||
@@ -0,0 +1,425 @@
|
||||
@ -1669,7 +1666,7 @@ index 0000000..c7c5f8f
|
||||
+ struct drm_i915_private *dev_priv =
|
||||
+ (struct drm_i915_private *) dev->dev_private;
|
||||
+ memcpy(hdmi_eld, eld, HAD_MAX_ELD_BYTES);
|
||||
+ mid_hdmi_audio_signal_event(dev_priv->dev, HAD_EVENT_HOT_PLUG);
|
||||
+ mid_hdmi_audio_signal_event(dev, HAD_EVENT_HOT_PLUG);
|
||||
+}
|
||||
+
|
||||
+static inline int android_hdmi_get_eld(struct drm_device *dev, void *eld)
|
||||
@ -2044,7 +2041,7 @@ index 0000000..c7c5f8f
|
||||
+EXPORT_SYMBOL(mid_hdmi_audio_register);
|
||||
+#endif
|
||||
|
||||
From 915a5b433454cab54cda47484390e84cfb8c7b5d Mon Sep 17 00:00:00 2001
|
||||
From fee88eee7f0b174a146bf612ef19bc0602b5f89b Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Tue, 1 Mar 2016 16:25:04 -0600
|
||||
Subject: [PATCH 06/12] drm/i915: enable non-HDAudio HDMI interface Makefile
|
||||
@ -2064,12 +2061,12 @@ Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
|
||||
index 0b88ba0..57406b2 100644
|
||||
index 684fc1c..ea14a7c 100644
|
||||
--- a/drivers/gpu/drm/i915/Makefile
|
||||
+++ b/drivers/gpu/drm/i915/Makefile
|
||||
@@ -14,7 +14,8 @@ i915-y := i915_drv.o \
|
||||
i915_sysfs.o \
|
||||
@@ -16,7 +16,8 @@ i915-y := i915_drv.o \
|
||||
intel_csr.o \
|
||||
intel_device_info.o \
|
||||
intel_pm.o \
|
||||
- intel_runtime_pm.o
|
||||
+ intel_runtime_pm.o \
|
||||
@ -2077,8 +2074,8 @@ index 0b88ba0..57406b2 100644
|
||||
|
||||
i915-$(CONFIG_COMPAT) += i915_ioc32.o
|
||||
i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
|
||||
@@ -39,6 +40,7 @@ i915-y += i915_cmd_parser.o \
|
||||
i915_trace_points.o \
|
||||
@@ -42,6 +43,7 @@ i915-y += i915_cmd_parser.o \
|
||||
intel_breadcrumbs.o \
|
||||
intel_lrc.o \
|
||||
intel_mocs.o \
|
||||
+ i915_rpm.o \
|
||||
@ -2086,7 +2083,7 @@ index 0b88ba0..57406b2 100644
|
||||
intel_uncore.o
|
||||
|
||||
|
||||
From 8213760904b873b68e55f5c707921704d0ff4c8f Mon Sep 17 00:00:00 2001
|
||||
From 138e6f7e00064d2d94a76308771f4f4b7e528a48 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Thu, 3 Mar 2016 11:09:26 -0600
|
||||
Subject: [PATCH 07/12] ALSA: Intel: Atom: add Atom non-HDAudio HDMI interface
|
||||
@ -2132,10 +2129,10 @@ index 5a240e0..75c679e 100644
|
||||
+ Choose this option to support HDMI.
|
||||
+
|
||||
diff --git a/sound/Makefile b/sound/Makefile
|
||||
index 7732070..f2c5e82 100644
|
||||
index c41bdf5..256f335 100644
|
||||
--- a/sound/Makefile
|
||||
+++ b/sound/Makefile
|
||||
@@ -8,6 +8,7 @@ obj-$(CONFIG_DMASOUND) += oss/
|
||||
@@ -7,6 +7,7 @@ obj-$(CONFIG_DMASOUND) += oss/
|
||||
obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
|
||||
firewire/ sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/ hda/
|
||||
obj-$(CONFIG_SND_AOA) += aoa/
|
||||
@ -5477,7 +5474,7 @@ index 0000000..acc407d
|
||||
+ return retval;
|
||||
+}
|
||||
|
||||
From 16eb2207449a5bf5115345384e78033cb13a0f3c Mon Sep 17 00:00:00 2001
|
||||
From ba7b36acd4d4f2bcf9c84c885d385d3d1327b221 Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||||
Date: Sat, 20 Feb 2016 18:08:41 -0600
|
||||
Subject: [PATCH 08/12] add dependency on PM_RUNTIME
|
||||
@ -5500,7 +5497,7 @@ index 75c679e..b8b4fce 100644
|
||||
help
|
||||
Choose this option to support HDMI.
|
||||
|
||||
From 6f73b34ca585c052de0732c02dece07126d36dbe Mon Sep 17 00:00:00 2001
|
||||
From 30f9d3b223b28623431348350cdf00409b8cef24 Mon Sep 17 00:00:00 2001
|
||||
From: David Henningsson <david.henningsson@canonical.com>
|
||||
Date: Fri, 21 Aug 2015 11:08:47 +0200
|
||||
Subject: [PATCH 09/12] hdmi_audio: Improve position reporting
|
||||
@ -5553,7 +5550,7 @@ index d8c5574..b2337c3 100644
|
||||
}
|
||||
|
||||
|
||||
From 3265fa5f1bea0e7820718a1c14528ba8620ee70a Mon Sep 17 00:00:00 2001
|
||||
From 25f0028061dcb8c4ed3d464419e4095570a68441 Mon Sep 17 00:00:00 2001
|
||||
From: David Henningsson <david.henningsson@canonical.com>
|
||||
Date: Fri, 21 Aug 2015 11:18:19 +0200
|
||||
Subject: [PATCH 10/12] hdmi_audio: Fixup some monitor
|
||||
@ -5605,7 +5602,7 @@ index b2337c3..1667748 100644
|
||||
return 0;
|
||||
}
|
||||
|
||||
From fbad36dca91688d71593b61bd170cf4c39eb24fb Mon Sep 17 00:00:00 2001
|
||||
From 0ef07c8e6cf8505f89ceab0b27895d8a21062d70 Mon Sep 17 00:00:00 2001
|
||||
From: Toyo Abe <toyo.abe@gmail.com>
|
||||
Date: Thu, 3 Mar 2016 12:57:41 +0900
|
||||
Subject: [PATCH 11/12] hdmi_audio: Fix mishandling of AUD_HDMI_STATUS_v2
|
||||
@ -5635,7 +5632,7 @@ index 1667748..86db38e 100644
|
||||
} else
|
||||
break;
|
||||
|
||||
From 9c175c10b955b2d6f2865bb4a1c2dcda6d57dbf6 Mon Sep 17 00:00:00 2001
|
||||
From 71729bb7f7f080b68e36a4e4b9f65fce67d5e869 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Anand <jerome.anand@intel.com>
|
||||
Date: Fri, 1 Apr 2016 11:07:48 +0530
|
||||
Subject: [PATCH 12/12] Create a platform device for hdmi audio driver and
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.7.0 Kernel Configuration
|
||||
# Linux/arm 4.8.1 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -189,6 +189,7 @@ CONFIG_SLUB_DEBUG=y
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
# CONFIG_SLOB is not set
|
||||
# CONFIG_SLAB_FREELIST_RANDOM is not set
|
||||
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
|
||||
# CONFIG_PROFILING is not set
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
@ -215,6 +216,8 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_GCC_PLUGINS=y
|
||||
# CONFIG_GCC_PLUGINS is not set
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
# CONFIG_CC_STACKPROTECTOR is not set
|
||||
CONFIG_CC_STACKPROTECTOR_NONE=y
|
||||
@ -315,7 +318,6 @@ CONFIG_MMU=y
|
||||
CONFIG_ARCH_BCM2708=y
|
||||
# CONFIG_ARCH_BCM2709 is not set
|
||||
# CONFIG_ARCH_MULTIPLATFORM is not set
|
||||
# CONFIG_ARCH_CLPS711X is not set
|
||||
# CONFIG_ARCH_GEMINI is not set
|
||||
# CONFIG_ARCH_EBSA110 is not set
|
||||
# CONFIG_ARCH_EP93XX is not set
|
||||
@ -829,6 +831,7 @@ CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_HSR is not set
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
# CONFIG_NET_L3_MASTER_DEV is not set
|
||||
# CONFIG_NET_NCSI is not set
|
||||
# CONFIG_SOCK_CGROUP_DATA is not set
|
||||
# CONFIG_CGROUP_NET_PRIO is not set
|
||||
# CONFIG_CGROUP_NET_CLASSID is not set
|
||||
@ -1002,6 +1005,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
# CONFIG_ATA_OVER_ETH is not set
|
||||
# CONFIG_MG_DISK is not set
|
||||
# CONFIG_BLK_DEV_RBD is not set
|
||||
# CONFIG_NVME_TARGET is not set
|
||||
|
||||
#
|
||||
# Misc devices
|
||||
@ -1016,7 +1020,6 @@ CONFIG_BCM2835_SMI=m
|
||||
# CONFIG_ISL29003 is not set
|
||||
# CONFIG_ISL29020 is not set
|
||||
# CONFIG_SENSORS_TSL2550 is not set
|
||||
# CONFIG_SENSORS_BH1780 is not set
|
||||
# CONFIG_SENSORS_BH1770 is not set
|
||||
# CONFIG_SENSORS_APDS990X is not set
|
||||
# CONFIG_HMC6352 is not set
|
||||
@ -1085,8 +1088,7 @@ CONFIG_BCM2708_VCHIQ=y
|
||||
#
|
||||
# CONFIG_ECHO is not set
|
||||
# CONFIG_CXL_BASE is not set
|
||||
# CONFIG_CXL_KERNEL_API is not set
|
||||
# CONFIG_CXL_EEH is not set
|
||||
# CONFIG_CXL_AFU_DRIVER_OPS is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
@ -1162,6 +1164,7 @@ CONFIG_VETH=m
|
||||
#
|
||||
# CONFIG_ETHERNET is not set
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_SWPHY=y
|
||||
|
||||
#
|
||||
# MII PHY device drivers
|
||||
@ -1189,11 +1192,13 @@ CONFIG_PHYLIB=y
|
||||
# CONFIG_DP83848_PHY is not set
|
||||
# CONFIG_DP83867_PHY is not set
|
||||
# CONFIG_MICROCHIP_PHY is not set
|
||||
# CONFIG_FIXED_PHY is not set
|
||||
CONFIG_FIXED_PHY=y
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MDIO_BUS_MUX_GPIO is not set
|
||||
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
# CONFIG_INTEL_XWAY_PHY is not set
|
||||
# CONFIG_MDIO_HISI_FEMAC is not set
|
||||
# CONFIG_MICREL_KS8995MA is not set
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
@ -1480,8 +1485,12 @@ CONFIG_TOUCHSCREEN_USB_3M=y
|
||||
# CONFIG_TOUCHSCREEN_TSC2004 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2005 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2007 is not set
|
||||
# CONFIG_TOUCHSCREEN_RM_TS is not set
|
||||
# CONFIG_TOUCHSCREEN_SILEAD is not set
|
||||
# CONFIG_TOUCHSCREEN_SIS_I2C is not set
|
||||
CONFIG_TOUCHSCREEN_ST1232=m
|
||||
# CONFIG_TOUCHSCREEN_SUR40 is not set
|
||||
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
|
||||
# CONFIG_TOUCHSCREEN_SX8654 is not set
|
||||
# CONFIG_TOUCHSCREEN_TPS6507X is not set
|
||||
# CONFIG_TOUCHSCREEN_ZFORCE is not set
|
||||
@ -1489,6 +1498,7 @@ CONFIG_TOUCHSCREEN_ST1232=m
|
||||
CONFIG_INPUT_MISC=y
|
||||
# CONFIG_INPUT_AD714X is not set
|
||||
# CONFIG_INPUT_ARIZONA_HAPTICS is not set
|
||||
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
|
||||
# CONFIG_INPUT_BMA150 is not set
|
||||
# CONFIG_INPUT_E3X0_BUTTON is not set
|
||||
# CONFIG_INPUT_MMA8450 is not set
|
||||
@ -1580,7 +1590,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
|
||||
# CONFIG_SERIAL_ALTERA_UART is not set
|
||||
# CONFIG_SERIAL_IFX6X60 is not set
|
||||
# CONFIG_SERIAL_XILINX_PS_UART is not set
|
||||
# CONFIG_SERIAL_MPS2_UART is not set
|
||||
# CONFIG_SERIAL_ARC is not set
|
||||
# CONFIG_SERIAL_FSL_LPUART is not set
|
||||
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
|
||||
@ -1826,6 +1835,7 @@ CONFIG_POWER_SUPPLY=y
|
||||
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
||||
# CONFIG_CHARGER_RT9455 is not set
|
||||
CONFIG_POWER_RESET=y
|
||||
# CONFIG_POWER_RESET_BRCMKONA is not set
|
||||
CONFIG_POWER_RESET_GPIO=y
|
||||
CONFIG_POWER_RESET_GPIO_RESTART=y
|
||||
# CONFIG_POWER_RESET_LTC2952 is not set
|
||||
@ -1862,6 +1872,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_F71805F is not set
|
||||
# CONFIG_SENSORS_F71882FG is not set
|
||||
# CONFIG_SENSORS_F75375S is not set
|
||||
# CONFIG_SENSORS_FTSTEUTATES is not set
|
||||
# CONFIG_SENSORS_GL518SM is not set
|
||||
# CONFIG_SENSORS_GL520SM is not set
|
||||
# CONFIG_SENSORS_G760A is not set
|
||||
@ -1920,6 +1931,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_PMBUS is not set
|
||||
# CONFIG_SENSORS_SHT15 is not set
|
||||
# CONFIG_SENSORS_SHT21 is not set
|
||||
# CONFIG_SENSORS_SHT3x is not set
|
||||
# CONFIG_SENSORS_SHTC1 is not set
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
# CONFIG_SENSORS_EMC1403 is not set
|
||||
@ -1939,6 +1951,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_AMC6821 is not set
|
||||
# CONFIG_SENSORS_INA209 is not set
|
||||
# CONFIG_SENSORS_INA2XX is not set
|
||||
# CONFIG_SENSORS_INA3221 is not set
|
||||
# CONFIG_SENSORS_TC74 is not set
|
||||
# CONFIG_SENSORS_THMC50 is not set
|
||||
# CONFIG_SENSORS_TMP102 is not set
|
||||
@ -1991,7 +2004,7 @@ CONFIG_WATCHDOG_CORE=y
|
||||
# CONFIG_CADENCE_WATCHDOG is not set
|
||||
# CONFIG_DW_WATCHDOG is not set
|
||||
# CONFIG_MAX63XX_WATCHDOG is not set
|
||||
CONFIG_BCM2835_WDT=m
|
||||
CONFIG_BCM2835_WDT=y
|
||||
# CONFIG_MEN_A21_WDT is not set
|
||||
|
||||
#
|
||||
@ -2408,6 +2421,8 @@ CONFIG_DVB_M88DS3103=m
|
||||
CONFIG_DVB_DRXK=m
|
||||
CONFIG_DVB_TDA18271C2DD=m
|
||||
CONFIG_DVB_SI2165=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
CONFIG_DVB_MN88473=m
|
||||
|
||||
#
|
||||
# DVB-S (satellite) frontends
|
||||
@ -2691,6 +2706,7 @@ CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
|
||||
# Allwinner SoC Audio support
|
||||
#
|
||||
# CONFIG_SND_SUN4I_CODEC is not set
|
||||
# CONFIG_SND_SUN4I_I2S is not set
|
||||
# CONFIG_SND_SUN4I_SPDIF is not set
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
@ -2702,13 +2718,16 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
CONFIG_SND_SOC_ADAU1977=m
|
||||
CONFIG_SND_SOC_ADAU1977_I2C=m
|
||||
# CONFIG_SND_SOC_ADAU7002 is not set
|
||||
# CONFIG_SND_SOC_AK4104 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
# CONFIG_SND_SOC_ALC5623 is not set
|
||||
# CONFIG_SND_SOC_BT_SCO is not set
|
||||
# CONFIG_SND_SOC_CS35L32 is not set
|
||||
# CONFIG_SND_SOC_CS35L33 is not set
|
||||
# CONFIG_SND_SOC_CS42L51_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
@ -2719,9 +2738,12 @@ CONFIG_SND_SOC_ADAU1977_I2C=m
|
||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_ES8328 is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
# CONFIG_SND_SOC_PCM179X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM179X_SPI is not set
|
||||
@ -2775,6 +2797,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8974 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_WM8985 is not set
|
||||
CONFIG_SND_SOC_TPA6130A2=m
|
||||
# CONFIG_SND_SIMPLE_CARD is not set
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
@ -2825,6 +2848,7 @@ CONFIG_HID_GYRATION=y
|
||||
CONFIG_HID_TWINHAN=y
|
||||
CONFIG_HID_KENSINGTON=y
|
||||
CONFIG_HID_LCPOWER=y
|
||||
# CONFIG_HID_LED is not set
|
||||
CONFIG_HID_LENOVO=y
|
||||
CONFIG_HID_LOGITECH=y
|
||||
CONFIG_HID_LOGITECH_DJ=y
|
||||
@ -2836,7 +2860,7 @@ CONFIG_LOGIWHEELS_FF=y
|
||||
# CONFIG_HID_MAGICMOUSE is not set
|
||||
CONFIG_HID_MICROSOFT=y
|
||||
CONFIG_HID_MONTEREY=y
|
||||
# CONFIG_HID_MULTITOUCH is not set
|
||||
CONFIG_HID_MULTITOUCH=m
|
||||
# CONFIG_HID_NTRIG is not set
|
||||
CONFIG_HID_ORTEK=y
|
||||
CONFIG_HID_OUYA=y
|
||||
@ -2870,6 +2894,7 @@ CONFIG_HID_XINMO=y
|
||||
# CONFIG_HID_ZEROPLUS is not set
|
||||
CONFIG_HID_ZYDACRON=y
|
||||
# CONFIG_HID_SENSOR_HUB is not set
|
||||
# CONFIG_HID_ALPS is not set
|
||||
|
||||
#
|
||||
# USB HID support
|
||||
@ -3027,7 +3052,6 @@ CONFIG_USB_SERIAL_PL2303=m
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
# CONFIG_USB_LCD is not set
|
||||
# CONFIG_USB_LED is not set
|
||||
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||
# CONFIG_USB_CYTHERM is not set
|
||||
# CONFIG_USB_IDMOUSE is not set
|
||||
@ -3050,7 +3074,6 @@ CONFIG_USB_SERIAL_PL2303=m
|
||||
#
|
||||
# CONFIG_USB_PHY is not set
|
||||
# CONFIG_NOP_USB_XCEIV is not set
|
||||
# CONFIG_AM335X_PHY_USB is not set
|
||||
# CONFIG_USB_GPIO_VBUS is not set
|
||||
# CONFIG_USB_ISP1301 is not set
|
||||
# CONFIG_USB_ULPI is not set
|
||||
@ -3207,6 +3230,7 @@ CONFIG_RTC_DRV_PCF8563=m
|
||||
# CONFIG_RTC_DRV_DS1343 is not set
|
||||
# CONFIG_RTC_DRV_DS1347 is not set
|
||||
# CONFIG_RTC_DRV_DS1390 is not set
|
||||
# CONFIG_RTC_DRV_MAX6916 is not set
|
||||
# CONFIG_RTC_DRV_R9701 is not set
|
||||
# CONFIG_RTC_DRV_RX4581 is not set
|
||||
# CONFIG_RTC_DRV_RX6110 is not set
|
||||
@ -3309,7 +3333,7 @@ CONFIG_VT6656=m
|
||||
#
|
||||
# CONFIG_SPEAKUP is not set
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
CONFIG_DVB_MN88472=m
|
||||
# CONFIG_MEDIA_CEC is not set
|
||||
CONFIG_LIRC_STAGING=y
|
||||
# CONFIG_LIRC_IMON is not set
|
||||
CONFIG_LIRC_RPI=m
|
||||
@ -3331,6 +3355,7 @@ CONFIG_LIRC_RPI=m
|
||||
# CONFIG_WILC1000_SDIO is not set
|
||||
# CONFIG_WILC1000_SPI is not set
|
||||
# CONFIG_MOST is not set
|
||||
# CONFIG_KS7010 is not set
|
||||
# CONFIG_GOLDFISH is not set
|
||||
# CONFIG_CHROME_PLATFORMS is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
@ -3350,7 +3375,7 @@ CONFIG_COMMON_CLK=y
|
||||
# CONFIG_COMMON_CLK_NXP is not set
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
# CONFIG_COMMON_CLK_OXNAS is not set
|
||||
# CONFIG_SUNXI_CCU is not set
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
@ -3388,7 +3413,11 @@ CONFIG_BCM2835_MBOX=y
|
||||
#
|
||||
# SOC (System On Chip) specific Drivers
|
||||
#
|
||||
# CONFIG_RASPBERRYPI_POWER is not set
|
||||
|
||||
#
|
||||
# Broadcom SoC drivers
|
||||
#
|
||||
CONFIG_RASPBERRYPI_POWER=y
|
||||
# CONFIG_SOC_BRCMSTB is not set
|
||||
# CONFIG_SUNXI_SRAM is not set
|
||||
# CONFIG_SOC_TI is not set
|
||||
@ -3410,7 +3439,8 @@ CONFIG_EXTCON_ARIZONA=m
|
||||
CONFIG_IRQCHIP=y
|
||||
CONFIG_ARM_GIC_MAX_NR=1
|
||||
# CONFIG_IPACK_BUS is not set
|
||||
# CONFIG_RESET_CONTROLLER is not set
|
||||
CONFIG_RESET_CONTROLLER=y
|
||||
# CONFIG_TI_SYSCON_RESET is not set
|
||||
# CONFIG_FMC is not set
|
||||
|
||||
#
|
||||
@ -3444,6 +3474,7 @@ CONFIG_ARM_GIC_MAX_NR=1
|
||||
#
|
||||
# Firmware Drivers
|
||||
#
|
||||
# CONFIG_ARM_SCPI_PROTOCOL is not set
|
||||
# CONFIG_FIRMWARE_MEMMAP is not set
|
||||
CONFIG_RASPBERRYPI_FIRMWARE=y
|
||||
# CONFIG_FW_CFG_SYSFS is not set
|
||||
@ -3452,6 +3483,7 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
|
||||
# File systems
|
||||
#
|
||||
CONFIG_DCACHE_WORD_ACCESS=y
|
||||
CONFIG_FS_IOMAP=y
|
||||
# CONFIG_EXT2_FS is not set
|
||||
# CONFIG_EXT3_FS is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
@ -3494,6 +3526,7 @@ CONFIG_F2FS_CHECK_FS=y
|
||||
# CONFIG_F2FS_FAULT_INJECTION is not set
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_EXPORTFS=y
|
||||
# CONFIG_EXPORTFS_BLOCK_OPS is not set
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_MANDATORY_FILE_LOCKING=y
|
||||
# CONFIG_FS_ENCRYPTION is not set
|
||||
@ -3844,6 +3877,9 @@ CONFIG_KEYS=y
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
# CONFIG_SECURITY is not set
|
||||
# CONFIG_SECURITYFS is not set
|
||||
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
||||
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY is not set
|
||||
CONFIG_DEFAULT_SECURITY_DAC=y
|
||||
CONFIG_DEFAULT_SECURITY=""
|
||||
CONFIG_XOR_BLOCKS=m
|
||||
@ -3864,7 +3900,10 @@ CONFIG_CRYPTO_RNG=m
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_KPP2=y
|
||||
# CONFIG_CRYPTO_RSA is not set
|
||||
# CONFIG_CRYPTO_DH is not set
|
||||
# CONFIG_CRYPTO_ECDH is not set
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
# CONFIG_CRYPTO_USER is not set
|
||||
@ -3925,6 +3964,7 @@ CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=y
|
||||
# CONFIG_CRYPTO_SHA512 is not set
|
||||
# CONFIG_CRYPTO_SHA3 is not set
|
||||
# CONFIG_CRYPTO_TGR192 is not set
|
||||
# CONFIG_CRYPTO_WP512 is not set
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.7.0 Kernel Configuration
|
||||
# Linux/arm 4.8.1 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -192,6 +192,7 @@ CONFIG_SLUB_DEBUG=y
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
# CONFIG_SLOB is not set
|
||||
# CONFIG_SLAB_FREELIST_RANDOM is not set
|
||||
CONFIG_SLUB_CPU_PARTIAL=y
|
||||
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
|
||||
# CONFIG_PROFILING is not set
|
||||
@ -219,6 +220,8 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
|
||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_GCC_PLUGINS=y
|
||||
# CONFIG_GCC_PLUGINS is not set
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
# CONFIG_CC_STACKPROTECTOR is not set
|
||||
CONFIG_CC_STACKPROTECTOR_NONE=y
|
||||
@ -322,7 +325,6 @@ CONFIG_MMU=y
|
||||
# CONFIG_ARCH_BCM2708 is not set
|
||||
CONFIG_ARCH_BCM2709=y
|
||||
# CONFIG_ARCH_MULTIPLATFORM is not set
|
||||
# CONFIG_ARCH_CLPS711X is not set
|
||||
# CONFIG_ARCH_GEMINI is not set
|
||||
# CONFIG_ARCH_EBSA110 is not set
|
||||
# CONFIG_ARCH_EP93XX is not set
|
||||
@ -401,6 +403,11 @@ CONFIG_MULTI_IRQ_HANDLER=y
|
||||
# CONFIG_ARM_ERRATA_775420 is not set
|
||||
# CONFIG_ARM_ERRATA_798181 is not set
|
||||
# CONFIG_ARM_ERRATA_773022 is not set
|
||||
# CONFIG_ARM_ERRATA_818325_852422 is not set
|
||||
# CONFIG_ARM_ERRATA_821420 is not set
|
||||
# CONFIG_ARM_ERRATA_825619 is not set
|
||||
# CONFIG_ARM_ERRATA_852421 is not set
|
||||
# CONFIG_ARM_ERRATA_852423 is not set
|
||||
|
||||
#
|
||||
# Bus support
|
||||
@ -561,7 +568,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
|
||||
CONFIG_VFP=y
|
||||
CONFIG_VFPv3=y
|
||||
CONFIG_NEON=y
|
||||
# CONFIG_KERNEL_MODE_NEON is not set
|
||||
CONFIG_KERNEL_MODE_NEON=y
|
||||
|
||||
#
|
||||
# Userspace binary formats
|
||||
@ -875,6 +882,7 @@ CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_HSR is not set
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
# CONFIG_NET_L3_MASTER_DEV is not set
|
||||
# CONFIG_NET_NCSI is not set
|
||||
CONFIG_RPS=y
|
||||
CONFIG_RFS_ACCEL=y
|
||||
CONFIG_XPS=y
|
||||
@ -1052,6 +1060,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
# CONFIG_ATA_OVER_ETH is not set
|
||||
# CONFIG_MG_DISK is not set
|
||||
# CONFIG_BLK_DEV_RBD is not set
|
||||
# CONFIG_NVME_TARGET is not set
|
||||
|
||||
#
|
||||
# Misc devices
|
||||
@ -1066,7 +1075,6 @@ CONFIG_BCM2835_SMI=m
|
||||
# CONFIG_ISL29003 is not set
|
||||
# CONFIG_ISL29020 is not set
|
||||
# CONFIG_SENSORS_TSL2550 is not set
|
||||
# CONFIG_SENSORS_BH1780 is not set
|
||||
# CONFIG_SENSORS_BH1770 is not set
|
||||
# CONFIG_SENSORS_APDS990X is not set
|
||||
# CONFIG_HMC6352 is not set
|
||||
@ -1135,8 +1143,7 @@ CONFIG_BCM2708_VCHIQ=y
|
||||
#
|
||||
# CONFIG_ECHO is not set
|
||||
# CONFIG_CXL_BASE is not set
|
||||
# CONFIG_CXL_KERNEL_API is not set
|
||||
# CONFIG_CXL_EEH is not set
|
||||
# CONFIG_CXL_AFU_DRIVER_OPS is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
@ -1212,6 +1219,7 @@ CONFIG_VETH=m
|
||||
#
|
||||
# CONFIG_ETHERNET is not set
|
||||
CONFIG_PHYLIB=y
|
||||
CONFIG_SWPHY=y
|
||||
|
||||
#
|
||||
# MII PHY device drivers
|
||||
@ -1239,11 +1247,13 @@ CONFIG_PHYLIB=y
|
||||
# CONFIG_DP83848_PHY is not set
|
||||
# CONFIG_DP83867_PHY is not set
|
||||
# CONFIG_MICROCHIP_PHY is not set
|
||||
# CONFIG_FIXED_PHY is not set
|
||||
CONFIG_FIXED_PHY=y
|
||||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MDIO_BUS_MUX_GPIO is not set
|
||||
# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
# CONFIG_INTEL_XWAY_PHY is not set
|
||||
# CONFIG_MDIO_HISI_FEMAC is not set
|
||||
# CONFIG_MICREL_KS8995MA is not set
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
@ -1529,8 +1539,12 @@ CONFIG_TOUCHSCREEN_USB_3M=y
|
||||
# CONFIG_TOUCHSCREEN_TSC2004 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2005 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2007 is not set
|
||||
# CONFIG_TOUCHSCREEN_RM_TS is not set
|
||||
# CONFIG_TOUCHSCREEN_SILEAD is not set
|
||||
# CONFIG_TOUCHSCREEN_SIS_I2C is not set
|
||||
CONFIG_TOUCHSCREEN_ST1232=m
|
||||
# CONFIG_TOUCHSCREEN_SUR40 is not set
|
||||
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
|
||||
# CONFIG_TOUCHSCREEN_SX8654 is not set
|
||||
# CONFIG_TOUCHSCREEN_TPS6507X is not set
|
||||
# CONFIG_TOUCHSCREEN_ZFORCE is not set
|
||||
@ -1538,6 +1552,7 @@ CONFIG_TOUCHSCREEN_ST1232=m
|
||||
CONFIG_INPUT_MISC=y
|
||||
# CONFIG_INPUT_AD714X is not set
|
||||
# CONFIG_INPUT_ARIZONA_HAPTICS is not set
|
||||
# CONFIG_INPUT_ATMEL_CAPTOUCH is not set
|
||||
# CONFIG_INPUT_BMA150 is not set
|
||||
# CONFIG_INPUT_E3X0_BUTTON is not set
|
||||
# CONFIG_INPUT_MMA8450 is not set
|
||||
@ -1629,7 +1644,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
|
||||
# CONFIG_SERIAL_ALTERA_UART is not set
|
||||
# CONFIG_SERIAL_IFX6X60 is not set
|
||||
# CONFIG_SERIAL_XILINX_PS_UART is not set
|
||||
# CONFIG_SERIAL_MPS2_UART is not set
|
||||
# CONFIG_SERIAL_ARC is not set
|
||||
# CONFIG_SERIAL_FSL_LPUART is not set
|
||||
# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set
|
||||
@ -1876,6 +1890,7 @@ CONFIG_POWER_SUPPLY=y
|
||||
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
|
||||
# CONFIG_CHARGER_RT9455 is not set
|
||||
CONFIG_POWER_RESET=y
|
||||
# CONFIG_POWER_RESET_BRCMKONA is not set
|
||||
# CONFIG_POWER_RESET_BRCMSTB is not set
|
||||
CONFIG_POWER_RESET_GPIO=y
|
||||
CONFIG_POWER_RESET_GPIO_RESTART=y
|
||||
@ -1884,6 +1899,7 @@ CONFIG_POWER_RESET_RESTART=y
|
||||
# CONFIG_POWER_RESET_VERSATILE is not set
|
||||
# CONFIG_POWER_RESET_SYSCON is not set
|
||||
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
|
||||
# CONFIG_SYSCON_REBOOT_MODE is not set
|
||||
# CONFIG_POWER_AVS is not set
|
||||
CONFIG_HWMON=y
|
||||
# CONFIG_HWMON_VID is not set
|
||||
@ -1914,6 +1930,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_F71805F is not set
|
||||
# CONFIG_SENSORS_F71882FG is not set
|
||||
# CONFIG_SENSORS_F75375S is not set
|
||||
# CONFIG_SENSORS_FTSTEUTATES is not set
|
||||
# CONFIG_SENSORS_GL518SM is not set
|
||||
# CONFIG_SENSORS_GL520SM is not set
|
||||
# CONFIG_SENSORS_G760A is not set
|
||||
@ -1972,6 +1989,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_PMBUS is not set
|
||||
# CONFIG_SENSORS_SHT15 is not set
|
||||
# CONFIG_SENSORS_SHT21 is not set
|
||||
# CONFIG_SENSORS_SHT3x is not set
|
||||
# CONFIG_SENSORS_SHTC1 is not set
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
# CONFIG_SENSORS_EMC1403 is not set
|
||||
@ -1991,6 +2009,7 @@ CONFIG_HWMON=y
|
||||
# CONFIG_SENSORS_AMC6821 is not set
|
||||
# CONFIG_SENSORS_INA209 is not set
|
||||
# CONFIG_SENSORS_INA2XX is not set
|
||||
# CONFIG_SENSORS_INA3221 is not set
|
||||
# CONFIG_SENSORS_TC74 is not set
|
||||
# CONFIG_SENSORS_THMC50 is not set
|
||||
# CONFIG_SENSORS_TMP102 is not set
|
||||
@ -2043,7 +2062,7 @@ CONFIG_WATCHDOG_CORE=y
|
||||
# CONFIG_CADENCE_WATCHDOG is not set
|
||||
# CONFIG_DW_WATCHDOG is not set
|
||||
# CONFIG_MAX63XX_WATCHDOG is not set
|
||||
CONFIG_BCM2835_WDT=m
|
||||
CONFIG_BCM2835_WDT=y
|
||||
# CONFIG_MEN_A21_WDT is not set
|
||||
|
||||
#
|
||||
@ -2460,6 +2479,8 @@ CONFIG_DVB_M88DS3103=m
|
||||
CONFIG_DVB_DRXK=m
|
||||
CONFIG_DVB_TDA18271C2DD=m
|
||||
CONFIG_DVB_SI2165=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
CONFIG_DVB_MN88473=m
|
||||
|
||||
#
|
||||
# DVB-S (satellite) frontends
|
||||
@ -2743,6 +2764,7 @@ CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
|
||||
# Allwinner SoC Audio support
|
||||
#
|
||||
# CONFIG_SND_SUN4I_CODEC is not set
|
||||
# CONFIG_SND_SUN4I_I2S is not set
|
||||
# CONFIG_SND_SUN4I_SPDIF is not set
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
@ -2754,13 +2776,16 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
|
||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
CONFIG_SND_SOC_ADAU1977=m
|
||||
CONFIG_SND_SOC_ADAU1977_I2C=m
|
||||
# CONFIG_SND_SOC_ADAU7002 is not set
|
||||
# CONFIG_SND_SOC_AK4104 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
# CONFIG_SND_SOC_ALC5623 is not set
|
||||
# CONFIG_SND_SOC_BT_SCO is not set
|
||||
# CONFIG_SND_SOC_CS35L32 is not set
|
||||
# CONFIG_SND_SOC_CS35L33 is not set
|
||||
# CONFIG_SND_SOC_CS42L51_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
@ -2771,9 +2796,12 @@ CONFIG_SND_SOC_ADAU1977_I2C=m
|
||||
# CONFIG_SND_SOC_CS4271_SPI is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_ES8328 is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
# CONFIG_SND_SOC_PCM179X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM179X_SPI is not set
|
||||
@ -2827,6 +2855,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8974 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_WM8985 is not set
|
||||
CONFIG_SND_SOC_TPA6130A2=m
|
||||
# CONFIG_SND_SIMPLE_CARD is not set
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
@ -2877,6 +2906,7 @@ CONFIG_HID_GYRATION=y
|
||||
CONFIG_HID_TWINHAN=y
|
||||
CONFIG_HID_KENSINGTON=y
|
||||
CONFIG_HID_LCPOWER=y
|
||||
# CONFIG_HID_LED is not set
|
||||
CONFIG_HID_LENOVO=y
|
||||
CONFIG_HID_LOGITECH=y
|
||||
CONFIG_HID_LOGITECH_DJ=y
|
||||
@ -2888,7 +2918,7 @@ CONFIG_LOGIWHEELS_FF=y
|
||||
# CONFIG_HID_MAGICMOUSE is not set
|
||||
CONFIG_HID_MICROSOFT=y
|
||||
CONFIG_HID_MONTEREY=y
|
||||
# CONFIG_HID_MULTITOUCH is not set
|
||||
CONFIG_HID_MULTITOUCH=m
|
||||
# CONFIG_HID_NTRIG is not set
|
||||
CONFIG_HID_ORTEK=y
|
||||
CONFIG_HID_OUYA=y
|
||||
@ -2922,6 +2952,7 @@ CONFIG_HID_XINMO=y
|
||||
# CONFIG_HID_ZEROPLUS is not set
|
||||
CONFIG_HID_ZYDACRON=y
|
||||
# CONFIG_HID_SENSOR_HUB is not set
|
||||
# CONFIG_HID_ALPS is not set
|
||||
|
||||
#
|
||||
# USB HID support
|
||||
@ -3079,7 +3110,6 @@ CONFIG_USB_SERIAL_PL2303=m
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
# CONFIG_USB_LCD is not set
|
||||
# CONFIG_USB_LED is not set
|
||||
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||
# CONFIG_USB_CYTHERM is not set
|
||||
# CONFIG_USB_IDMOUSE is not set
|
||||
@ -3102,7 +3132,6 @@ CONFIG_USB_SERIAL_PL2303=m
|
||||
#
|
||||
# CONFIG_USB_PHY is not set
|
||||
# CONFIG_NOP_USB_XCEIV is not set
|
||||
# CONFIG_AM335X_PHY_USB is not set
|
||||
# CONFIG_USB_GPIO_VBUS is not set
|
||||
# CONFIG_USB_ISP1301 is not set
|
||||
# CONFIG_USB_ULPI is not set
|
||||
@ -3260,6 +3289,7 @@ CONFIG_RTC_DRV_PCF8563=m
|
||||
# CONFIG_RTC_DRV_DS1343 is not set
|
||||
# CONFIG_RTC_DRV_DS1347 is not set
|
||||
# CONFIG_RTC_DRV_DS1390 is not set
|
||||
# CONFIG_RTC_DRV_MAX6916 is not set
|
||||
# CONFIG_RTC_DRV_R9701 is not set
|
||||
# CONFIG_RTC_DRV_RX4581 is not set
|
||||
# CONFIG_RTC_DRV_RX6110 is not set
|
||||
@ -3362,7 +3392,7 @@ CONFIG_VT6656=m
|
||||
#
|
||||
# CONFIG_SPEAKUP is not set
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
CONFIG_DVB_MN88472=m
|
||||
# CONFIG_MEDIA_CEC is not set
|
||||
CONFIG_LIRC_STAGING=y
|
||||
# CONFIG_LIRC_IMON is not set
|
||||
CONFIG_LIRC_RPI=m
|
||||
@ -3384,6 +3414,7 @@ CONFIG_LIRC_RPI=m
|
||||
# CONFIG_WILC1000_SDIO is not set
|
||||
# CONFIG_WILC1000_SPI is not set
|
||||
# CONFIG_MOST is not set
|
||||
# CONFIG_KS7010 is not set
|
||||
# CONFIG_GOLDFISH is not set
|
||||
# CONFIG_CHROME_PLATFORMS is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
@ -3403,7 +3434,7 @@ CONFIG_COMMON_CLK=y
|
||||
# CONFIG_COMMON_CLK_NXP is not set
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
# CONFIG_COMMON_CLK_OXNAS is not set
|
||||
# CONFIG_SUNXI_CCU is not set
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
@ -3442,7 +3473,11 @@ CONFIG_BCM2835_MBOX=y
|
||||
#
|
||||
# SOC (System On Chip) specific Drivers
|
||||
#
|
||||
# CONFIG_RASPBERRYPI_POWER is not set
|
||||
|
||||
#
|
||||
# Broadcom SoC drivers
|
||||
#
|
||||
CONFIG_RASPBERRYPI_POWER=y
|
||||
# CONFIG_SOC_BRCMSTB is not set
|
||||
# CONFIG_SUNXI_SRAM is not set
|
||||
# CONFIG_SOC_TI is not set
|
||||
@ -3464,7 +3499,8 @@ CONFIG_EXTCON_ARIZONA=m
|
||||
CONFIG_IRQCHIP=y
|
||||
CONFIG_ARM_GIC_MAX_NR=1
|
||||
# CONFIG_IPACK_BUS is not set
|
||||
# CONFIG_RESET_CONTROLLER is not set
|
||||
CONFIG_RESET_CONTROLLER=y
|
||||
# CONFIG_TI_SYSCON_RESET is not set
|
||||
# CONFIG_FMC is not set
|
||||
|
||||
#
|
||||
@ -3498,6 +3534,7 @@ CONFIG_ARM_GIC_MAX_NR=1
|
||||
#
|
||||
# Firmware Drivers
|
||||
#
|
||||
# CONFIG_ARM_SCPI_PROTOCOL is not set
|
||||
# CONFIG_FIRMWARE_MEMMAP is not set
|
||||
CONFIG_RASPBERRYPI_FIRMWARE=y
|
||||
# CONFIG_FW_CFG_SYSFS is not set
|
||||
@ -3507,6 +3544,7 @@ CONFIG_HAVE_ARM_SMCCC=y
|
||||
# File systems
|
||||
#
|
||||
CONFIG_DCACHE_WORD_ACCESS=y
|
||||
CONFIG_FS_IOMAP=y
|
||||
# CONFIG_EXT2_FS is not set
|
||||
# CONFIG_EXT3_FS is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
@ -3549,6 +3587,7 @@ CONFIG_F2FS_CHECK_FS=y
|
||||
# CONFIG_F2FS_FAULT_INJECTION is not set
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_EXPORTFS=y
|
||||
# CONFIG_EXPORTFS_BLOCK_OPS is not set
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_MANDATORY_FILE_LOCKING=y
|
||||
# CONFIG_FS_ENCRYPTION is not set
|
||||
@ -3901,6 +3940,9 @@ CONFIG_KEYS=y
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
# CONFIG_SECURITY is not set
|
||||
# CONFIG_SECURITYFS is not set
|
||||
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
||||
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY is not set
|
||||
CONFIG_DEFAULT_SECURITY_DAC=y
|
||||
CONFIG_DEFAULT_SECURITY=""
|
||||
CONFIG_XOR_BLOCKS=m
|
||||
@ -3921,7 +3963,10 @@ CONFIG_CRYPTO_RNG=m
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_KPP2=y
|
||||
# CONFIG_CRYPTO_RSA is not set
|
||||
# CONFIG_CRYPTO_DH is not set
|
||||
# CONFIG_CRYPTO_ECDH is not set
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
# CONFIG_CRYPTO_USER is not set
|
||||
@ -3931,10 +3976,11 @@ CONFIG_CRYPTO_NULL=m
|
||||
CONFIG_CRYPTO_NULL2=y
|
||||
# CONFIG_CRYPTO_PCRYPT is not set
|
||||
CONFIG_CRYPTO_WORKQUEUE=y
|
||||
# CONFIG_CRYPTO_CRYPTD is not set
|
||||
CONFIG_CRYPTO_CRYPTD=m
|
||||
# CONFIG_CRYPTO_MCRYPTD is not set
|
||||
# CONFIG_CRYPTO_AUTHENC is not set
|
||||
# CONFIG_CRYPTO_TEST is not set
|
||||
CONFIG_CRYPTO_ABLK_HELPER=m
|
||||
|
||||
#
|
||||
# Authenticated Encryption with Associated Data
|
||||
@ -3980,9 +4026,10 @@ CONFIG_CRYPTO_MD5=y
|
||||
# CONFIG_CRYPTO_RMD160 is not set
|
||||
# CONFIG_CRYPTO_RMD256 is not set
|
||||
# CONFIG_CRYPTO_RMD320 is not set
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA1=y
|
||||
CONFIG_CRYPTO_SHA256=y
|
||||
# CONFIG_CRYPTO_SHA512 is not set
|
||||
# CONFIG_CRYPTO_SHA3 is not set
|
||||
# CONFIG_CRYPTO_TGR192 is not set
|
||||
# CONFIG_CRYPTO_WP512 is not set
|
||||
|
||||
@ -4036,10 +4083,16 @@ CONFIG_CRYPTO_JITTERENTROPY=m
|
||||
# Certificates for signature checking
|
||||
#
|
||||
CONFIG_ARM_CRYPTO=y
|
||||
CONFIG_CRYPTO_SHA1_ARM=m
|
||||
CONFIG_CRYPTO_SHA1_ARM=y
|
||||
CONFIG_CRYPTO_SHA1_ARM_NEON=y
|
||||
# CONFIG_CRYPTO_SHA1_ARM_CE is not set
|
||||
# CONFIG_CRYPTO_SHA2_ARM_CE is not set
|
||||
CONFIG_CRYPTO_SHA256_ARM=m
|
||||
# CONFIG_CRYPTO_SHA512_ARM is not set
|
||||
CONFIG_CRYPTO_AES_ARM=m
|
||||
CONFIG_CRYPTO_AES_ARM_BS=m
|
||||
# CONFIG_CRYPTO_AES_ARM_CE is not set
|
||||
# CONFIG_CRYPTO_GHASH_ARM_CE is not set
|
||||
# CONFIG_BINARY_PRINTF is not set
|
||||
|
||||
#
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 4.7.4 Kernel Configuration
|
||||
# Linux/x86_64 4.8.1 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
@ -38,7 +38,6 @@ CONFIG_AUDIT_ARCH=y
|
||||
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
|
||||
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
|
||||
CONFIG_X86_64_SMP=y
|
||||
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
|
||||
CONFIG_ARCH_SUPPORTS_UPROBES=y
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
CONFIG_DEBUG_RODATA=y
|
||||
@ -234,6 +233,7 @@ CONFIG_SLUB_DEBUG=y
|
||||
# CONFIG_SLAB is not set
|
||||
CONFIG_SLUB=y
|
||||
# CONFIG_SLOB is not set
|
||||
# CONFIG_SLAB_FREELIST_RANDOM is not set
|
||||
CONFIG_SLUB_CPU_PARTIAL=y
|
||||
# CONFIG_SYSTEM_DATA_VERIFICATION is not set
|
||||
# CONFIG_PROFILING is not set
|
||||
@ -274,11 +274,14 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
|
||||
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
|
||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
||||
CONFIG_SECCOMP_FILTER=y
|
||||
CONFIG_HAVE_GCC_PLUGINS=y
|
||||
# CONFIG_GCC_PLUGINS is not set
|
||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
||||
# CONFIG_CC_STACKPROTECTOR is not set
|
||||
CONFIG_CC_STACKPROTECTOR_NONE=y
|
||||
# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
|
||||
# CONFIG_CC_STACKPROTECTOR_STRONG is not set
|
||||
CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
|
||||
CONFIG_HAVE_CONTEXT_TRACKING=y
|
||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
||||
@ -502,6 +505,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
||||
CONFIG_TRANSPARENT_HUGEPAGE=y
|
||||
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
|
||||
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
|
||||
CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
|
||||
CONFIG_CLEANCACHE=y
|
||||
# CONFIG_FRONTSWAP is not set
|
||||
# CONFIG_CMA is not set
|
||||
@ -597,6 +601,7 @@ CONFIG_ACPI_VIDEO=y
|
||||
CONFIG_ACPI_FAN=y
|
||||
# CONFIG_ACPI_DOCK is not set
|
||||
CONFIG_ACPI_CPU_FREQ_PSS=y
|
||||
CONFIG_ACPI_PROCESSOR_CSTATE=y
|
||||
CONFIG_ACPI_PROCESSOR_IDLE=y
|
||||
CONFIG_ACPI_PROCESSOR=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
@ -604,6 +609,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=y
|
||||
CONFIG_ACPI_THERMAL=y
|
||||
CONFIG_ACPI_NUMA=y
|
||||
# CONFIG_ACPI_CUSTOM_DSDT is not set
|
||||
CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
|
||||
CONFIG_ACPI_TABLE_UPGRADE=y
|
||||
# CONFIG_ACPI_DEBUG is not set
|
||||
# CONFIG_ACPI_PCI_SLOT is not set
|
||||
@ -619,7 +625,9 @@ CONFIG_ACPI_HOTPLUG_IOAPIC=y
|
||||
CONFIG_HAVE_ACPI_APEI=y
|
||||
CONFIG_HAVE_ACPI_APEI_NMI=y
|
||||
# CONFIG_ACPI_APEI is not set
|
||||
# CONFIG_DPTF_POWER is not set
|
||||
# CONFIG_PMIC_OPREGION is not set
|
||||
# CONFIG_ACPI_CONFIGFS is not set
|
||||
# CONFIG_SFI is not set
|
||||
|
||||
#
|
||||
@ -1028,6 +1036,7 @@ CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_HSR is not set
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
# CONFIG_NET_L3_MASTER_DEV is not set
|
||||
# CONFIG_NET_NCSI is not set
|
||||
CONFIG_RPS=y
|
||||
CONFIG_RFS_ACCEL=y
|
||||
CONFIG_XPS=y
|
||||
@ -1214,7 +1223,6 @@ CONFIG_BLK_DEV_NVME=y
|
||||
# CONFIG_ISL29003 is not set
|
||||
# CONFIG_ISL29020 is not set
|
||||
# CONFIG_SENSORS_TSL2550 is not set
|
||||
# CONFIG_SENSORS_BH1780 is not set
|
||||
# CONFIG_SENSORS_BH1770 is not set
|
||||
# CONFIG_SENSORS_APDS990X is not set
|
||||
# CONFIG_HMC6352 is not set
|
||||
@ -1285,8 +1293,7 @@ CONFIG_ALTERA_STAPL=m
|
||||
# CONFIG_GENWQE is not set
|
||||
# CONFIG_ECHO is not set
|
||||
# CONFIG_CXL_BASE is not set
|
||||
# CONFIG_CXL_KERNEL_API is not set
|
||||
# CONFIG_CXL_EEH is not set
|
||||
# CONFIG_CXL_AFU_DRIVER_OPS is not set
|
||||
CONFIG_HAVE_IDE=y
|
||||
# CONFIG_IDE is not set
|
||||
|
||||
@ -1683,6 +1690,7 @@ CONFIG_REALTEK_PHY=y
|
||||
# CONFIG_MDIO_OCTEON is not set
|
||||
# CONFIG_MDIO_THUNDER is not set
|
||||
# CONFIG_MDIO_BCM_UNIMAC is not set
|
||||
# CONFIG_INTEL_XWAY_PHY is not set
|
||||
CONFIG_PPP=m
|
||||
CONFIG_PPP_BSDCOMP=m
|
||||
CONFIG_PPP_DEFLATE=m
|
||||
@ -2072,6 +2080,9 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
|
||||
# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2004 is not set
|
||||
# CONFIG_TOUCHSCREEN_TSC2007 is not set
|
||||
# CONFIG_TOUCHSCREEN_RM_TS is not set
|
||||
# CONFIG_TOUCHSCREEN_SILEAD is not set
|
||||
# CONFIG_TOUCHSCREEN_SIS_I2C is not set
|
||||
CONFIG_TOUCHSCREEN_ST1232=m
|
||||
# CONFIG_TOUCHSCREEN_SUR40 is not set
|
||||
# CONFIG_TOUCHSCREEN_SX8654 is not set
|
||||
@ -2215,6 +2226,7 @@ CONFIG_I2C_MUX=m
|
||||
# CONFIG_I2C_MUX_PINCTRL is not set
|
||||
# CONFIG_I2C_MUX_REG is not set
|
||||
CONFIG_I2C_HELPER_AUTO=y
|
||||
CONFIG_I2C_SMBUS=y
|
||||
CONFIG_I2C_ALGOBIT=y
|
||||
|
||||
#
|
||||
@ -2322,7 +2334,6 @@ CONFIG_PINCTRL_BAYTRAIL=y
|
||||
CONFIG_PINCTRL_CHERRYVIEW=y
|
||||
# CONFIG_PINCTRL_BROXTON is not set
|
||||
# CONFIG_PINCTRL_SUNRISEPOINT is not set
|
||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_DEVRES=y
|
||||
CONFIG_GPIO_ACPI=y
|
||||
@ -2369,14 +2380,12 @@ CONFIG_GPIOLIB_IRQCHIP=y
|
||||
#
|
||||
# CONFIG_GPIO_AMD8111 is not set
|
||||
# CONFIG_GPIO_BT8XX is not set
|
||||
# CONFIG_GPIO_INTEL_MID is not set
|
||||
# CONFIG_GPIO_ML_IOH is not set
|
||||
# CONFIG_GPIO_RDC321X is not set
|
||||
|
||||
#
|
||||
# SPI or I2C GPIO expanders
|
||||
#
|
||||
# CONFIG_GPIO_MCP23S08 is not set
|
||||
|
||||
#
|
||||
# USB GPIO expanders
|
||||
@ -2499,6 +2508,7 @@ CONFIG_SENSORS_IT87=m
|
||||
# CONFIG_PMBUS is not set
|
||||
# CONFIG_SENSORS_SHT15 is not set
|
||||
# CONFIG_SENSORS_SHT21 is not set
|
||||
# CONFIG_SENSORS_SHT3x is not set
|
||||
# CONFIG_SENSORS_SHTC1 is not set
|
||||
# CONFIG_SENSORS_SIS5595 is not set
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
@ -2516,6 +2526,7 @@ CONFIG_SENSORS_IT87=m
|
||||
# CONFIG_SENSORS_AMC6821 is not set
|
||||
# CONFIG_SENSORS_INA209 is not set
|
||||
# CONFIG_SENSORS_INA2XX is not set
|
||||
# CONFIG_SENSORS_INA3221 is not set
|
||||
# CONFIG_SENSORS_TC74 is not set
|
||||
# CONFIG_SENSORS_THMC50 is not set
|
||||
# CONFIG_SENSORS_TMP102 is not set
|
||||
@ -2644,7 +2655,6 @@ CONFIG_MFD_RTSX_PCI=y
|
||||
# CONFIG_MFD_RT5033 is not set
|
||||
CONFIG_MFD_RTSX_USB=y
|
||||
# CONFIG_MFD_RC5T583 is not set
|
||||
# CONFIG_MFD_RN5T618 is not set
|
||||
# CONFIG_MFD_SEC_CORE is not set
|
||||
# CONFIG_MFD_SI476X_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
@ -3049,6 +3059,8 @@ CONFIG_DVB_M88DS3103=m
|
||||
CONFIG_DVB_DRXK=m
|
||||
CONFIG_DVB_TDA18271C2DD=m
|
||||
CONFIG_DVB_SI2165=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
CONFIG_DVB_MN88473=m
|
||||
CONFIG_DVB_STV0367DD=m
|
||||
CONFIG_DVB_CXD2843=m
|
||||
|
||||
@ -3196,7 +3208,6 @@ CONFIG_DRM_TTM=y
|
||||
#
|
||||
# I2C encoder or helper chips
|
||||
#
|
||||
# CONFIG_DRM_I2C_ADV7511 is not set
|
||||
# CONFIG_DRM_I2C_CH7006 is not set
|
||||
# CONFIG_DRM_I2C_SIL164 is not set
|
||||
# CONFIG_DRM_I2C_NXP_TDA998X is not set
|
||||
@ -3219,6 +3230,7 @@ CONFIG_DRM_AMD_ACP=y
|
||||
CONFIG_DRM_I915=y
|
||||
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
|
||||
CONFIG_DRM_I915_USERPTR=y
|
||||
# CONFIG_DRM_I915_GVT is not set
|
||||
|
||||
#
|
||||
# drm/i915 Debugging
|
||||
@ -3530,7 +3542,10 @@ CONFIG_SND_SST_IPC_ACPI=m
|
||||
CONFIG_SND_SOC_INTEL_SST=m
|
||||
CONFIG_SND_SOC_INTEL_SST_ACPI=m
|
||||
CONFIG_SND_SOC_INTEL_SST_MATCH=m
|
||||
# CONFIG_SND_SOC_INTEL_HASWELL_MACH is not set
|
||||
# CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set
|
||||
# CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set
|
||||
# CONFIG_SND_SOC_INTEL_BROADWELL_MACH is not set
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||
# CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set
|
||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
|
||||
@ -3544,6 +3559,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
|
||||
# Allwinner SoC Audio support
|
||||
#
|
||||
# CONFIG_SND_SUN4I_CODEC is not set
|
||||
# CONFIG_SND_SUN4I_I2S is not set
|
||||
# CONFIG_SND_SOC_XTFPGA_I2S is not set
|
||||
CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
|
||||
@ -3552,12 +3568,15 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
#
|
||||
# CONFIG_SND_SOC_AC97_CODEC is not set
|
||||
# CONFIG_SND_SOC_ADAU1701 is not set
|
||||
# CONFIG_SND_SOC_ADAU7002 is not set
|
||||
# CONFIG_SND_SOC_AK4554 is not set
|
||||
# CONFIG_SND_SOC_AK4613 is not set
|
||||
# CONFIG_SND_SOC_AK4642 is not set
|
||||
# CONFIG_SND_SOC_AK5386 is not set
|
||||
# CONFIG_SND_SOC_ALC5623 is not set
|
||||
# CONFIG_SND_SOC_BT_SCO is not set
|
||||
# CONFIG_SND_SOC_CS35L32 is not set
|
||||
# CONFIG_SND_SOC_CS35L33 is not set
|
||||
# CONFIG_SND_SOC_CS42L51_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42L52 is not set
|
||||
# CONFIG_SND_SOC_CS42L56 is not set
|
||||
@ -3567,10 +3586,13 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
|
||||
# CONFIG_SND_SOC_CS4271_I2C is not set
|
||||
# CONFIG_SND_SOC_CS42XX8_I2C is not set
|
||||
# CONFIG_SND_SOC_CS4349 is not set
|
||||
# CONFIG_SND_SOC_CS53L30 is not set
|
||||
# CONFIG_SND_SOC_ES8328 is not set
|
||||
# CONFIG_SND_SOC_GTM601 is not set
|
||||
# CONFIG_SND_SOC_INNO_RK3036 is not set
|
||||
CONFIG_SND_SOC_MAX98090=m
|
||||
# CONFIG_SND_SOC_MAX98504 is not set
|
||||
# CONFIG_SND_SOC_MAX9860 is not set
|
||||
# CONFIG_SND_SOC_PCM1681 is not set
|
||||
# CONFIG_SND_SOC_PCM179X_I2C is not set
|
||||
# CONFIG_SND_SOC_PCM3168A_I2C is not set
|
||||
@ -3616,7 +3638,9 @@ CONFIG_SND_SOC_TS3A227E=m
|
||||
# CONFIG_SND_SOC_WM8962 is not set
|
||||
# CONFIG_SND_SOC_WM8974 is not set
|
||||
# CONFIG_SND_SOC_WM8978 is not set
|
||||
# CONFIG_SND_SOC_WM8985 is not set
|
||||
# CONFIG_SND_SOC_TPA6130A2 is not set
|
||||
CONFIG_SND_SIMPLE_CARD_UTILS=m
|
||||
CONFIG_SND_SIMPLE_CARD=m
|
||||
# CONFIG_SOUND_PRIME is not set
|
||||
CONFIG_AC97_BUS=m
|
||||
@ -3667,6 +3691,7 @@ CONFIG_HID_GYRATION=y
|
||||
CONFIG_HID_TWINHAN=y
|
||||
CONFIG_HID_KENSINGTON=y
|
||||
CONFIG_HID_LCPOWER=y
|
||||
# CONFIG_HID_LED is not set
|
||||
CONFIG_HID_LENOVO=y
|
||||
CONFIG_HID_LOGITECH=y
|
||||
CONFIG_HID_LOGITECH_DJ=y
|
||||
@ -3678,7 +3703,7 @@ CONFIG_LOGIWHEELS_FF=y
|
||||
# CONFIG_HID_MAGICMOUSE is not set
|
||||
CONFIG_HID_MICROSOFT=y
|
||||
CONFIG_HID_MONTEREY=y
|
||||
# CONFIG_HID_MULTITOUCH is not set
|
||||
CONFIG_HID_MULTITOUCH=m
|
||||
# CONFIG_HID_NTRIG is not set
|
||||
CONFIG_HID_ORTEK=y
|
||||
CONFIG_HID_OUYA=y
|
||||
@ -3712,6 +3737,7 @@ CONFIG_HID_XINMO=y
|
||||
# CONFIG_HID_ZEROPLUS is not set
|
||||
CONFIG_HID_ZYDACRON=y
|
||||
# CONFIG_HID_SENSOR_HUB is not set
|
||||
# CONFIG_HID_ALPS is not set
|
||||
|
||||
#
|
||||
# USB HID support
|
||||
@ -3879,7 +3905,6 @@ CONFIG_USB_SERIAL_PL2303=m
|
||||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
# CONFIG_USB_LCD is not set
|
||||
# CONFIG_USB_LED is not set
|
||||
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||
# CONFIG_USB_CYTHERM is not set
|
||||
# CONFIG_USB_IDMOUSE is not set
|
||||
@ -3970,6 +3995,7 @@ CONFIG_LEDS_CLASS_FLASH=y
|
||||
# CONFIG_LEDS_PCA9532 is not set
|
||||
# CONFIG_LEDS_GPIO is not set
|
||||
# CONFIG_LEDS_LP3944 is not set
|
||||
# CONFIG_LEDS_LP3952 is not set
|
||||
# CONFIG_LEDS_LP5521 is not set
|
||||
# CONFIG_LEDS_LP5523 is not set
|
||||
# CONFIG_LEDS_LP5562 is not set
|
||||
@ -3996,6 +4022,7 @@ CONFIG_LEDS_CLASS_FLASH=y
|
||||
CONFIG_LEDS_TRIGGERS=y
|
||||
# CONFIG_LEDS_TRIGGER_TIMER is not set
|
||||
# CONFIG_LEDS_TRIGGER_ONESHOT is not set
|
||||
# CONFIG_LEDS_TRIGGER_DISK is not set
|
||||
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
|
||||
# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
|
||||
# CONFIG_LEDS_TRIGGER_CPU is not set
|
||||
@ -4014,6 +4041,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
|
||||
CONFIG_EDAC_SUPPORT=y
|
||||
# CONFIG_EDAC is not set
|
||||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RTC_MC146818_LIB=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_HCTOSYS=y
|
||||
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
|
||||
@ -4173,8 +4201,8 @@ CONFIG_VT6656=m
|
||||
#
|
||||
# CONFIG_SPEAKUP is not set
|
||||
CONFIG_STAGING_MEDIA=y
|
||||
# CONFIG_MEDIA_CEC is not set
|
||||
CONFIG_DVB_CXD2099=m
|
||||
CONFIG_DVB_MN88472=m
|
||||
# CONFIG_VIDEO_TW686X_KH is not set
|
||||
CONFIG_LIRC_STAGING=y
|
||||
# CONFIG_LIRC_BT829 is not set
|
||||
@ -4198,6 +4226,7 @@ CONFIG_LIRC_XBOX=m
|
||||
# CONFIG_UNISYSSPAR is not set
|
||||
# CONFIG_WILC1000_SDIO is not set
|
||||
# CONFIG_MOST is not set
|
||||
# CONFIG_KS7010 is not set
|
||||
# CONFIG_X86_PLATFORM_DEVICES is not set
|
||||
# CONFIG_CHROME_PLATFORMS is not set
|
||||
CONFIG_CLKDEV_LOOKUP=y
|
||||
@ -4213,7 +4242,7 @@ CONFIG_COMMON_CLK=y
|
||||
# CONFIG_COMMON_CLK_NXP is not set
|
||||
# CONFIG_COMMON_CLK_PXA is not set
|
||||
# CONFIG_COMMON_CLK_PIC32 is not set
|
||||
# CONFIG_COMMON_CLK_OXNAS is not set
|
||||
# CONFIG_SUNXI_CCU is not set
|
||||
|
||||
#
|
||||
# Hardware Spinlock drivers
|
||||
@ -4244,6 +4273,10 @@ CONFIG_CLKBLD_I8253=y
|
||||
#
|
||||
# SOC (System On Chip) specific Drivers
|
||||
#
|
||||
|
||||
#
|
||||
# Broadcom SoC drivers
|
||||
#
|
||||
# CONFIG_SUNXI_SRAM is not set
|
||||
# CONFIG_SOC_TI is not set
|
||||
# CONFIG_PM_DEVFREQ is not set
|
||||
@ -4319,6 +4352,7 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y
|
||||
# File systems
|
||||
#
|
||||
CONFIG_DCACHE_WORD_ACCESS=y
|
||||
CONFIG_FS_IOMAP=y
|
||||
# CONFIG_EXT2_FS is not set
|
||||
# CONFIG_EXT3_FS is not set
|
||||
CONFIG_EXT4_FS=y
|
||||
@ -4361,6 +4395,7 @@ CONFIG_F2FS_CHECK_FS=y
|
||||
# CONFIG_FS_DAX is not set
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_EXPORTFS=y
|
||||
# CONFIG_EXPORTFS_BLOCK_OPS is not set
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_MANDATORY_FILE_LOCKING=y
|
||||
# CONFIG_FS_ENCRYPTION is not set
|
||||
@ -4671,8 +4706,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
||||
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
|
||||
# CONFIG_FAULT_INJECTION is not set
|
||||
# CONFIG_LATENCYTOP is not set
|
||||
CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
|
||||
# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
|
||||
CONFIG_USER_STACKTRACE_SUPPORT=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
@ -4763,6 +4796,9 @@ CONFIG_KEYS=y
|
||||
# CONFIG_SECURITY_DMESG_RESTRICT is not set
|
||||
# CONFIG_SECURITY is not set
|
||||
# CONFIG_SECURITYFS is not set
|
||||
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
||||
CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
|
||||
# CONFIG_HARDENED_USERCOPY is not set
|
||||
CONFIG_DEFAULT_SECURITY_DAC=y
|
||||
CONFIG_DEFAULT_SECURITY=""
|
||||
CONFIG_XOR_BLOCKS=y
|
||||
@ -4783,7 +4819,10 @@ CONFIG_CRYPTO_RNG=m
|
||||
CONFIG_CRYPTO_RNG2=y
|
||||
CONFIG_CRYPTO_RNG_DEFAULT=m
|
||||
CONFIG_CRYPTO_AKCIPHER2=y
|
||||
CONFIG_CRYPTO_KPP2=y
|
||||
# CONFIG_CRYPTO_RSA is not set
|
||||
# CONFIG_CRYPTO_DH is not set
|
||||
# CONFIG_CRYPTO_ECDH is not set
|
||||
CONFIG_CRYPTO_MANAGER=y
|
||||
CONFIG_CRYPTO_MANAGER2=y
|
||||
# CONFIG_CRYPTO_USER is not set
|
||||
@ -4850,8 +4889,11 @@ CONFIG_CRYPTO_SHA1=m
|
||||
# CONFIG_CRYPTO_SHA256_SSSE3 is not set
|
||||
# CONFIG_CRYPTO_SHA512_SSSE3 is not set
|
||||
# CONFIG_CRYPTO_SHA1_MB is not set
|
||||
# CONFIG_CRYPTO_SHA256_MB is not set
|
||||
# CONFIG_CRYPTO_SHA512_MB is not set
|
||||
CONFIG_CRYPTO_SHA256=y
|
||||
# CONFIG_CRYPTO_SHA512 is not set
|
||||
# CONFIG_CRYPTO_SHA3 is not set
|
||||
# CONFIG_CRYPTO_TGR192 is not set
|
||||
# CONFIG_CRYPTO_WP512 is not set
|
||||
# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
|
||||
|
@ -223,13 +223,7 @@ mkdir -p $TARGET_IMG
|
||||
rm -rf $TARGET_IMG/$IMAGE_NAME.kernel
|
||||
|
||||
# copy kernel to target dir
|
||||
if [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
|
||||
echo "injecting DeviceTreeBlobs to kernel..."
|
||||
perl $BUILD/linux-$(kernel_version)/scripts/mkknlimg $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
|
||||
echo "...done"
|
||||
else
|
||||
cp -PR $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
|
||||
fi
|
||||
cp -PR $BUILD/linux-$(kernel_version)/arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET $TARGET_IMG/$IMAGE_NAME.kernel
|
||||
chmod 0644 $TARGET_IMG/$IMAGE_NAME.kernel
|
||||
|
||||
# create squashfs file
|
||||
|
@ -17,20 +17,6 @@ DROP_COMMITS="
|
||||
Added Device IDs for August DVB-T 205
|
||||
net\: Add non-mainline source for rtl8192cu wlan
|
||||
net\: Fix rtl8192cu build errors on other platforms
|
||||
|
||||
# Other rtl8192cu related commits below...
|
||||
Fix cfg80211 for kernel >= 4.7 \(#1624\)
|
||||
suppress spurious messages
|
||||
Add #if for 3\.14 kernel change \(#87\)
|
||||
Set dev_type to wlan
|
||||
Tentatively added support for more 8188CUS based devices\.
|
||||
Add support for more 8188CUS and 8192CUS devices
|
||||
Add ProductId for the Netgear N150 - WNA1000M
|
||||
Fixes CONFIG_CONCURRENT_MODE CONFIG_MULTI_VIR_IFACES
|
||||
Fixes compatibility with 3\.13
|
||||
Enables warning in the compiler and fixes some issues, reference => https\:\/\/github.com\/diederikdehaas\/rtl8812AU
|
||||
Starts device in station mode instead of monitor, fixes NetworkManager issues
|
||||
Enable cfg80211 support
|
||||
"
|
||||
|
||||
IFS=$'\n'
|
||||
|
Loading…
x
Reference in New Issue
Block a user