Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 18:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/vc4: Fix negative X/Y positioning on SAND planes

Browse Source 
Commit 3e407417b1 ("drm/vc4: Fix X/Y positioning of planes using
T_TILES modifier") fixed the problem with T_TILES format, but left
things in a non-working state for SAND formats. Address that now.

Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20181207083606.15449-1-boris.brezillon@bootlin.com
This commit is contained in:
Boris Brezillon 2018-12-07 09:36:05 +01:00
parent aa5beec32e
commit 8e75d582db
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpu/drm/vc4/vc4_plane.c
View File

@ -595,6 +595,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
case DRM_FORMAT_MOD_BROADCOM_SAND128: case DRM_FORMAT_MOD_BROADCOM_SAND128:
case DRM_FORMAT_MOD_BROADCOM_SAND256: { case DRM_FORMAT_MOD_BROADCOM_SAND256: {
uint32_t param = fourcc_mod_broadcom_param(fb->modifier); uint32_t param = fourcc_mod_broadcom_param(fb->modifier);
u32 tile_w, tile, x_off, pix_per_tile;
/* Column-based NV12 or RGBA. /* Column-based NV12 or RGBA.
*/ */
@ -614,12 +615,15 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
switch (base_format_mod) { switch (base_format_mod) {
case DRM_FORMAT_MOD_BROADCOM_SAND64: case DRM_FORMAT_MOD_BROADCOM_SAND64:
tiling = SCALER_CTL0_TILING_64B; tiling = SCALER_CTL0_TILING_64B;
tile_w = 64;
break; break;
case DRM_FORMAT_MOD_BROADCOM_SAND128: case DRM_FORMAT_MOD_BROADCOM_SAND128:
tiling = SCALER_CTL0_TILING_128B; tiling = SCALER_CTL0_TILING_128B;
tile_w = 128;
break; break;
case DRM_FORMAT_MOD_BROADCOM_SAND256: case DRM_FORMAT_MOD_BROADCOM_SAND256:
tiling = SCALER_CTL0_TILING_256B_OR_T; tiling = SCALER_CTL0_TILING_256B_OR_T;
tile_w = 256;
break; break;
default: default:
break; break;
@ -630,6 +634,23 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
return -EINVAL; return -EINVAL;
} }
pix_per_tile = tile_w / fb->format->cpp[0];
tile = vc4_state->src_x / pix_per_tile;
x_off = vc4_state->src_x % pix_per_tile;
/* Adjust the base pointer to the first pixel to be scanned
* out.
*/
for (i = 0; i < num_planes; i++) {
vc4_state->offsets[i] += param * tile_w * tile;
vc4_state->offsets[i] += vc4_state->src_y /
(i ? v_subsample : 1) *
tile_w;
vc4_state->offsets[i] += x_off /
(i ? h_subsample : 1) *
fb->format->cpp[i];
}
pitch0 = VC4_SET_FIELD(param, SCALER_TILE_HEIGHT); pitch0 = VC4_SET_FIELD(param, SCALER_TILE_HEIGHT);
break; break;
} }