shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: fix rgb range for selfpath

Browse Source 
Change-Id: Ie517b8d82e4f71856d5ac8aa2b8f19ebaea7089f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2022-11-10 15:27:13 +08:00
parent 27562c816b
commit 088c0fda47
4 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/platform/rockchip/isp/capture_v21.c
View File

@@ -946,8 +946,15 @@ static void mp_enable_mi(struct rkisp_stream *stream)
static void sp_enable_mi(struct rkisp_stream *stream)
{
rkisp_set_bits(stream->ispdev, CIF_MI_CTRL, 0,
CIF_MI_CTRL_SP_ENABLE, false);
struct rkisp_device *dev = stream->ispdev;
struct capture_fmt *fmt = &stream->out_isp_fmt;
u32 val = CIF_MI_CTRL_SP_ENABLE;
u32 mask = CIF_MI_SP_Y_FULL_YUV2RGB | CIF_MI_SP_CBCR_FULL_YUV2RGB;
if (fmt->fmt_type == FMT_RGB &&
dev->isp_sdev.quantization == V4L2_QUANTIZATION_FULL_RANGE)
val |= mask;
rkisp_set_bits(stream->ispdev, CIF_MI_CTRL, mask, val, false);
}
static void dmatx_enable_mi(struct rkisp_stream *stream)

12
drivers/media/platform/rockchip/isp/capture_v30.c
View File

@@ -703,8 +703,16 @@ static void mp_enable_mi(struct rkisp_stream *stream)
static void sp_enable_mi(struct rkisp_stream *stream)
{
rkisp_unite_set_bits(stream->ispdev, ISP3X_MI_WR_CTRL, 0,
CIF_MI_CTRL_SP_ENABLE, false,
struct rkisp_device *dev = stream->ispdev;
struct capture_fmt *fmt = &stream->out_isp_fmt;
u32 val = CIF_MI_CTRL_SP_ENABLE;
u32 mask = CIF_MI_SP_Y_FULL_YUV2RGB | CIF_MI_SP_CBCR_FULL_YUV2RGB;
if (fmt->fmt_type == FMT_RGB &&
dev->isp_sdev.quantization == V4L2_QUANTIZATION_FULL_RANGE)
val |= mask;
rkisp_unite_set_bits(stream->ispdev, ISP3X_MI_WR_CTRL,
mask, val, false,
stream->ispdev->hw_dev->is_unite);
}

11
drivers/media/platform/rockchip/isp/capture_v32.c
View File

@@ -830,8 +830,15 @@ static void mp_enable_mi(struct rkisp_stream *stream)
static void sp_enable_mi(struct rkisp_stream *stream)
{
rkisp_set_bits(stream->ispdev, ISP3X_MI_WR_CTRL,
0, CIF_MI_CTRL_SP_ENABLE, false);
struct rkisp_device *dev = stream->ispdev;
struct capture_fmt *fmt = &stream->out_isp_fmt;
u32 val = CIF_MI_CTRL_SP_ENABLE;
u32 mask = CIF_MI_SP_Y_FULL_YUV2RGB | CIF_MI_SP_CBCR_FULL_YUV2RGB;
if (fmt->fmt_type == FMT_RGB &&
dev->isp_sdev.quantization == V4L2_QUANTIZATION_FULL_RANGE)
val |= mask;
rkisp_set_bits(stream->ispdev, ISP3X_MI_WR_CTRL, mask, val, false);
}
static void bp_enable_mi(struct rkisp_stream *stream)

17
drivers/media/platform/rockchip/isp/isp_params.c
View File

@@ -14,6 +14,7 @@
#include "isp_params_v21.h"
#include "isp_params_v3x.h"
#include "isp_params_v32.h"
#include "regs.h"
#define PARAMS_NAME DRIVER_NAME "-input-params"
#define RKISP_ISP_PARAMS_REQ_BUFS_MIN 2
@@ -372,6 +373,8 @@ void rkisp_params_first_cfg(struct rkisp_isp_params_vdev *params_vdev,
struct ispsd_in_fmt *in_fmt,
enum v4l2_quantization quantization)
{
struct rkisp_device *dev = params_vdev->dev;
if (!params_vdev->is_first_cfg)
return;
params_vdev->is_first_cfg = false;
@@ -379,6 +382,20 @@ void rkisp_params_first_cfg(struct rkisp_isp_params_vdev *params_vdev,
params_vdev->raw_type = in_fmt->bayer_pat;
params_vdev->in_mbus_code = in_fmt->mbus_code;
params_vdev->ops->first_cfg(params_vdev);
/* update selfpath range if it output rgb format */
if (params_vdev->quantization != quantization) {
struct rkisp_stream *stream = &dev->cap_dev.stream[RKISP_STREAM_SP];
u32 mask = CIF_MI_SP_Y_FULL_YUV2RGB | CIF_MI_SP_CBCR_FULL_YUV2RGB;
quantization = params_vdev->quantization;
if (stream->streaming &&
stream->out_isp_fmt.fmt_type == FMT_RGB)
rkisp_unite_set_bits(dev, ISP3X_MI_WR_CTRL, mask,
quantization == V4L2_QUANTIZATION_FULL_RANGE ?
mask : 0,
false, dev->hw_dev->is_unite);
dev->isp_sdev.quantization = quantization;
}
}
/* Not called when the camera active, thus not isr protection. */