mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 10:00:17 +00:00
vc4/drm:plane: Make use of chroma siting parameter
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
This commit is contained in:
@@ -597,7 +597,7 @@ static void vc4_write_tpz(struct vc4_plane_state *vc4_state, u32 src, u32 dst)
|
||||
#define PHASE_BITS 6
|
||||
|
||||
static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst,
|
||||
u32 xy, int channel)
|
||||
u32 xy, int channel, int chroma_offset)
|
||||
{
|
||||
struct vc4_dev *vc4 = to_vc4_dev(vc4_state->base.plane->dev);
|
||||
u32 scale = src / dst;
|
||||
@@ -608,7 +608,7 @@ static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst,
|
||||
|
||||
/*
|
||||
* Start the phase at 1/2 pixel from the 1st pixel at src_x.
|
||||
* 1/4 pixel for YUV.
|
||||
* 1/4 pixel for YUV, plus the offset for chroma siting.
|
||||
*/
|
||||
if (channel) {
|
||||
/*
|
||||
@@ -616,6 +616,7 @@ static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst,
|
||||
* display list's x value
|
||||
*/
|
||||
offset = (xy & 0x1ffff) >> (16 - PHASE_BITS) >> 1;
|
||||
offset -= chroma_offset >> (17 - PHASE_BITS);
|
||||
offset += -(1 << PHASE_BITS >> 2);
|
||||
} else {
|
||||
/*
|
||||
@@ -842,13 +843,15 @@ static void vc4_write_scaling_parameters(struct drm_plane_state *state,
|
||||
/* Ch0 H-PPF Word 0: Scaling Parameters */
|
||||
if (vc4_state->x_scaling[channel] == VC4_SCALING_PPF) {
|
||||
vc4_write_ppf(vc4_state, vc4_state->src_w[channel],
|
||||
vc4_state->crtc_w, vc4_state->src_x, channel);
|
||||
vc4_state->crtc_w, vc4_state->src_x, channel,
|
||||
state->chroma_siting_h);
|
||||
}
|
||||
|
||||
/* Ch0 V-PPF Words 0-1: Scaling Parameters, Context */
|
||||
if (vc4_state->y_scaling[channel] == VC4_SCALING_PPF) {
|
||||
vc4_write_ppf(vc4_state, vc4_state->src_h[channel],
|
||||
vc4_state->crtc_h, vc4_state->src_y, channel);
|
||||
vc4_state->crtc_h, vc4_state->src_y, channel,
|
||||
state->chroma_siting_v);
|
||||
vc4_dlist_write(vc4_state, 0xc0c0c0c0);
|
||||
}
|
||||
|
||||
@@ -2564,6 +2567,8 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
|
||||
DRM_COLOR_YCBCR_BT709,
|
||||
DRM_COLOR_YCBCR_LIMITED_RANGE);
|
||||
|
||||
drm_plane_create_chroma_siting_properties(plane, 0, 0);
|
||||
|
||||
if (type == DRM_PLANE_TYPE_PRIMARY)
|
||||
drm_plane_create_zpos_immutable_property(plane, 0);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user