5 files changed, 39 insertions, 3 deletions

diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index bc08f1dbc293..dc68cf1070f7 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -5773,6 +5773,23 @@ struct saa7134_board saa7134_boards[] = {
                         .gpio   = 0x0000000,
                 },
         },
+        [SAA7134_BOARD_HAWELL_HW_9004V1] = {
+                /* Hawell HW-9004V1 */
+                /* Vadim Frolov <fralik@gmail.com> */
+                .name         = "Hawell HW-9004V1",
+                .audio_clock   = 0x00200000,
+                .tuner_type    = UNSET,
+                .radio_type    = UNSET,
+                .tuner_addr   = ADDR_UNSET,
+                .radio_addr   = ADDR_UNSET,
+                .gpiomask      = 0x618E700,
+                .inputs       = {{
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                        .gpio = 0x6010000,
+                } },
+        },
 
 };
 
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index e359d200d698..8fd24e7c9403 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -308,7 +308,7 @@ void saa7134_buffer_finish(struct saa7134_dev *dev,
 
         /* finish current buffer */
         q->curr->vb.state = state;
-        do_gettimeofday(&q->curr->vb.ts);
+        v4l2_get_timestamp(&q->curr->vb.ts);
         wake_up(&q->curr->vb.done);
         q->curr = NULL;
 }
diff --git a/drivers/media/pci/saa7134/saa7134-dvb.c b/drivers/media/pci/saa7134/saa7134-dvb.c
index b209de40a4f8..27915e501db9 100644
--- a/drivers/media/pci/saa7134/saa7134-dvb.c
+++ b/drivers/media/pci/saa7134/saa7134-dvb.c
@@ -607,6 +607,9 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,
         /* Get the first frontend */
         fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
 
+        if (!fe0)
+                return -EINVAL;
+
         fe0->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap);
         if (fe0->dvb.frontend) {
                 if (cdec_conf->i2c_gate)
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 3abf52711e13..7c503fb68526 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2248,6 +2248,17 @@ static int saa7134_streamon(struct file *file, void *priv,
         if (!res_get(dev, fh, res))
                 return -EBUSY;
 
+        /* The SAA7134 has a 1K FIFO; the datasheet suggests that when
+         * configured conservatively, there's 22 usec of buffering for video.
+         * We therefore request a DMA latency of 20 usec, giving us 2 usec of
+         * margin in case the FIFO is configured differently to the datasheet.
+         * Unfortunately, I lack register-level documentation to check the
+         * Linux FIFO setup and confirm the perfect value.
+         */
+        pm_qos_add_request(&fh->qos_request,
+                           PM_QOS_CPU_DMA_LATENCY,
+                           20);
+
         return videobuf_streamon(saa7134_queue(fh));
 }
 
@@ -2259,6 +2270,8 @@ static int saa7134_streamoff(struct file *file, void *priv,
         struct saa7134_dev *dev = fh->dev;
         int res = saa7134_resource(fh);
 
+        pm_qos_remove_request(&fh->qos_request);
+
         err = videobuf_streamoff(saa7134_queue(fh));
         if (err < 0)
                 return err;
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 075908fae4d9..71eefef5e324 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -29,6 +29,7 @@
 #include <linux/notifier.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/pm_qos.h>
 
 #include <asm/io.h>
 
@@ -41,7 +42,7 @@
 #include <media/videobuf-dma-sg.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
-#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
 #include <media/videobuf-dvb.h>
 #endif
 
@@ -332,6 +333,7 @@ struct saa7134_card_ir {
 #define SAA7134_BOARD_SENSORAY811_911       188
 #define SAA7134_BOARD_KWORLD_PC150U         189
 #define SAA7134_BOARD_ASUSTeK_PS3_100      190
+#define SAA7134_BOARD_HAWELL_HW_9004V1      191
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
@@ -469,6 +471,7 @@ struct saa7134_fh {
         enum v4l2_buf_type         type;
         unsigned int               resources;
         enum v4l2_priority         prio;
+        struct pm_qos_request      qos_request;
 
         /* video overlay */
         struct v4l2_window         win;
@@ -642,7 +645,7 @@ struct saa7134_dev {
         struct work_struct         empress_workqueue;
         int                        empress_started;
 
-#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
         /* SAA7134_MPEG_DVB only */
         struct videobuf_dvb_frontends frontends;
         int (*original_demod_sleep)(struct dvb_frontend *fe);