xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'media/v4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Browse Source 
Pull media fixes from Mauro Carvalho Chehab:
 "Three fixes:

   - dvb: fix a Kconfig typo on a help text

   - tegra-cec: reset rx_buf_cnt when start bit detected

   - rc: lirc does not use LIRC_CAN_SEND_SCANCODE feature"

* tag 'media/v4.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: dvb: fix a Kconfig typo
  media: tegra-cec: reset rx_buf_cnt when start bit detected
  media: rc: lirc does not use LIRC_CAN_SEND_SCANCODE feature
This commit is contained in:
Linus Torvalds
2018-03-23 10:59:38 -07:00
parent 8ce72017ca 2c27476e39
commit cde00d2169
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/Kconfig
View File

@@ -151,7 +151,7 @@ config DVB_MMAP
select VIDEOBUF2_VMALLOC select VIDEOBUF2_VMALLOC
default n default n
help help
This option enables DVB experimental memory-mapped API, with This option enables DVB experimental memory-mapped API, which
reduces the number of context switches to read DVB buffers, as reduces the number of context switches to read DVB buffers, as
the buffers can use mmap() syscalls. the buffers can use mmap() syscalls.

17
drivers/media/platform/tegra-cec/tegra_cec.c
View File

@@ -172,16 +172,13 @@ static irqreturn_t tegra_cec_irq_handler(int irq, void *data)
} }
} }
if (status & (TEGRA_CEC_INT_STAT_RX_REGISTER_OVERRUN | if (status & TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED) {
TEGRA_CEC_INT_STAT_RX_BUS_ANOMALY_DETECTED |
TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED |
TEGRA_CEC_INT_STAT_RX_BUS_ERROR_DETECTED)) {
cec_write(cec, TEGRA_CEC_INT_STAT, cec_write(cec, TEGRA_CEC_INT_STAT,
(TEGRA_CEC_INT_STAT_RX_REGISTER_OVERRUN | TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED);
TEGRA_CEC_INT_STAT_RX_BUS_ANOMALY_DETECTED | cec->rx_done = false;
TEGRA_CEC_INT_STAT_RX_START_BIT_DETECTED | cec->rx_buf_cnt = 0;
TEGRA_CEC_INT_STAT_RX_BUS_ERROR_DETECTED)); }
} else if (status & TEGRA_CEC_INT_STAT_RX_REGISTER_FULL) { if (status & TEGRA_CEC_INT_STAT_RX_REGISTER_FULL) {
u32 v; u32 v;
cec_write(cec, TEGRA_CEC_INT_STAT, cec_write(cec, TEGRA_CEC_INT_STAT,
@@ -255,7 +252,7 @@ static int tegra_cec_adap_enable(struct cec_adapter *adap, bool enable)
TEGRA_CEC_INT_MASK_TX_BUS_ANOMALY_DETECTED | TEGRA_CEC_INT_MASK_TX_BUS_ANOMALY_DETECTED |
TEGRA_CEC_INT_MASK_TX_FRAME_TRANSMITTED | TEGRA_CEC_INT_MASK_TX_FRAME_TRANSMITTED |
TEGRA_CEC_INT_MASK_RX_REGISTER_FULL | TEGRA_CEC_INT_MASK_RX_REGISTER_FULL |
TEGRA_CEC_INT_MASK_RX_REGISTER_OVERRUN); TEGRA_CEC_INT_MASK_RX_START_BIT_DETECTED);
cec_write(cec, TEGRA_CEC_HW_CONTROL, TEGRA_CEC_HWCTRL_TX_RX_MODE); cec_write(cec, TEGRA_CEC_HW_CONTROL, TEGRA_CEC_HWCTRL_TX_RX_MODE);
return 0; return 0;

1
include/uapi/linux/lirc.h
View File

@@ -54,7 +54,6 @@
#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW) #define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE) #define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2) #define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
#define LIRC_CAN_SEND_SCANCODE LIRC_MODE2SEND(LIRC_MODE_SCANCODE)
#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE) #define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
#define LIRC_CAN_SEND_MASK 0x0000003f #define LIRC_CAN_SEND_MASK 0x0000003f