mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-27 04:54:41 +08:00
230bce5511
Commitde2bc45c84
("media: vsp1: Update LIF buffer thresholds") updated the LIF buffer thresholds based on the VSP version, but used the wrong model mask. This resulted in all VSP instances to be treated as a Gen3 VSPD, breaking operation on all Gen2 platforms as well as on H3 ES2.0, M3-N, V3M and V3H. Fix it. Fixes:de2bc45c84
("media: vsp1: Update LIF buffer thresholds") Reported-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
176 lines
4.7 KiB
C
176 lines
4.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* vsp1_lif.c -- R-Car VSP1 LCD Controller Interface
|
|
*
|
|
* Copyright (C) 2013-2014 Renesas Electronics Corporation
|
|
*
|
|
* Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com)
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/gfp.h>
|
|
|
|
#include <media/v4l2-subdev.h>
|
|
|
|
#include "vsp1.h"
|
|
#include "vsp1_dl.h"
|
|
#include "vsp1_lif.h"
|
|
|
|
#define LIF_MIN_SIZE 2U
|
|
#define LIF_MAX_SIZE 8190U
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Device Access
|
|
*/
|
|
|
|
static inline void vsp1_lif_write(struct vsp1_lif *lif,
|
|
struct vsp1_dl_body *dlb, u32 reg, u32 data)
|
|
{
|
|
vsp1_dl_body_write(dlb, reg + lif->entity.index * VI6_LIF_OFFSET,
|
|
data);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* V4L2 Subdevice Operations
|
|
*/
|
|
|
|
static const unsigned int lif_codes[] = {
|
|
MEDIA_BUS_FMT_ARGB8888_1X32,
|
|
MEDIA_BUS_FMT_AYUV8_1X32,
|
|
};
|
|
|
|
static int lif_enum_mbus_code(struct v4l2_subdev *subdev,
|
|
struct v4l2_subdev_pad_config *cfg,
|
|
struct v4l2_subdev_mbus_code_enum *code)
|
|
{
|
|
return vsp1_subdev_enum_mbus_code(subdev, cfg, code, lif_codes,
|
|
ARRAY_SIZE(lif_codes));
|
|
}
|
|
|
|
static int lif_enum_frame_size(struct v4l2_subdev *subdev,
|
|
struct v4l2_subdev_pad_config *cfg,
|
|
struct v4l2_subdev_frame_size_enum *fse)
|
|
{
|
|
return vsp1_subdev_enum_frame_size(subdev, cfg, fse, LIF_MIN_SIZE,
|
|
LIF_MIN_SIZE, LIF_MAX_SIZE,
|
|
LIF_MAX_SIZE);
|
|
}
|
|
|
|
static int lif_set_format(struct v4l2_subdev *subdev,
|
|
struct v4l2_subdev_pad_config *cfg,
|
|
struct v4l2_subdev_format *fmt)
|
|
{
|
|
return vsp1_subdev_set_pad_format(subdev, cfg, fmt, lif_codes,
|
|
ARRAY_SIZE(lif_codes),
|
|
LIF_MIN_SIZE, LIF_MIN_SIZE,
|
|
LIF_MAX_SIZE, LIF_MAX_SIZE);
|
|
}
|
|
|
|
static const struct v4l2_subdev_pad_ops lif_pad_ops = {
|
|
.init_cfg = vsp1_entity_init_cfg,
|
|
.enum_mbus_code = lif_enum_mbus_code,
|
|
.enum_frame_size = lif_enum_frame_size,
|
|
.get_fmt = vsp1_subdev_get_pad_format,
|
|
.set_fmt = lif_set_format,
|
|
};
|
|
|
|
static const struct v4l2_subdev_ops lif_ops = {
|
|
.pad = &lif_pad_ops,
|
|
};
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* VSP1 Entity Operations
|
|
*/
|
|
|
|
static void lif_configure_stream(struct vsp1_entity *entity,
|
|
struct vsp1_pipeline *pipe,
|
|
struct vsp1_dl_body *dlb)
|
|
{
|
|
const struct v4l2_mbus_framefmt *format;
|
|
struct vsp1_lif *lif = to_lif(&entity->subdev);
|
|
unsigned int hbth;
|
|
unsigned int obth;
|
|
unsigned int lbth;
|
|
|
|
format = vsp1_entity_get_pad_format(&lif->entity, lif->entity.config,
|
|
LIF_PAD_SOURCE);
|
|
|
|
switch (entity->vsp1->version & VI6_IP_VERSION_MODEL_MASK) {
|
|
case VI6_IP_VERSION_MODEL_VSPD_GEN2:
|
|
case VI6_IP_VERSION_MODEL_VSPD_V2H:
|
|
hbth = 1536;
|
|
obth = min(128U, (format->width + 1) / 2 * format->height - 4);
|
|
lbth = 1520;
|
|
break;
|
|
|
|
case VI6_IP_VERSION_MODEL_VSPDL_GEN3:
|
|
case VI6_IP_VERSION_MODEL_VSPD_V3:
|
|
hbth = 0;
|
|
obth = 1500;
|
|
lbth = 0;
|
|
break;
|
|
|
|
case VI6_IP_VERSION_MODEL_VSPD_GEN3:
|
|
default:
|
|
hbth = 0;
|
|
obth = 3000;
|
|
lbth = 0;
|
|
break;
|
|
}
|
|
|
|
vsp1_lif_write(lif, dlb, VI6_LIF_CSBTH,
|
|
(hbth << VI6_LIF_CSBTH_HBTH_SHIFT) |
|
|
(lbth << VI6_LIF_CSBTH_LBTH_SHIFT));
|
|
|
|
vsp1_lif_write(lif, dlb, VI6_LIF_CTRL,
|
|
(obth << VI6_LIF_CTRL_OBTH_SHIFT) |
|
|
(format->code == 0 ? VI6_LIF_CTRL_CFMT : 0) |
|
|
VI6_LIF_CTRL_REQSEL | VI6_LIF_CTRL_LIF_EN);
|
|
|
|
/*
|
|
* On R-Car V3M the LIF0 buffer attribute register has to be set to a
|
|
* non-default value to guarantee proper operation (otherwise artifacts
|
|
* may appear on the output). The value required by the manual is not
|
|
* explained but is likely a buffer size or threshold.
|
|
*/
|
|
if ((entity->vsp1->version & VI6_IP_VERSION_MASK) ==
|
|
(VI6_IP_VERSION_MODEL_VSPD_V3 | VI6_IP_VERSION_SOC_V3M))
|
|
vsp1_lif_write(lif, dlb, VI6_LIF_LBA,
|
|
VI6_LIF_LBA_LBA0 |
|
|
(1536 << VI6_LIF_LBA_LBA1_SHIFT));
|
|
}
|
|
|
|
static const struct vsp1_entity_operations lif_entity_ops = {
|
|
.configure_stream = lif_configure_stream,
|
|
};
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
* Initialization and Cleanup
|
|
*/
|
|
|
|
struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1, unsigned int index)
|
|
{
|
|
struct vsp1_lif *lif;
|
|
int ret;
|
|
|
|
lif = devm_kzalloc(vsp1->dev, sizeof(*lif), GFP_KERNEL);
|
|
if (lif == NULL)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
lif->entity.ops = &lif_entity_ops;
|
|
lif->entity.type = VSP1_ENTITY_LIF;
|
|
lif->entity.index = index;
|
|
|
|
/*
|
|
* The LIF is never exposed to userspace, but media entity registration
|
|
* requires a function to be set. Use PROC_VIDEO_PIXEL_FORMATTER just to
|
|
* avoid triggering a WARN_ON(), the value won't be seen anywhere.
|
|
*/
|
|
ret = vsp1_entity_init(vsp1, &lif->entity, "lif", 2, &lif_ops,
|
|
MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER);
|
|
if (ret < 0)
|
|
return ERR_PTR(ret);
|
|
|
|
return lif;
|
|
}
|