jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2014-01-01 19:31:05 +01:00
commit ea1cd7616b
36 changed files with 600 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/linux-firmware/dvb-firmware/meta
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="dvb-firmware"
PKG_VERSION="0.0.35"
PKG_VERSION="0.0.36"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="Free-to-use"

0
packages/linux/patches/3.13-rc6/linux-003-no_dev_console.patch → packages/linux/patches/3.13.0-rc6/linux-003-no_dev_console.patch
View File

0
packages/linux/patches/3.13-rc6/linux-052-XBOX_remote_support.patch → packages/linux/patches/3.13.0-rc6/linux-052-XBOX_remote_support.patch
View File

0
packages/linux/patches/3.13-rc6/linux-053-spinelplus-remote-0.2.patch → packages/linux/patches/3.13.0-rc6/linux-053-spinelplus-remote-0.2.patch
View File

0
packages/linux/patches/3.13-rc6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch → packages/linux/patches/3.13.0-rc6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch
View File

0
packages/linux/patches/3.13-rc6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch → packages/linux/patches/3.13.0-rc6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
View File

0
packages/linux/patches/3.13-rc6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch → packages/linux/patches/3.13.0-rc6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
View File

0
packages/linux/patches/3.13-rc6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch → packages/linux/patches/3.13.0-rc6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
View File

0
packages/linux/patches/3.13-rc6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch → packages/linux/patches/3.13.0-rc6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
View File

0
packages/linux/patches/3.13-rc6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch → packages/linux/patches/3.13.0-rc6/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
View File

0
packages/linux/patches/3.13-rc6/linux-058.06-hid_sony-add_SMK_link.patch → packages/linux/patches/3.13.0-rc6/linux-058.06-hid_sony-add_SMK_link.patch
View File

0
packages/linux/patches/3.13-rc6/linux-059-remove_some_xpad_pids-0.2.patch → packages/linux/patches/3.13.0-rc6/linux-059-remove_some_xpad_pids-0.2.patch
View File

0
packages/linux/patches/3.13-rc6/linux-060-add_AUGUST_DVB-T205.patch → packages/linux/patches/3.13.0-rc6/linux-060-add_AUGUST_DVB-T205.patch
View File

0
packages/linux/patches/3.13-rc6/linux-203-stb0899_enable_low_symbol_rate.patch → packages/linux/patches/3.13.0-rc6/linux-203-stb0899_enable_low_symbol_rate.patch
View File

559
packages/linux/patches/3.13-rc6/broken/linux-210-dvbsky.patch → packages/linux/patches/3.13.0-rc6/linux-210-dvbsky.patch
View File

@ -1,7 +1,8 @@
diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/Kconfig linux-3.13-rc6.patch/drivers/media/dvb-frontends/Kconfig
--- linux-3.13-rc6/drivers/media/dvb-frontends/Kconfig 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/Kconfig 2013-12-31 00:36:51.001678640 +0100
@@ -207,6 +207,20 @@
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index fb77062..f6f1afa 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -214,6 +214,20 @@ config DVB_CX24117
help
A Dual DVB-S/S2 tuner module. Say Y when you want to support this frontend.
@ -22,9 +23,22 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/Kconfig linux-3.13-rc6.pat
config DVB_SI21XX
tristate "Silicon Labs SI21XX based"
depends on DVB_CORE && I2C
diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.c linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.c
--- linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.c 2013-12-31 00:36:51.002678635 +0100
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
index c08b7f0..e8de9b6 100644
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -108,4 +108,5 @@ obj-$(CONFIG_DVB_RTL2830) += rtl2830.o
obj-$(CONFIG_DVB_RTL2832) += rtl2832.o
obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
obj-$(CONFIG_DVB_AF9033) += af9033.o
-
+obj-$(CONFIG_DVB_M88DS3103) += m88ds3103.o
+obj-$(CONFIG_DVB_M88DC2800) += m88dc2800.o
diff --git a/drivers/media/dvb-frontends/m88dc2800.c b/drivers/media/dvb-frontends/m88dc2800.c
new file mode 100644
index 0000000..f876a11
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88dc2800.c
@@ -0,0 +1,2124 @@
+/*
+ M88DC2800/M88TC2800 - DVB-C demodulator and tuner from Montage
@ -2150,9 +2164,11 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.c linux-3.13-rc6
+MODULE_AUTHOR("Max Nibble <nibble.max@gmail.com>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.00");
diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.h linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.h
--- linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88dc2800.h 2013-12-31 00:36:51.002678635 +0100
diff --git a/drivers/media/dvb-frontends/m88dc2800.h b/drivers/media/dvb-frontends/m88dc2800.h
new file mode 100644
index 0000000..2184322
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88dc2800.h
@@ -0,0 +1,44 @@
+/*
+ M88DC2800/M88TC2800 - DVB-C demodulator and tuner from Montage
@ -2198,9 +2214,11 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88dc2800.h linux-3.13-rc6
+}
+#endif /* CONFIG_DVB_M88DC2800 */
+#endif /* M88DC2800_H */
diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.c linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.c
--- linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.c 2013-12-31 00:36:51.003678631 +0100
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
new file mode 100644
index 0000000..9d525da
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -0,0 +1,1707 @@
+/*
+ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@ -3316,11 +3334,11 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.c linux-3.13-rc6
+ m88ds3103_writereg(state, 0x22, val1);
+ m88ds3103_writereg(state, 0x24, val2);
+
+ if(state->config->ci_mode){
+ if(state->config->ci_mode == 2)
+ val1 = 0x43;
+ else
+ val1 = 0x03;
+ if(state->config->ci_mode){
+ if(state->config->ci_mode == 2)
+ val1 = 0x43;
+ else
+ val1 = 0x03;
+ }
+ else if(state->config->ts_mode)
+ val1 = 0x06;
@ -3386,11 +3404,11 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.c linux-3.13-rc6
+ m88ds3103_writereg(state, 0x24, val2);
+ }
+
+ if(state->config->ci_mode){
+ if(state->config->ci_mode == 2)
+ val1 = 0x43;
+ else
+ val1 = 0x03;
+ if(state->config->ci_mode){
+ if(state->config->ci_mode == 2)
+ val1 = 0x43;
+ else
+ val1 = 0x03;
+ }
+ else if(state->config->ts_mode)
+ val1 = 0x06;
@ -3909,9 +3927,11 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.c linux-3.13-rc6
+MODULE_DESCRIPTION("DVB Frontend module for Montage DS3103/TS2022 hardware");
+MODULE_AUTHOR("Max nibble");
+MODULE_LICENSE("GPL");
diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.h linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.h
--- linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103.h 2013-12-31 00:36:51.003678631 +0100
diff --git a/drivers/media/dvb-frontends/m88ds3103.h b/drivers/media/dvb-frontends/m88ds3103.h
new file mode 100644
index 0000000..e3b96b2
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88ds3103.h
@@ -0,0 +1,53 @@
+/*
+ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@ -3966,9 +3986,11 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103.h linux-3.13-rc6
+}
+#endif /* CONFIG_DVB_M88DS3103 */
+#endif /* M88DS3103_H */
diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103_priv.h linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103_priv.h
--- linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103_priv.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/m88ds3103_priv.h 2013-12-31 00:36:51.003678631 +0100
diff --git a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-frontends/m88ds3103_priv.h
new file mode 100644
index 0000000..2838514
--- /dev/null
+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h
@@ -0,0 +1,403 @@
+/*
+ Montage Technology M88DS3103/M88TS2022 - DVBS/S2 Satellite demod/tuner driver
@ -4373,20 +4395,24 @@ diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/m88ds3103_priv.h linux-3.1
+};
+
+#endif /* M88DS3103_PRIV_H */
diff -Naur linux-3.13-rc6/drivers/media/dvb-frontends/Makefile linux-3.13-rc6.patch/drivers/media/dvb-frontends/Makefile
--- linux-3.13-rc6/drivers/media/dvb-frontends/Makefile 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/dvb-frontends/Makefile 2013-12-31 00:36:51.004678626 +0100
@@ -104,4 +104,5 @@
obj-$(CONFIG_DVB_RTL2832) += rtl2832.o
obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
obj-$(CONFIG_DVB_AF9033) += af9033.o
-
+obj-$(CONFIG_DVB_M88DS3103) += m88ds3103.o
+obj-$(CONFIG_DVB_M88DC2800) += m88dc2800.o
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.c
--- linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.c 2013-12-31 00:36:51.004678626 +0100
@@ -426,7 +426,7 @@
diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
index d1dcb1d..478f3dc 100644
--- a/drivers/media/pci/cx23885/Kconfig
+++ b/drivers/media/pci/cx23885/Kconfig
@@ -23,6 +23,8 @@ config VIDEO_CX23885
select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+ select DVB_M88DC2800 if MEDIA_SUBDRV_AUTOSELECT
select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c
index 16fa7ea..2b63f78 100644
--- a/drivers/media/pci/cx23885/cimax2.c
+++ b/drivers/media/pci/cx23885/cimax2.c
@@ -426,7 +426,7 @@ int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221,
return state->status;
}
@ -4395,7 +4421,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.c linux-3.13-rc6.patc
{
struct netup_ci_state *state;
u8 cimax_init[34] = {
@@ -475,6 +475,11 @@
@@ -475,6 +475,11 @@ int netup_ci_init(struct cx23885_tsport *port)
goto err;
}
@ -4407,7 +4433,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.c linux-3.13-rc6.patc
port->port_priv = state;
switch (port->nr) {
@@ -548,3 +553,19 @@
@@ -548,3 +553,19 @@ void netup_ci_exit(struct cx23885_tsport *port)
dvb_ca_en50221_release(&state->ca);
kfree(state);
}
@ -4427,10 +4453,11 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.c linux-3.13-rc6.patc
+
+ return 1;
+}
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.h linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.h
--- linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.h 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cimax2.h 2013-12-31 00:36:51.004678626 +0100
@@ -41,7 +41,9 @@
diff --git a/drivers/media/pci/cx23885/cimax2.h b/drivers/media/pci/cx23885/cimax2.h
index 518744a..39f3db7 100644
--- a/drivers/media/pci/cx23885/cimax2.h
+++ b/drivers/media/pci/cx23885/cimax2.h
@@ -41,7 +41,9 @@ extern int netup_ci_slot_ts_ctl(struct dvb_ca_en50221 *en50221, int slot);
extern int netup_ci_slot_status(struct cx23885_dev *dev, u32 pci_status);
extern int netup_poll_ci_slot_status(struct dvb_ca_en50221 *en50221,
int slot, int open);
@ -4441,10 +4468,11 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cimax2.h linux-3.13-rc6.patc
+extern int dvbsky_ci_slot_status(struct cx23885_dev *dev);
+
#endif
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-cards.c
--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-cards.c 2013-12-31 00:36:51.004678626 +0100
@@ -613,6 +613,34 @@
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 79f20c8..cb00710 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -613,6 +613,34 @@ struct cx23885_board cx23885_boards[] = {
.name = "TeVii S471",
.portb = CX23885_MPEG_DVB,
},
@ -4479,7 +4507,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
[CX23885_BOARD_PROF_8000] = {
.name = "Prof Revolution DVB-S2 8000",
.portb = CX23885_MPEG_DVB,
@@ -874,6 +902,30 @@
@@ -874,6 +902,30 @@ struct cx23885_subid cx23885_subids[] = {
.subdevice = 0x9022,
.card = CX23885_BOARD_TEVII_S471,
}, {
@ -4510,7 +4538,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
.subvendor = 0x8000,
.subdevice = 0x3034,
.card = CX23885_BOARD_PROF_8000,
@@ -1483,9 +1535,84 @@
@@ -1483,9 +1535,84 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
cx_set(GP0_IO, 0x00040004);
mdelay(60);
break;
@ -4595,7 +4623,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
int cx23885_ir_init(struct cx23885_dev *dev)
{
static struct v4l2_subdev_io_pin_config ir_rxtx_pin_cfg[] = {
@@ -1573,6 +1700,23 @@
@@ -1573,6 +1700,23 @@ int cx23885_ir_init(struct cx23885_dev *dev)
v4l2_subdev_call(dev->sd_cx25840, core, s_io_pin_config,
ir_rx_pin_cfg_count, ir_rx_pin_cfg);
break;
@ -4619,7 +4647,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
case CX23885_BOARD_HAUPPAUGE_HVR1250:
if (!enable_885_ir)
break;
@@ -1602,6 +1746,12 @@
@@ -1602,6 +1746,12 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
cx23888_ir_remove(dev);
dev->sd_ir = NULL;
break;
@ -4632,7 +4660,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_HAUPPAUGE_HVR1250:
@@ -1649,6 +1799,12 @@
@@ -1649,6 +1799,12 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
if (dev->sd_ir)
cx23885_irq_add_enable(dev, PCI_MSK_IR);
break;
@ -4645,7 +4673,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_HAUPPAUGE_HVR1250:
@@ -1752,6 +1908,10 @@
@@ -1752,6 +1908,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
break;
@ -4656,7 +4684,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_TEVII_S471:
case CX23885_BOARD_DVBWORLD_2005:
@@ -1800,6 +1960,22 @@
@@ -1800,6 +1960,22 @@ void cx23885_card_setup(struct cx23885_dev *dev)
ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
break;
@ -4679,7 +4707,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
case CX23885_BOARD_HAUPPAUGE_HVR1250:
case CX23885_BOARD_HAUPPAUGE_HVR1500:
case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
@@ -1857,6 +2033,12 @@
@@ -1857,6 +2033,12 @@ void cx23885_card_setup(struct cx23885_dev *dev)
case CX23885_BOARD_MPX885:
case CX23885_BOARD_MYGICA_X8507:
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
@ -4692,10 +4720,11 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-cards.c linux-3.13-r
case CX23885_BOARD_AVERMEDIA_HC81R:
case CX23885_BOARD_TBS_6980:
case CX23885_BOARD_TBS_6981:
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-core.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-core.c
--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-core.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-core.c 2013-12-31 00:36:51.005678622 +0100
@@ -1909,6 +1909,10 @@
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index edcd79d..4b57eef 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -1909,6 +1909,10 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
(pci_status & PCI_MSK_GPIO0))
handled += altera_ci_irq(dev);
@ -4706,7 +4735,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-core.c linux-3.13-rc
if (ts1_status) {
if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB)
handled += cx23885_irq_ts(ts1, ts1_status);
@@ -2141,6 +2145,8 @@
@@ -2141,6 +2145,8 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
cx23885_irq_add_enable(dev, PCI_MSK_GPIO1 | PCI_MSK_GPIO0);
break;
case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
@ -4715,9 +4744,10 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-core.c linux-3.13-rc
cx23885_irq_add_enable(dev, PCI_MSK_GPIO0);
break;
}
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-dvb.c
--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-dvb.c 2013-12-31 00:38:25.559251380 +0100
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 0549205..86c0cf2 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -52,6 +52,8 @@
#include "lnbh24.h"
#include "cx24116.h"
@ -4727,7 +4757,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6
#include "cimax2.h"
#include "lgs8gxx.h"
#include "netup-eeprom.h"
@@ -507,6 +509,93 @@
@@ -507,6 +509,93 @@ static struct xc5000_config mygica_x8507_xc5000_config = {
.if_khz = 4000,
};
@ -4821,7 +4851,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6
static struct stv090x_config prof_8000_stv090x_config = {
.device = STV0903,
.demod_mode = STV090x_SINGLE,
@@ -1311,6 +1400,57 @@
@@ -1311,6 +1400,57 @@ static int dvb_register(struct cx23885_tsport *port)
&tevii_ts2020_config, &i2c_bus->i2c_adap);
}
break;
@ -4879,7 +4909,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6
case CX23885_BOARD_PROF_8000:
i2c_bus = &dev->i2c_bus[0];
@@ -1386,7 +1526,7 @@
@@ -1386,7 +1526,7 @@ static int dvb_register(struct cx23885_tsport *port)
printk(KERN_INFO "NetUP Dual DVB-S2 CI card port%d MAC=%pM\n",
port->nr, port->frontends.adapter.proposed_mac);
@ -4888,7 +4918,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6
break;
}
case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF: {
@@ -1413,6 +1553,41 @@
@@ -1413,6 +1553,41 @@ static int dvb_register(struct cx23885_tsport *port)
memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6);
break;
}
@ -4930,7 +4960,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6
}
return ret;
@@ -1495,6 +1670,8 @@
@@ -1495,6 +1670,8 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port)
switch (port->dev->board) {
case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
@ -4939,37 +4969,11 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-dvb.c linux-3.13-rc6
netup_ci_exit(port);
break;
case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885.h linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885.h
--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885.h 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885.h 2013-12-31 00:36:51.006678617 +0100
@@ -97,6 +97,14 @@
#define CX23885_BOARD_TBS_6980 41
#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 42
+#define CX23885_BOARD_BASE_INDEX 40
+#define CX23885_BOARD_BST_PS8512 (CX23885_BOARD_BASE_INDEX)
+#define CX23885_BOARD_DVBSKY_S952 (CX23885_BOARD_BASE_INDEX+1)
+#define CX23885_BOARD_DVBSKY_S950 (CX23885_BOARD_BASE_INDEX+2)
+#define CX23885_BOARD_DVBSKY_S950_CI (CX23885_BOARD_BASE_INDEX+3)
+#define CX23885_BOARD_DVBSKY_C2800E_CI (CX23885_BOARD_BASE_INDEX+4)
+#define CX23885_BOARD_DVBSKY_T9580 (CX23885_BOARD_BASE_INDEX+5)
+
#define GPIO_0 0x00000001
#define GPIO_1 0x00000002
#define GPIO_2 0x00000004
@@ -234,7 +242,7 @@
*/
u32 clk_freq;
struct cx23885_input input[MAX_CX23885_INPUT];
- int ci_type; /* for NetUP */
+ int ci_type; /* 1 and 2 for NetUP, 3 for DVBSky. */
/* Force bottom field first during DMA (888 workaround) */
u32 force_bff;
};
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-input.c linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-input.c
--- linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-input.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/cx23885-input.c 2013-12-31 00:36:51.006678617 +0100
@@ -89,6 +89,12 @@
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 8a49e7c..a5e4639 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -89,6 +89,12 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
case CX23885_BOARD_TEVII_S470:
case CX23885_BOARD_HAUPPAUGE_HVR1250:
@ -4982,7 +4986,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-input.c linux-3.13-r
case CX23885_BOARD_MYGICA_X8507:
case CX23885_BOARD_TBS_6980:
case CX23885_BOARD_TBS_6981:
@@ -143,6 +149,12 @@
@@ -143,6 +149,12 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
case CX23885_BOARD_HAUPPAUGE_HVR1850:
case CX23885_BOARD_HAUPPAUGE_HVR1290:
case CX23885_BOARD_HAUPPAUGE_HVR1250:
@ -4995,7 +4999,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-input.c linux-3.13-r
case CX23885_BOARD_MYGICA_X8507:
/*
* The IR controller on this board only returns pulse widths.
@@ -295,6 +307,18 @@
@@ -295,6 +307,18 @@ int cx23885_input_init(struct cx23885_dev *dev)
/* A guess at the remote */
rc_map = RC_MAP_TEVII_NEC;
break;
@ -5014,22 +5018,51 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/cx23885-input.c linux-3.13-r
case CX23885_BOARD_MYGICA_X8507:
/* Integrated CX23885 IR controller */
driver_type = RC_DRIVER_IR_RAW;
diff -Naur linux-3.13-rc6/drivers/media/pci/cx23885/Kconfig linux-3.13-rc6.patch/drivers/media/pci/cx23885/Kconfig
--- linux-3.13-rc6/drivers/media/pci/cx23885/Kconfig 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx23885/Kconfig 2013-12-31 00:37:32.577490726 +0100
@@ -24,6 +24,8 @@
select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 0fa4048..bd33b00 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -97,6 +97,14 @@
#define CX23885_BOARD_TBS_6980 41
#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 42
+#define CX23885_BOARD_BASE_INDEX 43
+#define CX23885_BOARD_BST_PS8512 (CX23885_BOARD_BASE_INDEX)
+#define CX23885_BOARD_DVBSKY_S952 (CX23885_BOARD_BASE_INDEX+1)
+#define CX23885_BOARD_DVBSKY_S950 (CX23885_BOARD_BASE_INDEX+2)
+#define CX23885_BOARD_DVBSKY_S950_CI (CX23885_BOARD_BASE_INDEX+3)
+#define CX23885_BOARD_DVBSKY_C2800E_CI (CX23885_BOARD_BASE_INDEX+4)
+#define CX23885_BOARD_DVBSKY_T9580 (CX23885_BOARD_BASE_INDEX+5)
+
#define GPIO_0 0x00000001
#define GPIO_1 0x00000002
#define GPIO_2 0x00000004
@@ -234,7 +242,7 @@ struct cx23885_board {
*/
u32 clk_freq;
struct cx23885_input input[MAX_CX23885_INPUT];
- int ci_type; /* for NetUP */
+ int ci_type; /* 1 and 2 for NetUP, 3 for DVBSky. */
/* Force bottom field first during DMA (888 workaround) */
u32 force_bff;
};
diff --git a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
index a63a9ad..ccf0e6a 100644
--- a/drivers/media/pci/cx88/Kconfig
+++ b/drivers/media/pci/cx88/Kconfig
@@ -57,6 +57,7 @@ config VIDEO_CX88_DVB
select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+ select DVB_M88DC2800 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-cards.c linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-cards.c
--- linux-3.13-rc6/drivers/media/pci/cx88/cx88-cards.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-cards.c 2013-12-31 00:36:51.007678613 +0100
@@ -2314,6 +2314,18 @@
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
index e18a7ac..317511d 100644
--- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -2314,6 +2314,18 @@ static const struct cx88_board cx88_boards[] = {
} },
.mpeg = CX88_MPEG_DVB,
},
@ -5048,7 +5081,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-cards.c linux-3.13-rc6.pat
};
/* ------------------------------------------------------------------ */
@@ -2818,6 +2830,10 @@
@@ -2818,6 +2830,10 @@ static const struct cx88_subid cx88_subids[] = {
.subvendor = 0x1822,
.subdevice = 0x0023,
.card = CX88_BOARD_TWINHAN_VP1027_DVBS,
@ -5059,7 +5092,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-cards.c linux-3.13-rc6.pat
},
};
@@ -3551,6 +3567,12 @@
@@ -3551,6 +3567,12 @@ static void cx88_card_setup(struct cx88_core *core)
cx_write(MO_SRST_IO, 1);
msleep(100);
break;
@ -5072,9 +5105,10 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-cards.c linux-3.13-rc6.pat
} /*end switch() */
diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-dvb.c
--- linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-dvb.c 2013-12-31 00:36:51.007678613 +0100
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index 053ed1b..b4269a8 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -54,6 +54,7 @@
#include "stv0288.h"
#include "stb6000.h"
@ -5083,7 +5117,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c linux-3.13-rc6.patch
#include "stv0900.h"
#include "stb6100.h"
#include "stb6100_proc.h"
@@ -459,6 +460,56 @@
@@ -459,6 +460,56 @@ static int tevii_dvbs_set_voltage(struct dvb_frontend *fe,
return core->prev_set_voltage(fe, voltage);
return 0;
}
@ -5140,7 +5174,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c linux-3.13-rc6.patch
static int vp1027_set_voltage(struct dvb_frontend *fe,
fe_sec_voltage_t voltage)
@@ -706,6 +757,11 @@
@@ -706,6 +757,11 @@ static struct ts2020_config tevii_ts2020_config = {
.clk_out_div = 1,
};
@ -5152,7 +5186,7 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c linux-3.13-rc6.patch
static const struct stv0900_config prof_7301_stv0900_config = {
.demod_address = 0x6a,
/* demod_mode = 0,*/
@@ -1487,6 +1543,35 @@
@@ -1487,6 +1543,35 @@ static int dvb_register(struct cx8802_dev *dev)
tevii_dvbs_set_voltage;
}
break;
@ -5188,21 +5222,11 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-dvb.c linux-3.13-rc6.patch
case CX88_BOARD_OMICOM_SS4_PCI:
case CX88_BOARD_TBS_8920:
case CX88_BOARD_PROF_7300:
diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88.h linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88.h
--- linux-3.13-rc6/drivers/media/pci/cx88/cx88.h 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88.h 2013-12-31 00:36:51.007678613 +0100
@@ -237,6 +237,7 @@
#define CX88_BOARD_WINFAST_DTV1800H_XC4000 88
#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36 89
#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43 90
+#define CX88_BOARD_BST_PS8312 91
enum cx88_itype {
CX88_VMUX_COMPOSITE1 = 1,
diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-input.c linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-input.c
--- linux-3.13-rc6/drivers/media/pci/cx88/cx88-input.c 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx88/cx88-input.c 2013-12-31 00:36:51.007678613 +0100
@@ -419,6 +419,10 @@
diff --git a/drivers/media/pci/cx88/cx88-input.c b/drivers/media/pci/cx88/cx88-input.c
index f29e18c..42a911c 100644
--- a/drivers/media/pci/cx88/cx88-input.c
+++ b/drivers/media/pci/cx88/cx88-input.c
@@ -419,6 +419,10 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
rc_type = RC_BIT_NEC;
ir->sampling = 0xff00; /* address */
break;
@ -5213,21 +5237,23 @@ diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/cx88-input.c linux-3.13-rc6.pat
}
if (!ir_codes) {
diff -Naur linux-3.13-rc6/drivers/media/pci/cx88/Kconfig linux-3.13-rc6.patch/drivers/media/pci/cx88/Kconfig
--- linux-3.13-rc6/drivers/media/pci/cx88/Kconfig 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/pci/cx88/Kconfig 2013-12-31 00:36:51.007678613 +0100
@@ -57,6 +57,7 @@
select DVB_ISL6421 if MEDIA_SUBDRV_AUTOSELECT
select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT
select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0299 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STV0288 if MEDIA_SUBDRV_AUTOSELECT
select DVB_STB6000 if MEDIA_SUBDRV_AUTOSELECT
diff -Naur linux-3.13-rc6/drivers/media/rc/keymaps/Makefile linux-3.13-rc6.patch/drivers/media/rc/keymaps/Makefile
--- linux-3.13-rc6/drivers/media/rc/keymaps/Makefile 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/rc/keymaps/Makefile 2013-12-31 00:36:51.007678613 +0100
@@ -28,6 +28,7 @@
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index 28893a6..5fa5f48 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -237,6 +237,7 @@ extern const struct sram_channel cx88_sram_channels[];
#define CX88_BOARD_WINFAST_DTV1800H_XC4000 88
#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F36 89
#define CX88_BOARD_WINFAST_TV2000_XP_GLOBAL_6F43 90
+#define CX88_BOARD_BST_PS8312 91
enum cx88_itype {
CX88_VMUX_COMPOSITE1 = 1,
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index b1cde8c..563a109 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
rc-dm1105-nec.o \
rc-dntv-live-dvb-t.o \
rc-dntv-live-dvbt-pro.o \
@ -5235,9 +5261,11 @@ diff -Naur linux-3.13-rc6/drivers/media/rc/keymaps/Makefile linux-3.13-rc6.patch
rc-em-terratec.o \
rc-encore-enltv2.o \
rc-encore-enltv.o \
diff -Naur linux-3.13-rc6/drivers/media/rc/keymaps/rc-dvbsky.c linux-3.13-rc6.patch/drivers/media/rc/keymaps/rc-dvbsky.c
--- linux-3.13-rc6/drivers/media/rc/keymaps/rc-dvbsky.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/rc/keymaps/rc-dvbsky.c 2013-12-31 00:36:51.007678613 +0100
diff --git a/drivers/media/rc/keymaps/rc-dvbsky.c b/drivers/media/rc/keymaps/rc-dvbsky.c
new file mode 100644
index 0000000..bfc41fb
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-dvbsky.c
@@ -0,0 +1,78 @@
+/* rc-dvbsky.c - Keytable for Dvbsky Remote Controllers
+ *
@ -5317,9 +5345,39 @@ diff -Naur linux-3.13-rc6/drivers/media/rc/keymaps/rc-dvbsky.c linux-3.13-rc6.pa
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Nibble Max <nibble.max@gmail.com>");
diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/dvbsky.c
--- linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/dvbsky.c 2013-12-31 00:36:51.008678608 +0100
diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
index 2059d0c..1dc0600 100644
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -147,3 +147,9 @@ config DVB_USB_RTL28XXU
help
Say Y here to support the Realtek RTL28xxU DVB USB receiver.
+config DVB_USB_DVBSKY
+ tristate "DVBSky USB2.0 support"
+ depends on DVB_USB_V2
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+ help
+ Say Y here to support the USB receivers from DVBSky.
diff --git a/drivers/media/usb/dvb-usb-v2/Makefile b/drivers/media/usb/dvb-usb-v2/Makefile
index 2c06714..e002b57 100644
--- a/drivers/media/usb/dvb-usb-v2/Makefile
+++ b/drivers/media/usb/dvb-usb-v2/Makefile
@@ -40,6 +40,9 @@ obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
dvb-usb-rtl28xxu-objs := rtl28xxu.o
obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
+dvb-usb-dvbsky-objs := dvbsky.o
+obj-$(CONFIG_DVB_USB_DVBSKY) += dvb-usb-dvbsky.o
+
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/tuners
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
new file mode 100644
index 0000000..45bedfc
--- /dev/null
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -0,0 +1,741 @@
+/*
+ * Driver for DVBSky USB2.0 receiver
@ -5834,16 +5892,16 @@ diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c linux-3.13-rc6.p
+ return dvbsky_gpio_ctrl(d, 0x80, value);
+}
+
+static int dvbsky_usb_ci_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{
+ struct dvb_usb_device *d = fe_to_d(fe);
+ u8 value;
+
+ if (voltage == SEC_VOLTAGE_OFF)
+ value = 0;
+ else
+ value = 1;
+ return dvbsky_gpio_ctrl(d, 0x00, value);
+static int dvbsky_usb_ci_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+{
+ struct dvb_usb_device *d = fe_to_d(fe);
+ u8 value;
+
+ if (voltage == SEC_VOLTAGE_OFF)
+ value = 0;
+ else
+ value = 1;
+ return dvbsky_gpio_ctrl(d, 0x00, value);
+}
+
+static int dvbsky_read_mac_addr(struct dvb_usb_adapter *adap, u8 mac[6])
@ -5911,41 +5969,41 @@ diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c linux-3.13-rc6.p
+ return ret;
+}
+
+static struct m88ds3103_config dvbsky_usb_ds3103_ci_config = {
+ .demod_address = 0x68,
+ .ci_mode = 2,
+ .pin_ctrl = 0x82,
+ .ts_mode = 0,
+ .start_ctrl = dvbsky_sync_ctrl,
+ .set_voltage = dvbsky_usb_ci_set_voltage,
+static struct m88ds3103_config dvbsky_usb_ds3103_ci_config = {
+ .demod_address = 0x68,
+ .ci_mode = 2,
+ .pin_ctrl = 0x82,
+ .ts_mode = 0,
+ .start_ctrl = dvbsky_sync_ctrl,
+ .set_voltage = dvbsky_usb_ci_set_voltage,
+};
+
+static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap)
+{
+ struct dvbsky_state *state = adap_to_priv(adap);
+ struct dvb_usb_device *d = adap_to_d(adap);
+ int ret = 0;
+
+ dprintk("%s, build on %s %s()\n", __func__, __DATE__,__TIME__);
+
+ dvbsky_gpio_ctrl(d, 0x04, 1);
+
+ dvbsky_gpio_ctrl(d, 0x83, 0);
+ msleep(50);
+ dvbsky_gpio_ctrl(d, 0x83, 1);
+ msleep(20);
+
+ adap->fe[0] = dvb_attach(m88ds3103_attach,
+ &dvbsky_usb_ds3103_ci_config,
+ &d->i2c_adap);
+ if (!adap->fe[0]) {
+ printk(KERN_ERR "dvbsky_s960c_attach fail.");
+ ret = -ENODEV;
+ }
+
+ state->has_ci = 1;
+
+ return ret;
+
+static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap)
+{
+ struct dvbsky_state *state = adap_to_priv(adap);
+ struct dvb_usb_device *d = adap_to_d(adap);
+ int ret = 0;
+
+ dprintk("%s, build on %s %s()\n", __func__, __DATE__,__TIME__);
+
+ dvbsky_gpio_ctrl(d, 0x04, 1);
+
+ dvbsky_gpio_ctrl(d, 0x83, 0);
+ msleep(50);
+ dvbsky_gpio_ctrl(d, 0x83, 1);
+ msleep(20);
+
+ adap->fe[0] = dvb_attach(m88ds3103_attach,
+ &dvbsky_usb_ds3103_ci_config,
+ &d->i2c_adap);
+ if (!adap->fe[0]) {
+ printk(KERN_ERR "dvbsky_s960c_attach fail.");
+ ret = -ENODEV;
+ }
+
+ state->has_ci = 1;
+
+ return ret;
+}
+
+static int dvbsky_identify_state(struct dvb_usb_device *d, const char **name)
@ -5985,29 +6043,29 @@ diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c linux-3.13-rc6.p
+}
+
+/* DVB USB Driver stuff */
+static struct dvb_usb_device_properties dvbsky_s960c_props = {
+ .driver_name = KBUILD_MODNAME,
+ .owner = THIS_MODULE,
+ .adapter_nr = adapter_nr,
+ .size_of_priv = sizeof(struct dvbsky_state),
+
+ .generic_bulk_ctrl_endpoint = 0x01,
+ .generic_bulk_ctrl_endpoint_response = 0x81,
+
+ .i2c_algo = &dvbsky_i2c_algo,
+ .frontend_attach = dvbsky_s960c_attach,
+ .init = dvbsky_init,
+ .get_rc_config = dvbsky_get_rc_config,
+ .streaming_ctrl = dvbsky_streaming_ctrl,
+ .identify_state = dvbsky_identify_state,
+ .exit = dvbsky_exit,
+
+ .num_adapters = 1,
+ .adapter = {
+ {
+ .stream = DVB_USB_STREAM_BULK(0x82, 8, 4096),
+ }
+ }
+static struct dvb_usb_device_properties dvbsky_s960c_props = {
+ .driver_name = KBUILD_MODNAME,
+ .owner = THIS_MODULE,
+ .adapter_nr = adapter_nr,
+ .size_of_priv = sizeof(struct dvbsky_state),
+
+ .generic_bulk_ctrl_endpoint = 0x01,
+ .generic_bulk_ctrl_endpoint_response = 0x81,
+
+ .i2c_algo = &dvbsky_i2c_algo,
+ .frontend_attach = dvbsky_s960c_attach,
+ .init = dvbsky_init,
+ .get_rc_config = dvbsky_get_rc_config,
+ .streaming_ctrl = dvbsky_streaming_ctrl,
+ .identify_state = dvbsky_identify_state,
+ .exit = dvbsky_exit,
+
+ .num_adapters = 1,
+ .adapter = {
+ {
+ .stream = DVB_USB_STREAM_BULK(0x82, 8, 4096),
+ }
+ }
+};
+
+static struct dvb_usb_device_properties dvbsky_s960_props = {
@ -6037,7 +6095,7 @@ diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c linux-3.13-rc6.p
+};
+
+static const struct usb_device_id dvbsky_id_table[] = {
+ { DVB_USB_DEVICE(0x0572, 0x960c,
+ { DVB_USB_DEVICE(0x0572, 0x960c,
+ &dvbsky_s960c_props, "DVBSky S960CI", RC_MAP_DVBSKY) },
+ { DVB_USB_DEVICE(0x0572, 0x6831,
+ &dvbsky_s960_props, "DVBSky S960/S860", RC_MAP_DVBSKY) },
@ -6062,36 +6120,11 @@ diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/dvbsky.c linux-3.13-rc6.p
+MODULE_AUTHOR("Max nibble <nibble.max@gmail.com>");
+MODULE_DESCRIPTION("Driver for DVBSky USB2.0");
+MODULE_LICENSE("GPL");
diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Kconfig linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Kconfig
--- linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Kconfig 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Kconfig 2013-12-31 00:36:51.008678608 +0100
@@ -147,3 +147,9 @@
help
Say Y here to support the Realtek RTL28xxU DVB USB receiver.
+config DVB_USB_DVBSKY
+ tristate "DVBSky USB2.0 support"
+ depends on DVB_USB_V2
+ select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+ help
+ Say Y here to support the USB receivers from DVBSky.
diff -Naur linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Makefile linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Makefile
--- linux-3.13-rc6/drivers/media/usb/dvb-usb-v2/Makefile 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/drivers/media/usb/dvb-usb-v2/Makefile 2013-12-31 00:36:51.008678608 +0100
@@ -40,6 +40,9 @@
dvb-usb-rtl28xxu-objs := rtl28xxu.o
obj-$(CONFIG_DVB_USB_RTL28XXU) += dvb-usb-rtl28xxu.o
+dvb-usb-dvbsky-objs := dvbsky.o
+obj-$(CONFIG_DVB_USB_DVBSKY) += dvb-usb-dvbsky.o
+
ccflags-y += -I$(srctree)/drivers/media/dvb-core
ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
ccflags-y += -I$(srctree)/drivers/media/tuners
diff -Naur linux-3.13-rc6/include/media/rc-map.h linux-3.13-rc6.patch/include/media/rc-map.h
--- linux-3.13-rc6/include/media/rc-map.h 2013-12-30 01:01:33.000000000 +0100
+++ linux-3.13-rc6.patch/include/media/rc-map.h 2013-12-31 00:36:51.023678540 +0100
@@ -119,6 +119,7 @@
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 6628f5d..64646e3 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -119,6 +119,7 @@ void rc_map_init(void);
#define RC_MAP_DM1105_NEC "rc-dm1105-nec"
#define RC_MAP_DNTV_LIVE_DVBT_PRO "rc-dntv-live-dvbt-pro"
#define RC_MAP_DNTV_LIVE_DVB_T "rc-dntv-live-dvb-t"

0
packages/linux/patches/3.13-rc6/linux-212-mantis_stb0899_faster_lock.patch → packages/linux/patches/3.13.0-rc6/linux-212-mantis_stb0899_faster_lock.patch
View File

0
packages/linux/patches/3.13-rc6/linux-222-stb0899_signal_quality.patch → packages/linux/patches/3.13.0-rc6/linux-222-stb0899_signal_quality.patch
View File

0
packages/linux/patches/3.13-rc6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch → packages/linux/patches/3.13.0-rc6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
View File

0
packages/linux/patches/3.13-rc6/linux-701-linksys_aes2500_brcmfmac.patch → packages/linux/patches/3.13.0-rc6/linux-701-linksys_aes2500_brcmfmac.patch
View File

0
packages/linux/patches/3.13-rc6/linux-703-macmini2012-ethernet.patch → packages/linux/patches/3.13.0-rc6/linux-703-macmini2012-ethernet.patch
View File

0
packages/linux/patches/3.13-rc6/linux-704-Support-for-Ubiquiti-WifiStation.patch → packages/linux/patches/3.13.0-rc6/linux-704-Support-for-Ubiquiti-WifiStation.patch
View File

0
packages/linux/patches/3.13-rc6/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch → packages/linux/patches/3.13.0-rc6/linux-705-Support-for-Buffalo-WLI-UC-G300HP-V1.patch
View File

0
packages/linux/patches/3.13-rc6/linux-706-Sitecom-N300.patch → packages/linux/patches/3.13.0-rc6/linux-706-Sitecom-N300.patch
View File

0
packages/linux/patches/3.13-rc6/linux-900-hide_tsc_error.patch → packages/linux/patches/3.13.0-rc6/linux-900-hide_tsc_error.patch
View File

0
packages/linux/patches/3.13-rc6/linux-950-saa716x_PCIe_interface_chipset.patch → packages/linux/patches/3.13.0-rc6/linux-950-saa716x_PCIe_interface_chipset.patch
View File

0
packages/linux/patches/3.13-rc6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch → packages/linux/patches/3.13.0-rc6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch
View File

0
packages/linux/patches/3.13-rc6/linux-991.01-ptrace_fix.patch → packages/linux/patches/3.13.0-rc6/linux-991.01-ptrace_fix.patch
View File

47
packages/linux/patches/3.13.0-rc6/linux-992-0001-drm-radeon-set-correct-pipe-config-for-Hawaii-in-DCE.patch Normal file
View File

@ -0,0 +1,47 @@
From 35a905282b20e556cd09f348f9c2bc8a22ea26d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Mon, 23 Dec 2013 17:11:35 +0100
Subject: [PATCH 2/4] drm/radeon: set correct pipe config for Hawaii in DCE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/radeon/atombios_crtc.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index b197059..ec97bad 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1180,19 +1180,12 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_1D_TILED_THIN1);
if (rdev->family >= CHIP_BONAIRE) {
- u32 num_pipe_configs = rdev->config.cik.max_tile_pipes;
- u32 num_rb = rdev->config.cik.max_backends_per_se;
- if (num_pipe_configs > 8)
- num_pipe_configs = 8;
- if (num_pipe_configs == 8)
- fb_format |= CIK_GRPH_PIPE_CONFIG(CIK_ADDR_SURF_P8_32x32_16x16);
- else if (num_pipe_configs == 4) {
- if (num_rb == 4)
- fb_format |= CIK_GRPH_PIPE_CONFIG(CIK_ADDR_SURF_P4_16x16);
- else if (num_rb < 4)
- fb_format |= CIK_GRPH_PIPE_CONFIG(CIK_ADDR_SURF_P4_8x16);
- } else if (num_pipe_configs == 2)
- fb_format |= CIK_GRPH_PIPE_CONFIG(CIK_ADDR_SURF_P2);
+ /* Read the pipe config from the 2D TILED SCANOUT mode.
+ * It should be the same for the other modes too, but not all
+ * modes set the pipe config field. */
+ u32 pipe_config = (rdev->config.cik.tile_mode_array[10] >> 6) & 0x1f;
+
+ fb_format |= CIK_GRPH_PIPE_CONFIG(pipe_config);
} else if ((rdev->family == CHIP_TAHITI) ||
(rdev->family == CHIP_PITCAIRN))
fb_format |= SI_GRPH_PIPE_CONFIG(SI_ADDR_SURF_P8_32x32_8x16);
--
1.8.3.2

106
packages/linux/patches/3.13.0-rc6/linux-992-0002-drm-radeon-expose-render-backend-mask-to-the-userspa.patch Normal file
View File

@ -0,0 +1,106 @@
From 439a1cfffe2c1a06e5a6394ccd5d18a8e89b15d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Sun, 22 Dec 2013 02:18:01 +0100
Subject: [PATCH 1/4] drm/radeon: expose render backend mask to the userspace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This will allow userspace to correctly program the PA_SC_RASTER_CONFIG
register, so it can be considered a fix.
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/radeon/cik.c | 2 ++
drivers/gpu/drm/radeon/radeon.h | 4 ++--
drivers/gpu/drm/radeon/radeon_kms.c | 9 +++++++++
drivers/gpu/drm/radeon/si.c | 2 ++
include/uapi/drm/radeon_drm.h | 2 ++
5 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 138a776..e950fab 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -3114,6 +3114,8 @@ static void cik_setup_rb(struct radeon_device *rdev,
mask <<= 1;
}
+ rdev->config.cik.backend_enable_mask = enabled_rbs;
+
for (i = 0; i < se_num; i++) {
cik_select_se_sh(rdev, i, 0xffffffff);
data = 0;
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index b1f990d..45e1f44 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1940,7 +1940,7 @@ struct si_asic {
unsigned sc_earlyz_tile_fifo_size;
unsigned num_tile_pipes;
- unsigned num_backends_per_se;
+ unsigned backend_enable_mask;
unsigned backend_disable_mask_per_asic;
unsigned backend_map;
unsigned num_texture_channel_caches;
@@ -1970,7 +1970,7 @@ struct cik_asic {
unsigned sc_earlyz_tile_fifo_size;
unsigned num_tile_pipes;
- unsigned num_backends_per_se;
+ unsigned backend_enable_mask;
unsigned backend_disable_mask_per_asic;
unsigned backend_map;
unsigned num_texture_channel_caches;
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 55d0b47..21d593c 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -461,6 +461,15 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
case RADEON_INFO_SI_CP_DMA_COMPUTE:
*value = 1;
break;
+ case RADEON_INFO_SI_BACKEND_ENABLED_MASK:
+ if (rdev->family >= CHIP_BONAIRE) {
+ *value = rdev->config.cik.backend_enable_mask;
+ } else if (rdev->family >= CHIP_TAHITI) {
+ *value = rdev->config.si.backend_enable_mask;
+ } else {
+ DRM_DEBUG_KMS("BACKEND_ENABLED_MASK is si+ only!\n");
+ }
+ break;
default:
DRM_DEBUG_KMS("Invalid request %d\n", info->request);
return -EINVAL;
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 3eed9a1..85e1edf 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -2855,6 +2855,8 @@ static void si_setup_rb(struct radeon_device *rdev,
mask <<= 1;
}
+ rdev->config.si.backend_enable_mask = enabled_rbs;
+
for (i = 0; i < se_num; i++) {
si_select_se_sh(rdev, i, 0xffffffff);
data = 0;
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h
index 2f3f7ea..fe421e8 100644
--- a/include/uapi/drm/radeon_drm.h
+++ b/include/uapi/drm/radeon_drm.h
@@ -983,6 +983,8 @@ struct drm_radeon_cs {
#define RADEON_INFO_SI_CP_DMA_COMPUTE 0x17
/* CIK macrotile mode array */
#define RADEON_INFO_CIK_MACROTILE_MODE_ARRAY 0x18
+/* query the number of render backends */
+#define RADEON_INFO_SI_BACKEND_ENABLED_MASK 0x19
struct drm_radeon_info {
--
1.8.3.2

102
packages/linux/patches/3.13.0-rc6/linux-992-0003-drm-radeon-set-correct-pipe-config-for-Hawaii-in-DCE.patch Normal file
View File

@ -0,0 +1,102 @@
From e3ea94a60f12025a3a547964c31245e71ac8fa77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Mon, 23 Dec 2013 17:11:36 +0100
Subject: [PATCH 3/4] drm/radeon: set correct number of banks for CIK chips in
DCE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We don't have the NUM_BANKS parameter, so we have to calculate it
from the other parameters. NUM_BANKS is not constant on CIK.
This fixes 2D tiling for the display engine on CIK.
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/radeon/atombios_crtc.c | 64 +++++++++++++++++++++++-----------
1 file changed, 43 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
index ec97bad..0b9621c 100644
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1143,31 +1143,53 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc,
}
if (tiling_flags & RADEON_TILING_MACRO) {
- if (rdev->family >= CHIP_BONAIRE)
- tmp = rdev->config.cik.tile_config;
- else if (rdev->family >= CHIP_TAHITI)
- tmp = rdev->config.si.tile_config;
- else if (rdev->family >= CHIP_CAYMAN)
- tmp = rdev->config.cayman.tile_config;
- else
- tmp = rdev->config.evergreen.tile_config;
+ evergreen_tiling_fields(tiling_flags, &bankw, &bankh, &mtaspect, &tile_split);
- switch ((tmp & 0xf0) >> 4) {
- case 0: /* 4 banks */
- fb_format |= EVERGREEN_GRPH_NUM_BANKS(EVERGREEN_ADDR_SURF_4_BANK);
- break;
- case 1: /* 8 banks */
- default:
- fb_format |= EVERGREEN_GRPH_NUM_BANKS(EVERGREEN_ADDR_SURF_8_BANK);
- break;
- case 2: /* 16 banks */
- fb_format |= EVERGREEN_GRPH_NUM_BANKS(EVERGREEN_ADDR_SURF_16_BANK);
- break;
+ /* Set NUM_BANKS. */
+ if (rdev->family >= CHIP_BONAIRE) {
+ unsigned tileb, index, num_banks, tile_split_bytes;
+
+ /* Calculate the macrotile mode index. */
+ tile_split_bytes = 64 << tile_split;
+ tileb = 8 * 8 * target_fb->bits_per_pixel / 8;
+ tileb = min(tile_split_bytes, tileb);
+
+ for (index = 0; tileb > 64; index++) {
+ tileb >>= 1;
+ }
+
+ if (index >= 16) {
+ DRM_ERROR("Wrong screen bpp (%u) or tile split (%u)\n",
+ target_fb->bits_per_pixel, tile_split);
+ return -EINVAL;
+ }
+
+ num_banks = (rdev->config.cik.macrotile_mode_array[index] >> 6) & 0x3;
+ fb_format |= EVERGREEN_GRPH_NUM_BANKS(num_banks);
+ } else {
+ /* SI and older. */
+ if (rdev->family >= CHIP_TAHITI)
+ tmp = rdev->config.si.tile_config;
+ else if (rdev->family >= CHIP_CAYMAN)
+ tmp = rdev->config.cayman.tile_config;
+ else
+ tmp = rdev->config.evergreen.tile_config;
+
+ switch ((tmp & 0xf0) >> 4) {
+ case 0: /* 4 banks */
+ fb_format |= EVERGREEN_GRPH_NUM_BANKS(EVERGREEN_ADDR_SURF_4_BANK);
+ break;
+ case 1: /* 8 banks */
+ default:
+ fb_format |= EVERGREEN_GRPH_NUM_BANKS(EVERGREEN_ADDR_SURF_8_BANK);
+ break;
+ case 2: /* 16 banks */
+ fb_format |= EVERGREEN_GRPH_NUM_BANKS(EVERGREEN_ADDR_SURF_16_BANK);
+ break;
+ }
}
fb_format |= EVERGREEN_GRPH_ARRAY_MODE(EVERGREEN_GRPH_ARRAY_2D_TILED_THIN1);
-
- evergreen_tiling_fields(tiling_flags, &bankw, &bankh, &mtaspect, &tile_split);
fb_format |= EVERGREEN_GRPH_TILE_SPLIT(tile_split);
fb_format |= EVERGREEN_GRPH_BANK_WIDTH(bankw);
fb_format |= EVERGREEN_GRPH_BANK_HEIGHT(bankh);
--
1.8.3.2

31
packages/linux/patches/3.13.0-rc6/linux-992-0004-drm-radeon-Bump-version-for-CIK-DCE-tiling-fix.patch Normal file
View File

@ -0,0 +1,31 @@
From 9482d0d37b46d2bd968d357bbd912cae49caf163 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 23 Dec 2013 11:31:44 -0500
Subject: [PATCH 4/4] drm/radeon: Bump version for CIK DCE tiling fix
Note when CIK DCE tiling was fixed.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/radeon/radeon_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 1958b36a..db39ea3 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -77,9 +77,10 @@
* 2.33.0 - Add SI tiling mode array query
* 2.34.0 - Add CIK tiling mode array query
* 2.35.0 - Add CIK macrotile mode array query
+ * 2.36.0 - Fix CIK DCE tiling setup
*/
#define KMS_DRIVER_MAJOR 2
-#define KMS_DRIVER_MINOR 35
+#define KMS_DRIVER_MINOR 36
#define KMS_DRIVER_PATCHLEVEL 0
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
int radeon_driver_unload_kms(struct drm_device *dev);
--
1.8.3.2

0
packages/linux/patches/3.13-rc6/linux-995-CX24120-13Z_frontend.patch → packages/linux/patches/3.13.0-rc6/linux-995-CX24120-13Z_frontend.patch
View File

0
packages/linux/patches/3.13-rc6/todo/linux-221-ngene-octopus.patch → packages/linux/patches/3.13.0-rc6/todo/linux-221-ngene-octopus.patch
View File

0
packages/linux/patches/3.13-rc6/todo/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch → packages/linux/patches/3.13.0-rc6/todo/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch
View File

2
packages/sysutils/busybox/config/suspend-modules.conf
View File

@ -1 +1 @@
SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm"
SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm mceusb"

16
packages/x11/driver/xf86-video-nvidia/patches.upstream/01-kernel-3.13.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/kernel/nv-acpi.c b/kernel/nv-acpi.c
index b0138cd..756f330 100644
--- a/kernel/nv-acpi.c
+++ b/kernel/nv-acpi.c
@@ -303,8 +303,11 @@ static int nv_acpi_remove(struct acpi_device *device, int type)
if (pNvAcpiObject->notify_handler_installed)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+/* beginning with 3.13, acpi_remove_notify_handler() waits for events to finish */
NV_ACPI_OS_WAIT_EVENTS_COMPLETE();
+#endif
// remove event notifier
status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
}