diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch b/target/linux/bcm27xx/patches-5.15/950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch index 7bb57aafa5..ba27bbc6d5 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch @@ -23,7 +23,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> u32 src_w[2], src_h[2]; --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -179,9 +179,9 @@ static const struct hvs_format *vc4_get_ +@@ -181,9 +181,9 @@ static const struct hvs_format *vc4_get_ static enum vc4_scaling_mode vc4_get_scaling_mode(u32 src, u32 dst) { @@ -35,7 +35,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> return VC4_SCALING_PPF; else return VC4_SCALING_TPZ; -@@ -388,15 +388,10 @@ static int vc4_plane_setup_clipping_and_ +@@ -390,15 +390,10 @@ static int vc4_plane_setup_clipping_and_ for (i = 0; i < num_planes; i++) vc4_state->offsets[i] = bo->paddr + fb->offsets[i]; @@ -55,7 +55,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> vc4_state->crtc_x = state->dst.x1; vc4_state->crtc_y = state->dst.y1; -@@ -449,7 +444,7 @@ static void vc4_write_tpz(struct vc4_pla +@@ -451,7 +446,7 @@ static void vc4_write_tpz(struct vc4_pla { u32 scale, recip; @@ -64,7 +64,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> /* The specs note that while the reciprocal would be defined * as (1<<32)/scale, ~0 is close enough. -@@ -495,7 +490,7 @@ static u32 vc4_lbm_size(struct drm_plane +@@ -497,7 +492,7 @@ static u32 vc4_lbm_size(struct drm_plane if (vc4_state->x_scaling[0] == VC4_SCALING_TPZ) pix_per_line = vc4_state->crtc_w; else @@ -73,7 +73,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> if (!vc4_state->is_yuv) { if (vc4_state->y_scaling[0] == VC4_SCALING_TPZ) -@@ -586,7 +581,8 @@ static void vc4_plane_calc_load(struct d +@@ -588,7 +583,8 @@ static void vc4_plane_calc_load(struct d for (i = 0; i < fb->format->num_planes; i++) { /* Even if the bandwidth/plane required for a single frame is * @@ -83,7 +83,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> * * when downscaling, we have to read more pixels per line in * the time frame reserved for a single line, so the bandwidth -@@ -595,11 +591,11 @@ static void vc4_plane_calc_load(struct d +@@ -597,11 +593,11 @@ static void vc4_plane_calc_load(struct d * load by this number. We're likely over-estimating the read * demand, but that's better than under-estimating it. */ @@ -99,7 +99,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> vc4_state->hvs_load += vc4_state->crtc_h * vc4_state->crtc_w; } -@@ -752,7 +748,8 @@ static int vc4_plane_mode_set(struct drm +@@ -754,7 +750,8 @@ static int vc4_plane_mode_set(struct drm bool mix_plane_alpha; bool covers_screen; u32 scl0, scl1, pitch0; @@ -109,7 +109,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> u32 hvs_format = format->hvs; unsigned int rotation; int ret, i; -@@ -764,6 +761,9 @@ static int vc4_plane_mode_set(struct drm +@@ -766,6 +763,9 @@ static int vc4_plane_mode_set(struct drm if (ret) return ret; @@ -119,7 +119,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> /* SCL1 is used for Cb/Cr scaling of planar formats. For RGB * and 4:4:4, scl1 should be set to scl0 so both channels of * the scaler do the same thing. For YUV, the Y plane needs -@@ -784,9 +784,11 @@ static int vc4_plane_mode_set(struct drm +@@ -786,9 +786,11 @@ static int vc4_plane_mode_set(struct drm DRM_MODE_REFLECT_Y); /* We must point to the last line when Y reflection is enabled. */ @@ -133,7 +133,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> switch (base_format_mod) { case DRM_FORMAT_MOD_LINEAR: -@@ -801,7 +803,7 @@ static int vc4_plane_mode_set(struct drm +@@ -803,7 +805,7 @@ static int vc4_plane_mode_set(struct drm (i ? v_subsample : 1) * fb->pitches[i]; @@ -142,7 +142,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> (i ? h_subsample : 1) * fb->format->cpp[i]; } -@@ -824,7 +826,7 @@ static int vc4_plane_mode_set(struct drm +@@ -826,7 +828,7 @@ static int vc4_plane_mode_set(struct drm * pitch * tile_h == tile_size * tiles_per_row */ u32 tiles_w = fb->pitches[0] >> (tile_size_shift - tile_h_shift); @@ -151,7 +151,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> u32 tiles_r = tiles_w - tiles_l; u32 tiles_t = src_y >> tile_h_shift; /* Intra-tile offsets, which modify the base address (the -@@ -834,7 +836,7 @@ static int vc4_plane_mode_set(struct drm +@@ -836,7 +838,7 @@ static int vc4_plane_mode_set(struct drm u32 tile_y = (src_y >> 4) & 1; u32 subtile_y = (src_y >> 2) & 3; u32 utile_y = src_y & 3; @@ -160,7 +160,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> u32 y_off = src_y & tile_h_mask; /* When Y reflection is requested we must set the -@@ -930,7 +932,7 @@ static int vc4_plane_mode_set(struct drm +@@ -932,7 +934,7 @@ static int vc4_plane_mode_set(struct drm * of the 12-pixels in that 128-bit word is the * first pixel to be used */ @@ -169,7 +169,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> u32 aligned = remaining_pixels / 12; u32 last_bits = remaining_pixels % 12; -@@ -952,12 +954,12 @@ static int vc4_plane_mode_set(struct drm +@@ -954,12 +956,12 @@ static int vc4_plane_mode_set(struct drm return -EINVAL; } pix_per_tile = tile_w / fb->format->cpp[0]; @@ -184,7 +184,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> vc4_state->offsets[i] += param * tile_w * tile; vc4_state->offsets[i] += src_y / -@@ -1018,10 +1020,8 @@ static int vc4_plane_mode_set(struct drm +@@ -1020,10 +1022,8 @@ static int vc4_plane_mode_set(struct drm vc4_dlist_write(vc4_state, (mix_plane_alpha ? SCALER_POS2_ALPHA_MIX : 0) | vc4_hvs4_get_alpha_blend_mode(state) | @@ -197,7 +197,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com> /* Position Word 3: Context. Written by the HVS. */ vc4_dlist_write(vc4_state, 0xc0c0c0c0); -@@ -1079,10 +1079,8 @@ static int vc4_plane_mode_set(struct drm +@@ -1081,10 +1081,8 @@ static int vc4_plane_mode_set(struct drm /* Position Word 2: Source Image Size */ vc4_state->pos2_offset = vc4_state->dlist_count; vc4_dlist_write(vc4_state, |