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/msm/disp: set num_planes and fetch_mode in INTERLEAVED_RGB_FMT

All interleaved RGB formats use only 1 plane and MDP_FETCH_LINEAR.
Specify num_planes and fetch_mode directly in the macro and remove
unused parameters.

Reviewed-by: Jessica Zhang <jessica.zhang@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/688163/
Link: https://lore.kernel.org/r/20251114-dpu-formats-v3-2-cae312379d49@oss.qualcomm.com
Tested-by: Luca Weiss <luca.weiss@fairphone.com> # qcm6490-fairphone-fp5
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

Dmitry Baryshkov 4066b576 6421e1c5

+39 -75
+39 -75
drivers/gpu/drm/msm/disp/mdp_format.c
··· 67 67 #define MDP_TILE_HEIGHT_NV12 8 68 68 69 69 #define INTERLEAVED_RGB_FMT(fmt, a, r, g, b, e0, e1, e2, e3, uc, alpha, \ 70 - bp, flg, fm, np) \ 70 + bp, flg) \ 71 71 { \ 72 72 .pixel_format = DRM_FORMAT_ ## fmt, \ 73 73 .fetch_type = MDP_PLANE_INTERLEAVED, \ ··· 80 80 .chroma_sample = CHROMA_FULL, \ 81 81 .unpack_count = uc, \ 82 82 .bpp = bp, \ 83 - .fetch_mode = fm, \ 83 + .fetch_mode = MDP_FETCH_LINEAR, \ 84 84 .flags = MSM_FORMAT_FLAG_UNPACK_TIGHT | flg, \ 85 - .num_planes = np, \ 85 + .num_planes = 1, \ 86 86 .tile_height = MDP_TILE_HEIGHT_DEFAULT \ 87 87 } 88 88 ··· 228 228 INTERLEAVED_RGB_FMT(ARGB8888, 229 229 BPC8A, BPC8, BPC8, BPC8, 230 230 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 231 - true, 4, 0, 232 - MDP_FETCH_LINEAR, 1), 231 + true, 4, 0), 233 232 234 233 INTERLEAVED_RGB_FMT(ABGR8888, 235 234 BPC8A, BPC8, BPC8, BPC8, 236 235 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 237 - true, 4, 0, 238 - MDP_FETCH_LINEAR, 1), 236 + true, 4, 0), 239 237 240 238 INTERLEAVED_RGB_FMT(XBGR8888, 241 239 BPC8A, BPC8, BPC8, BPC8, 242 240 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 243 - false, 4, 0, 244 - MDP_FETCH_LINEAR, 1), 241 + false, 4, 0), 245 242 246 243 INTERLEAVED_RGB_FMT(RGBA8888, 247 244 BPC8A, BPC8, BPC8, BPC8, 248 245 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 249 - true, 4, 0, 250 - MDP_FETCH_LINEAR, 1), 246 + true, 4, 0), 251 247 252 248 INTERLEAVED_RGB_FMT(BGRA8888, 253 249 BPC8A, BPC8, BPC8, BPC8, 254 250 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 255 - true, 4, 0, 256 - MDP_FETCH_LINEAR, 1), 251 + true, 4, 0), 257 252 258 253 INTERLEAVED_RGB_FMT(BGRX8888, 259 254 BPC8A, BPC8, BPC8, BPC8, 260 255 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 261 - false, 4, 0, 262 - MDP_FETCH_LINEAR, 1), 256 + false, 4, 0), 263 257 264 258 INTERLEAVED_RGB_FMT(XRGB8888, 265 259 BPC8A, BPC8, BPC8, BPC8, 266 260 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 267 - false, 4, 0, 268 - MDP_FETCH_LINEAR, 1), 261 + false, 4, 0), 269 262 270 263 INTERLEAVED_RGB_FMT(RGBX8888, 271 264 BPC8A, BPC8, BPC8, BPC8, 272 265 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 273 - false, 4, 0, 274 - MDP_FETCH_LINEAR, 1), 266 + false, 4, 0), 275 267 276 268 INTERLEAVED_RGB_FMT(RGB888, 277 269 0, BPC8, BPC8, BPC8, 278 270 C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3, 279 - false, 3, 0, 280 - MDP_FETCH_LINEAR, 1), 271 + false, 3, 0), 281 272 282 273 INTERLEAVED_RGB_FMT(BGR888, 283 274 0, BPC8, BPC8, BPC8, 284 275 C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3, 285 - false, 3, 0, 286 - MDP_FETCH_LINEAR, 1), 276 + false, 3, 0), 287 277 288 278 INTERLEAVED_RGB_FMT(RGB565, 289 279 0, BPC5, BPC6, BPC5, 290 280 C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3, 291 - false, 2, 0, 292 - MDP_FETCH_LINEAR, 1), 281 + false, 2, 0), 293 282 294 283 INTERLEAVED_RGB_FMT(BGR565, 295 284 0, BPC5, BPC6, BPC5, 296 285 C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3, 297 - false, 2, 0, 298 - MDP_FETCH_LINEAR, 1), 286 + false, 2, 0), 299 287 300 288 INTERLEAVED_RGB_FMT(ARGB1555, 301 289 BPC1A, BPC5, BPC5, BPC5, 302 290 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 303 - true, 2, 0, 304 - MDP_FETCH_LINEAR, 1), 291 + true, 2, 0), 305 292 306 293 INTERLEAVED_RGB_FMT(ABGR1555, 307 294 BPC1A, BPC5, BPC5, BPC5, 308 295 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 309 - true, 2, 0, 310 - MDP_FETCH_LINEAR, 1), 296 + true, 2, 0), 311 297 312 298 INTERLEAVED_RGB_FMT(RGBA5551, 313 299 BPC1A, BPC5, BPC5, BPC5, 314 300 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 315 - true, 2, 0, 316 - MDP_FETCH_LINEAR, 1), 301 + true, 2, 0), 317 302 318 303 INTERLEAVED_RGB_FMT(BGRA5551, 319 304 BPC1A, BPC5, BPC5, BPC5, 320 305 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 321 - true, 2, 0, 322 - MDP_FETCH_LINEAR, 1), 306 + true, 2, 0), 323 307 324 308 INTERLEAVED_RGB_FMT(XRGB1555, 325 309 BPC1A, BPC5, BPC5, BPC5, 326 310 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 327 - false, 2, 0, 328 - MDP_FETCH_LINEAR, 1), 311 + false, 2, 0), 329 312 330 313 INTERLEAVED_RGB_FMT(XBGR1555, 331 314 BPC1A, BPC5, BPC5, BPC5, 332 315 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 333 - false, 2, 0, 334 - MDP_FETCH_LINEAR, 1), 316 + false, 2, 0), 335 317 336 318 INTERLEAVED_RGB_FMT(RGBX5551, 337 319 BPC1A, BPC5, BPC5, BPC5, 338 320 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 339 - false, 2, 0, 340 - MDP_FETCH_LINEAR, 1), 321 + false, 2, 0), 341 322 342 323 INTERLEAVED_RGB_FMT(BGRX5551, 343 324 BPC1A, BPC5, BPC5, BPC5, 344 325 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 345 - false, 2, 0, 346 - MDP_FETCH_LINEAR, 1), 326 + false, 2, 0), 347 327 348 328 INTERLEAVED_RGB_FMT(ARGB4444, 349 329 BPC4A, BPC4, BPC4, BPC4, 350 330 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 351 - true, 2, 0, 352 - MDP_FETCH_LINEAR, 1), 331 + true, 2, 0), 353 332 354 333 INTERLEAVED_RGB_FMT(ABGR4444, 355 334 BPC4A, BPC4, BPC4, BPC4, 356 335 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 357 - true, 2, 0, 358 - MDP_FETCH_LINEAR, 1), 336 + true, 2, 0), 359 337 360 338 INTERLEAVED_RGB_FMT(RGBA4444, 361 339 BPC4A, BPC4, BPC4, BPC4, 362 340 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 363 - true, 2, 0, 364 - MDP_FETCH_LINEAR, 1), 341 + true, 2, 0), 365 342 366 343 INTERLEAVED_RGB_FMT(BGRA4444, 367 344 BPC4A, BPC4, BPC4, BPC4, 368 345 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 369 - true, 2, 0, 370 - MDP_FETCH_LINEAR, 1), 346 + true, 2, 0), 371 347 372 348 INTERLEAVED_RGB_FMT(XRGB4444, 373 349 BPC4A, BPC4, BPC4, BPC4, 374 350 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 375 - false, 2, 0, 376 - MDP_FETCH_LINEAR, 1), 351 + false, 2, 0), 377 352 378 353 INTERLEAVED_RGB_FMT(XBGR4444, 379 354 BPC4A, BPC4, BPC4, BPC4, 380 355 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 381 - false, 2, 0, 382 - MDP_FETCH_LINEAR, 1), 356 + false, 2, 0), 383 357 384 358 INTERLEAVED_RGB_FMT(RGBX4444, 385 359 BPC4A, BPC4, BPC4, BPC4, 386 360 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 387 - false, 2, 0, 388 - MDP_FETCH_LINEAR, 1), 361 + false, 2, 0), 389 362 390 363 INTERLEAVED_RGB_FMT(BGRX4444, 391 364 BPC4A, BPC4, BPC4, BPC4, 392 365 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 393 - false, 2, 0, 394 - MDP_FETCH_LINEAR, 1), 366 + false, 2, 0), 395 367 396 368 INTERLEAVED_RGB_FMT(BGRA1010102, 397 369 BPC8A, BPC8, BPC8, BPC8, 398 370 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 399 - true, 4, MSM_FORMAT_FLAG_DX, 400 - MDP_FETCH_LINEAR, 1), 371 + true, 4, MSM_FORMAT_FLAG_DX), 401 372 402 373 INTERLEAVED_RGB_FMT(RGBA1010102, 403 374 BPC8A, BPC8, BPC8, BPC8, 404 375 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 405 - true, 4, MSM_FORMAT_FLAG_DX, 406 - MDP_FETCH_LINEAR, 1), 376 + true, 4, MSM_FORMAT_FLAG_DX), 407 377 408 378 INTERLEAVED_RGB_FMT(ABGR2101010, 409 379 BPC8A, BPC8, BPC8, BPC8, 410 380 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 411 - true, 4, MSM_FORMAT_FLAG_DX, 412 - MDP_FETCH_LINEAR, 1), 381 + true, 4, MSM_FORMAT_FLAG_DX), 413 382 414 383 INTERLEAVED_RGB_FMT(ARGB2101010, 415 384 BPC8A, BPC8, BPC8, BPC8, 416 385 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 417 - true, 4, MSM_FORMAT_FLAG_DX, 418 - MDP_FETCH_LINEAR, 1), 386 + true, 4, MSM_FORMAT_FLAG_DX), 419 387 420 388 INTERLEAVED_RGB_FMT(XRGB2101010, 421 389 BPC8A, BPC8, BPC8, BPC8, 422 390 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 423 - false, 4, MSM_FORMAT_FLAG_DX, 424 - MDP_FETCH_LINEAR, 1), 391 + false, 4, MSM_FORMAT_FLAG_DX), 425 392 426 393 INTERLEAVED_RGB_FMT(BGRX1010102, 427 394 BPC8A, BPC8, BPC8, BPC8, 428 395 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 429 - false, 4, MSM_FORMAT_FLAG_DX, 430 - MDP_FETCH_LINEAR, 1), 396 + false, 4, MSM_FORMAT_FLAG_DX), 431 397 432 398 INTERLEAVED_RGB_FMT(XBGR2101010, 433 399 BPC8A, BPC8, BPC8, BPC8, 434 400 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 435 - false, 4, MSM_FORMAT_FLAG_DX, 436 - MDP_FETCH_LINEAR, 1), 401 + false, 4, MSM_FORMAT_FLAG_DX), 437 402 438 403 INTERLEAVED_RGB_FMT(RGBX1010102, 439 404 BPC8A, BPC8, BPC8, BPC8, 440 405 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 441 - false, 4, MSM_FORMAT_FLAG_DX, 442 - MDP_FETCH_LINEAR, 1), 406 + false, 4, MSM_FORMAT_FLAG_DX), 443 407 444 408 /* --- RGB formats above / YUV formats below this line --- */ 445 409