From 2390a688769dc81c185f6ebd628acd8c276e157e Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Tue, 29 May 2018 18:37:29 +0200 Subject: [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 Signed-off-by: Philipp Tomsich --- drivers/media/platform/rockchip/isp1/common.h | 4 ++-- drivers/media/platform/rockchip/isp1/rkisp1.c | 6 ++++++ 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 7a41e40a8bcb..5e776447453f 100644 --- a/drivers/media/platform/rockchip/isp1/common.h +++ b/drivers/media/platform/rockchip/isp1/common.h @@ -42,8 +42,8 @@ #include #include -#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 989bb4c9102d..7a61cc84965e 100644 --- a/drivers/media/platform/rockchip/isp1/rkisp1.c +++ b/drivers/media/platform/rockchip/isp1/rkisp1.c @@ -764,6 +764,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, -- cgit v1.2.3