Commit 206003b1 authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab
Browse files

media: staging: rkisp1: rsz: set default format if the given format is not RKISP1_ISP_SD_SRC 



When setting the sink format of the 'rkisp1_resizer'
the format should be supported by 'rkisp1_isp' on
the video source pad. This patch checks this condition
and sets the format to default if the condition is false.

Fixes: 56e3b29f "media: staging: rkisp1: add streaming paths"
Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: default avatarTomasz Figa <tfiga@chromium.org>
Acked-by: default avatarHelen Koike <helen.koike@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c247818a

drivers/staging/media/rkisp1/rkisp1-common.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include "rkisp1-regs.h"

#include "uapi/rkisp1-config.h"



#define RKISP1_ISP_SD_SRC BIT(0)

#define RKISP1_ISP_SD_SINK BIT(1)



#define RKISP1_ISP_MAX_WIDTH		4032

#define RKISP1_ISP_MAX_HEIGHT		3024

#define RKISP1_ISP_MIN_WIDTH		32

drivers/staging/media/rkisp1/rkisp1-isp.c

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 


#define RKISP1_ISP_DEV_NAME	RKISP1_DRIVER_NAME "_isp"



#define RKISP1_ISP_SD_SRC BIT(0)

#define RKISP1_ISP_SD_SINK BIT(1)



/*

 * NOTE: MIPI controller and input MUX are also configured in this file.

 * This is because ISP Subdev describes not only ISP submodule (input size,

drivers/staging/media/rkisp1/rkisp1-resizer.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static void rkisp1_rsz_set_sink_fmt(struct rkisp1_resizer *rsz, 
					    which);

	sink_fmt->code = format->code;

	mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code);

	if (!mbus_info) {

	if (!mbus_info || !(mbus_info->direction & RKISP1_ISP_SD_SRC)) {

		sink_fmt->code = RKISP1_DEF_FMT;

		mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code);

	}