summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>2018-05-29 18:37:29 +0200
committerChristoph Muellner <christoph.muellner@theobroma-systems.com>2019-10-02 00:39:24 +0200
commitcbae7b60d50336a395f68b4945379443e6ab0767 (patch)
tree28b3e529e8b3c9b28843ec0920a2ce2df972084d
parentee02c353d9967df1ccff4ebcaa214ec84250557c (diff)
[hack for tc358749] media: rockchip/isp1: set default input format to 1920x1080 UYVY8
This is the default output format of the tc358749 HDMI-to-CSI converter. Setting the default correctly makes playback via qv4l2 "just work". Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
-rw-r--r--drivers/media/platform/rockchip/isp1/common.h4
-rw-r--r--drivers/media/platform/rockchip/isp1/rkisp1.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/platform/rockchip/isp1/common.h b/drivers/media/platform/rockchip/isp1/common.h
index 69557e179bea..a80119de114c 100644
--- a/drivers/media/platform/rockchip/isp1/common.h
+++ b/drivers/media/platform/rockchip/isp1/common.h
@@ -42,8 +42,8 @@
#include <media/v4l2-device.h>
#include <media/videobuf2-v4l2.h>
-#define RKISP1_DEFAULT_WIDTH 800
-#define RKISP1_DEFAULT_HEIGHT 600
+#define RKISP1_DEFAULT_WIDTH 1920
+#define RKISP1_DEFAULT_HEIGHT 1080
#define RKISP1_MAX_STREAM 3
#define RKISP1_STREAM_MP 0
diff --git a/drivers/media/platform/rockchip/isp1/rkisp1.c b/drivers/media/platform/rockchip/isp1/rkisp1.c
index 0b122aea4888..f9f060d779cc 100644
--- a/drivers/media/platform/rockchip/isp1/rkisp1.c
+++ b/drivers/media/platform/rockchip/isp1/rkisp1.c
@@ -799,6 +799,12 @@ static void rkisp1_config_clk(struct rkisp1_device *dev)
static const struct ispsd_in_fmt rkisp1_isp_input_formats[] = {
{
+ .mbus_code = MEDIA_BUS_FMT_UYVY8_1X16,
+ .fmt_type = FMT_YUV,
+ .mipi_dt = CIF_CSI2_DT_YUV422_8b,
+ .yuv_seq = CIF_ISP_ACQ_PROP_CBYCRY,
+ .bus_width = 16,
+ }, {
.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10,
.fmt_type = FMT_BAYER,
.mipi_dt = CIF_CSI2_DT_RAW10,