tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/rockchip: Rename variables for clarity

actual_w and actual_h were the clipped source width, so rename them to
fit the use.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20251015110042.41273-5-daniels@collabora.com

authored by

Daniel Stone and committed by
Heiko Stuebner 33cbeea6 70e3f77c

+19 -19
+19 -19
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
··· 1139 1139 struct vop2 *vop2 = win->vop2; 1140 1140 struct drm_framebuffer *fb = pstate->fb; 1141 1141 u32 bpp = vop2_get_bpp(fb->format); 1142 - u32 actual_w, actual_h, dsp_w, dsp_h; 1142 + u32 src_w, src_h, dsp_w, dsp_h; 1143 1143 u32 act_info, dsp_info; 1144 1144 u32 format; 1145 1145 u32 afbc_format; ··· 1203 1203 uv_mst = rk_obj->dma_addr + offset + fb->offsets[1]; 1204 1204 } 1205 1205 1206 - actual_w = drm_rect_width(src) >> 16; 1207 - actual_h = drm_rect_height(src) >> 16; 1206 + src_w = drm_rect_width(src) >> 16; 1207 + src_h = drm_rect_height(src) >> 16; 1208 1208 dsp_w = drm_rect_width(dest); 1209 1209 1210 1210 if (dest->x1 + dsp_w > adjusted_mode->hdisplay) { ··· 1214 1214 dsp_w = adjusted_mode->hdisplay - dest->x1; 1215 1215 if (dsp_w < 4) 1216 1216 dsp_w = 4; 1217 - actual_w = dsp_w * actual_w / drm_rect_width(dest); 1217 + src_w = dsp_w * src_w / drm_rect_width(dest); 1218 1218 } 1219 1219 1220 1220 dsp_h = drm_rect_height(dest); ··· 1226 1226 dsp_h = adjusted_mode->vdisplay - dest->y1; 1227 1227 if (dsp_h < 4) 1228 1228 dsp_h = 4; 1229 - actual_h = dsp_h * actual_h / drm_rect_height(dest); 1229 + src_h = dsp_h * src_h / drm_rect_height(dest); 1230 1230 } 1231 1231 1232 1232 /* 1233 1233 * This is workaround solution for IC design: 1234 - * esmart can't support scale down when actual_w % 16 == 1. 1234 + * esmart can't support scale down when src_w % 16 == 1. 1235 1235 */ 1236 1236 if (!(win->data->feature & WIN_FEATURE_AFBDC)) { 1237 - if (actual_w > dsp_w && (actual_w & 0xf) == 1) { 1237 + if (src_w > dsp_w && (src_w & 0xf) == 1) { 1238 1238 drm_dbg_kms(vop2->drm, "vp%d %s act_w[%d] MODE 16 == 1\n", 1239 - vp->id, win->data->name, actual_w); 1240 - actual_w -= 1; 1239 + vp->id, win->data->name, src_w); 1240 + src_w -= 1; 1241 1241 } 1242 1242 } 1243 1243 1244 - if (afbc_en && actual_w % 4) { 1245 - drm_dbg_kms(vop2->drm, "vp%d %s actual_w[%d] not 4 pixel aligned\n", 1246 - vp->id, win->data->name, actual_w); 1247 - actual_w = ALIGN_DOWN(actual_w, 4); 1244 + if (afbc_en && src_w % 4) { 1245 + drm_dbg_kms(vop2->drm, "vp%d %s src_w[%d] not 4 pixel aligned\n", 1246 + vp->id, win->data->name, src_w); 1247 + src_w = ALIGN_DOWN(src_w, 4); 1248 1248 } 1249 1249 1250 - act_info = (actual_h - 1) << 16 | ((actual_w - 1) & 0xffff); 1250 + act_info = (src_h - 1) << 16 | ((src_w - 1) & 0xffff); 1251 1251 dsp_info = (dsp_h - 1) << 16 | ((dsp_w - 1) & 0xffff); 1252 1252 1253 1253 format = vop2_convert_format(fb->format->format); 1254 1254 half_block_en = vop2_half_block_enable(pstate); 1255 1255 1256 1256 drm_dbg(vop2->drm, "vp%d update %s[%dx%d->%dx%d@%dx%d] fmt[%p4cc_%s] addr[%pad]\n", 1257 - vp->id, win->data->name, actual_w, actual_h, dsp_w, dsp_h, 1257 + vp->id, win->data->name, src_w, src_h, dsp_w, dsp_h, 1258 1258 dest->x1, dest->y1, 1259 1259 &fb->format->format, 1260 1260 afbc_en ? "AFBC" : "", &yrgb_mst); ··· 1283 1283 if (fb->modifier & AFBC_FORMAT_MOD_YTR) 1284 1284 afbc_format |= (1 << 4); 1285 1285 1286 - afbc_tile_num = ALIGN(actual_w, block_w) / block_w; 1286 + afbc_tile_num = ALIGN(src_w, block_w) / block_w; 1287 1287 1288 1288 /* 1289 1289 * AFBC pic_vir_width is count by pixel, this is different ··· 1361 1361 1362 1362 if (rotate_90 || rotate_270) { 1363 1363 act_info = swahw32(act_info); 1364 - actual_w = drm_rect_height(src) >> 16; 1365 - actual_h = drm_rect_width(src) >> 16; 1364 + src_w = drm_rect_height(src) >> 16; 1365 + src_h = drm_rect_width(src) >> 16; 1366 1366 } 1367 1367 1368 1368 vop2_win_write(win, VOP2_WIN_FORMAT, format); ··· 1378 1378 vop2_win_write(win, VOP2_WIN_UV_MST, uv_mst); 1379 1379 } 1380 1380 1381 - vop2_setup_scale(vop2, win, actual_w, actual_h, dsp_w, dsp_h, fb->format->format); 1381 + vop2_setup_scale(vop2, win, src_w, src_h, dsp_w, dsp_h, fb->format->format); 1382 1382 if (!vop2_cluster_window(win)) 1383 1383 vop2_plane_setup_color_key(plane, 0); 1384 1384 vop2_win_write(win, VOP2_WIN_ACT_INFO, act_info);