mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity

staging: media: tegra-video: move default format to soc-specific data

Browse source 
The tegra_default_format in vi.c is specific to Tegra210 CSI.

In preparation for adding Tegra20 VIP support, move the default format to a
new field in the soc-specific `struct tegra_vi_soc`. Instead of an entire
format struct, only store a pointer to an item in the existing format
array.

No functional changes. The format pointed to is the same that used to be in
vi.c.

Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Luca Ceresoli 2023-04-18 10:00:47 +02:00 committed by Hans Verkuil
parent 1a3ea975d7
commit aabec712ce
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/media/tegra-video/tegra210.c
View file

@ -766,8 +766,10 @@ const struct tegra_vi_soc tegra210_vi_soc = {
.hw_revision = 3,
.vi_max_channels = 6,
#if IS_ENABLED(CONFIG_VIDEO_TEGRA_TPG)
.default_video_format = &tegra210_video_formats[0],
.vi_max_clk_hz = 499200000,
#else
.default_video_format = &tegra210_video_formats[4],
.vi_max_clk_hz = 998400000,
#endif
};

13
drivers/staging/media/tegra-video/vi.c
View file

@ -45,15 +45,6 @@ struct tegra_vi_graph_entity {
struct v4l2_subdev *subdev;
};
static const struct tegra_video_format tegra_default_format = {
.img_dt = TEGRA_IMAGE_DT_RAW10,
.bit_width = 10,
.code = MEDIA_BUS_FMT_SRGGB10_1X10,
.bpp = 2,
.img_fmt = TEGRA_IMAGE_FORMAT_DEF,
.fourcc = V4L2_PIX_FMT_SRGGB10,
};
static inline struct tegra_vi *
host1x_client_to_vi(struct host1x_client *client)
{
@ -1105,7 +1096,7 @@ static int vi_fmts_bitmap_init(struct tegra_vi_channel *chan)
* there are no matched formats.
*/
if (!match_code) {
match_code = tegra_default_format.code;
match_code = chan->vi->soc->default_video_format->code;
index = tegra_get_format_idx_by_code(chan->vi, match_code, 0);
if (WARN_ON(index < 0))
return -EINVAL;
@ -1202,7 +1193,7 @@ static int tegra_channel_init(struct tegra_vi_channel *chan)
init_waitqueue_head(&chan->done_wait);
/* initialize the video format */
chan->fmtinfo = &tegra_default_format;
chan->fmtinfo = chan->vi->soc->default_video_format;
chan->format.pixelformat = chan->fmtinfo->fourcc;
chan->format.colorspace = V4L2_COLORSPACE_SRGB;
chan->format.field = V4L2_FIELD_NONE;

2
drivers/staging/media/tegra-video/vi.h
View file

@ -58,6 +58,7 @@ struct tegra_vi_ops {
*
* @video_formats: supported video formats
* @nformats: total video formats
* @default_video_format: default video format (pointer to a @video_formats item)
* @ops: vi operations
* @hw_revision: VI hw_revision
* @vi_max_channels: supported max streaming channels
@ -66,6 +67,7 @@ struct tegra_vi_ops {
struct tegra_vi_soc {
const struct tegra_video_format *video_formats;
const unsigned int nformats;
const struct tegra_video_format *default_video_format;
const struct tegra_vi_ops *ops;
u32 hw_revision;
unsigned int vi_max_channels;