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/dpu: use format-related definitions from mdp_common.xml.h

Instead of having DPU-specific defines, switch to the definitions from
the mdp_common.xml.h file. This is the preparation for merged of DPU and
MDP format tables.

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/590420/
Link: https://lore.kernel.org/r/20240420-dpu-format-v2-1-9e93226cbffd@linaro.org

Dmitry Baryshkov 78988144 88148bfe

+169 -219
+4 -4
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
··· 2223 2223 2224 2224 /* enable 10 bit logic */ 2225 2225 switch (cdm_cfg->output_fmt->chroma_sample) { 2226 - case DPU_CHROMA_RGB: 2226 + case CHROMA_FULL: 2227 2227 cdm_cfg->h_cdwn_type = CDM_CDWN_DISABLE; 2228 2228 cdm_cfg->v_cdwn_type = CDM_CDWN_DISABLE; 2229 2229 break; 2230 - case DPU_CHROMA_H2V1: 2230 + case CHROMA_H2V1: 2231 2231 cdm_cfg->h_cdwn_type = CDM_CDWN_COSITE; 2232 2232 cdm_cfg->v_cdwn_type = CDM_CDWN_DISABLE; 2233 2233 break; 2234 - case DPU_CHROMA_420: 2234 + case CHROMA_420: 2235 2235 cdm_cfg->h_cdwn_type = CDM_CDWN_COSITE; 2236 2236 cdm_cfg->v_cdwn_type = CDM_CDWN_OFFSITE; 2237 2237 break; 2238 - case DPU_CHROMA_H1V2: 2238 + case CHROMA_H1V2: 2239 2239 default: 2240 2240 DPU_ERROR("[enc:%d] unsupported chroma sampling type\n", 2241 2241 DRMID(phys_enc->parent));
+1 -1
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c
··· 594 594 wb_cfg->dest.height = job->fb->height; 595 595 wb_cfg->dest.num_planes = wb_cfg->dest.format->num_planes; 596 596 597 - if ((wb_cfg->dest.format->fetch_planes == DPU_PLANE_PLANAR) && 597 + if ((wb_cfg->dest.format->fetch_planes == MDP_PLANE_PLANAR) && 598 598 (wb_cfg->dest.format->element[0] == C1_B_Cb)) 599 599 swap(wb_cfg->dest.plane_addr[1], wb_cfg->dest.plane_addr[2]); 600 600
+145 -145
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
··· 35 35 bp, flg, fm, np) \ 36 36 { \ 37 37 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 38 - .fetch_planes = DPU_PLANE_INTERLEAVED, \ 38 + .fetch_planes = MDP_PLANE_INTERLEAVED, \ 39 39 .alpha_enable = alpha, \ 40 40 .element = { (e0), (e1), (e2), (e3) }, \ 41 41 .bits = { g, b, r, a }, \ 42 - .chroma_sample = DPU_CHROMA_RGB, \ 42 + .chroma_sample = CHROMA_FULL, \ 43 43 .unpack_align_msb = 0, \ 44 44 .unpack_tight = 1, \ 45 45 .unpack_count = uc, \ ··· 54 54 alpha, bp, flg, fm, np, th) \ 55 55 { \ 56 56 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 57 - .fetch_planes = DPU_PLANE_INTERLEAVED, \ 57 + .fetch_planes = MDP_PLANE_INTERLEAVED, \ 58 58 .alpha_enable = alpha, \ 59 59 .element = { (e0), (e1), (e2), (e3) }, \ 60 60 .bits = { g, b, r, a }, \ 61 - .chroma_sample = DPU_CHROMA_RGB, \ 61 + .chroma_sample = CHROMA_FULL, \ 62 62 .unpack_align_msb = 0, \ 63 63 .unpack_tight = 1, \ 64 64 .unpack_count = uc, \ ··· 74 74 alpha, chroma, count, bp, flg, fm, np) \ 75 75 { \ 76 76 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 77 - .fetch_planes = DPU_PLANE_INTERLEAVED, \ 77 + .fetch_planes = MDP_PLANE_INTERLEAVED, \ 78 78 .alpha_enable = alpha, \ 79 79 .element = { (e0), (e1), (e2), (e3)}, \ 80 80 .bits = { g, b, r, a }, \ ··· 92 92 #define PSEUDO_YUV_FMT(fmt, a, r, g, b, e0, e1, chroma, flg, fm, np) \ 93 93 { \ 94 94 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 95 - .fetch_planes = DPU_PLANE_PSEUDO_PLANAR, \ 95 + .fetch_planes = MDP_PLANE_PSEUDO_PLANAR, \ 96 96 .alpha_enable = false, \ 97 97 .element = { (e0), (e1), 0, 0 }, \ 98 98 .bits = { g, b, r, a }, \ ··· 111 111 flg, fm, np, th) \ 112 112 { \ 113 113 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 114 - .fetch_planes = DPU_PLANE_PSEUDO_PLANAR, \ 114 + .fetch_planes = MDP_PLANE_PSEUDO_PLANAR, \ 115 115 .alpha_enable = false, \ 116 116 .element = { (e0), (e1), 0, 0 }, \ 117 117 .bits = { g, b, r, a }, \ ··· 129 129 #define PSEUDO_YUV_FMT_LOOSE(fmt, a, r, g, b, e0, e1, chroma, flg, fm, np)\ 130 130 { \ 131 131 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 132 - .fetch_planes = DPU_PLANE_PSEUDO_PLANAR, \ 132 + .fetch_planes = MDP_PLANE_PSEUDO_PLANAR, \ 133 133 .alpha_enable = false, \ 134 134 .element = { (e0), (e1), 0, 0 }, \ 135 135 .bits = { g, b, r, a }, \ ··· 148 148 flg, fm, np, th) \ 149 149 { \ 150 150 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 151 - .fetch_planes = DPU_PLANE_PSEUDO_PLANAR, \ 151 + .fetch_planes = MDP_PLANE_PSEUDO_PLANAR, \ 152 152 .alpha_enable = false, \ 153 153 .element = { (e0), (e1), 0, 0 }, \ 154 154 .bits = { g, b, r, a }, \ ··· 168 168 flg, fm, np) \ 169 169 { \ 170 170 .base.pixel_format = DRM_FORMAT_ ## fmt, \ 171 - .fetch_planes = DPU_PLANE_PLANAR, \ 171 + .fetch_planes = MDP_PLANE_PLANAR, \ 172 172 .alpha_enable = alpha, \ 173 173 .element = { (e0), (e1), (e2), 0 }, \ 174 174 .bits = { g, b, r, a }, \ ··· 195 195 196 196 static const struct dpu_format dpu_format_map[] = { 197 197 INTERLEAVED_RGB_FMT(ARGB8888, 198 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 198 + BPC8A, BPC8, BPC8, BPC8, 199 199 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 200 200 true, 4, 0, 201 - DPU_FETCH_LINEAR, 1), 201 + MDP_FETCH_LINEAR, 1), 202 202 203 203 INTERLEAVED_RGB_FMT(ABGR8888, 204 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 204 + BPC8A, BPC8, BPC8, BPC8, 205 205 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 206 206 true, 4, 0, 207 - DPU_FETCH_LINEAR, 1), 207 + MDP_FETCH_LINEAR, 1), 208 208 209 209 INTERLEAVED_RGB_FMT(XBGR8888, 210 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 210 + BPC8A, BPC8, BPC8, BPC8, 211 211 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 212 212 false, 4, 0, 213 - DPU_FETCH_LINEAR, 1), 213 + MDP_FETCH_LINEAR, 1), 214 214 215 215 INTERLEAVED_RGB_FMT(RGBA8888, 216 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 216 + BPC8A, BPC8, BPC8, BPC8, 217 217 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 218 218 true, 4, 0, 219 - DPU_FETCH_LINEAR, 1), 219 + MDP_FETCH_LINEAR, 1), 220 220 221 221 INTERLEAVED_RGB_FMT(BGRA8888, 222 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 222 + BPC8A, BPC8, BPC8, BPC8, 223 223 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 224 224 true, 4, 0, 225 - DPU_FETCH_LINEAR, 1), 225 + MDP_FETCH_LINEAR, 1), 226 226 227 227 INTERLEAVED_RGB_FMT(BGRX8888, 228 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 228 + BPC8A, BPC8, BPC8, BPC8, 229 229 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 230 230 false, 4, 0, 231 - DPU_FETCH_LINEAR, 1), 231 + MDP_FETCH_LINEAR, 1), 232 232 233 233 INTERLEAVED_RGB_FMT(XRGB8888, 234 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 234 + BPC8A, BPC8, BPC8, BPC8, 235 235 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 236 236 false, 4, 0, 237 - DPU_FETCH_LINEAR, 1), 237 + MDP_FETCH_LINEAR, 1), 238 238 239 239 INTERLEAVED_RGB_FMT(RGBX8888, 240 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 240 + BPC8A, BPC8, BPC8, BPC8, 241 241 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 242 242 false, 4, 0, 243 - DPU_FETCH_LINEAR, 1), 243 + MDP_FETCH_LINEAR, 1), 244 244 245 245 INTERLEAVED_RGB_FMT(RGB888, 246 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 246 + 0, BPC8, BPC8, BPC8, 247 247 C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3, 248 248 false, 3, 0, 249 - DPU_FETCH_LINEAR, 1), 249 + MDP_FETCH_LINEAR, 1), 250 250 251 251 INTERLEAVED_RGB_FMT(BGR888, 252 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 252 + 0, BPC8, BPC8, BPC8, 253 253 C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3, 254 254 false, 3, 0, 255 - DPU_FETCH_LINEAR, 1), 255 + MDP_FETCH_LINEAR, 1), 256 256 257 257 INTERLEAVED_RGB_FMT(RGB565, 258 - 0, COLOR_5BIT, COLOR_6BIT, COLOR_5BIT, 258 + 0, BPC5, BPC6, BPC5, 259 259 C1_B_Cb, C0_G_Y, C2_R_Cr, 0, 3, 260 260 false, 2, 0, 261 - DPU_FETCH_LINEAR, 1), 261 + MDP_FETCH_LINEAR, 1), 262 262 263 263 INTERLEAVED_RGB_FMT(BGR565, 264 - 0, COLOR_5BIT, COLOR_6BIT, COLOR_5BIT, 264 + 0, BPC5, BPC6, BPC5, 265 265 C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3, 266 266 false, 2, 0, 267 - DPU_FETCH_LINEAR, 1), 267 + MDP_FETCH_LINEAR, 1), 268 268 269 269 INTERLEAVED_RGB_FMT(ARGB1555, 270 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 270 + BPC1A, BPC5, BPC5, BPC5, 271 271 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 272 272 true, 2, 0, 273 - DPU_FETCH_LINEAR, 1), 273 + MDP_FETCH_LINEAR, 1), 274 274 275 275 INTERLEAVED_RGB_FMT(ABGR1555, 276 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 276 + BPC1A, BPC5, BPC5, BPC5, 277 277 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 278 278 true, 2, 0, 279 - DPU_FETCH_LINEAR, 1), 279 + MDP_FETCH_LINEAR, 1), 280 280 281 281 INTERLEAVED_RGB_FMT(RGBA5551, 282 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 282 + BPC1A, BPC5, BPC5, BPC5, 283 283 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 284 284 true, 2, 0, 285 - DPU_FETCH_LINEAR, 1), 285 + MDP_FETCH_LINEAR, 1), 286 286 287 287 INTERLEAVED_RGB_FMT(BGRA5551, 288 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 288 + BPC1A, BPC5, BPC5, BPC5, 289 289 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 290 290 true, 2, 0, 291 - DPU_FETCH_LINEAR, 1), 291 + MDP_FETCH_LINEAR, 1), 292 292 293 293 INTERLEAVED_RGB_FMT(XRGB1555, 294 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 294 + BPC1A, BPC5, BPC5, BPC5, 295 295 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 296 296 false, 2, 0, 297 - DPU_FETCH_LINEAR, 1), 297 + MDP_FETCH_LINEAR, 1), 298 298 299 299 INTERLEAVED_RGB_FMT(XBGR1555, 300 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 300 + BPC1A, BPC5, BPC5, BPC5, 301 301 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 302 302 false, 2, 0, 303 - DPU_FETCH_LINEAR, 1), 303 + MDP_FETCH_LINEAR, 1), 304 304 305 305 INTERLEAVED_RGB_FMT(RGBX5551, 306 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 306 + BPC1A, BPC5, BPC5, BPC5, 307 307 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 308 308 false, 2, 0, 309 - DPU_FETCH_LINEAR, 1), 309 + MDP_FETCH_LINEAR, 1), 310 310 311 311 INTERLEAVED_RGB_FMT(BGRX5551, 312 - COLOR_ALPHA_1BIT, COLOR_5BIT, COLOR_5BIT, COLOR_5BIT, 312 + BPC1A, BPC5, BPC5, BPC5, 313 313 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 314 314 false, 2, 0, 315 - DPU_FETCH_LINEAR, 1), 315 + MDP_FETCH_LINEAR, 1), 316 316 317 317 INTERLEAVED_RGB_FMT(ARGB4444, 318 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 318 + BPC4A, BPC4, BPC4, BPC4, 319 319 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 320 320 true, 2, 0, 321 - DPU_FETCH_LINEAR, 1), 321 + MDP_FETCH_LINEAR, 1), 322 322 323 323 INTERLEAVED_RGB_FMT(ABGR4444, 324 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 324 + BPC4A, BPC4, BPC4, BPC4, 325 325 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 326 326 true, 2, 0, 327 - DPU_FETCH_LINEAR, 1), 327 + MDP_FETCH_LINEAR, 1), 328 328 329 329 INTERLEAVED_RGB_FMT(RGBA4444, 330 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 330 + BPC4A, BPC4, BPC4, BPC4, 331 331 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 332 332 true, 2, 0, 333 - DPU_FETCH_LINEAR, 1), 333 + MDP_FETCH_LINEAR, 1), 334 334 335 335 INTERLEAVED_RGB_FMT(BGRA4444, 336 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 336 + BPC4A, BPC4, BPC4, BPC4, 337 337 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 338 338 true, 2, 0, 339 - DPU_FETCH_LINEAR, 1), 339 + MDP_FETCH_LINEAR, 1), 340 340 341 341 INTERLEAVED_RGB_FMT(XRGB4444, 342 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 342 + BPC4A, BPC4, BPC4, BPC4, 343 343 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 344 344 false, 2, 0, 345 - DPU_FETCH_LINEAR, 1), 345 + MDP_FETCH_LINEAR, 1), 346 346 347 347 INTERLEAVED_RGB_FMT(XBGR4444, 348 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 348 + BPC4A, BPC4, BPC4, BPC4, 349 349 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 350 350 false, 2, 0, 351 - DPU_FETCH_LINEAR, 1), 351 + MDP_FETCH_LINEAR, 1), 352 352 353 353 INTERLEAVED_RGB_FMT(RGBX4444, 354 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 354 + BPC4A, BPC4, BPC4, BPC4, 355 355 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 356 356 false, 2, 0, 357 - DPU_FETCH_LINEAR, 1), 357 + MDP_FETCH_LINEAR, 1), 358 358 359 359 INTERLEAVED_RGB_FMT(BGRX4444, 360 - COLOR_ALPHA_4BIT, COLOR_4BIT, COLOR_4BIT, COLOR_4BIT, 360 + BPC4A, BPC4, BPC4, BPC4, 361 361 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 362 362 false, 2, 0, 363 - DPU_FETCH_LINEAR, 1), 363 + MDP_FETCH_LINEAR, 1), 364 364 365 365 INTERLEAVED_RGB_FMT(BGRA1010102, 366 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 366 + BPC8A, BPC8, BPC8, BPC8, 367 367 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 368 368 true, 4, DPU_FORMAT_FLAG_DX, 369 - DPU_FETCH_LINEAR, 1), 369 + MDP_FETCH_LINEAR, 1), 370 370 371 371 INTERLEAVED_RGB_FMT(RGBA1010102, 372 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 372 + BPC8A, BPC8, BPC8, BPC8, 373 373 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 374 374 true, 4, DPU_FORMAT_FLAG_DX, 375 - DPU_FETCH_LINEAR, 1), 375 + MDP_FETCH_LINEAR, 1), 376 376 377 377 INTERLEAVED_RGB_FMT(ABGR2101010, 378 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 378 + BPC8A, BPC8, BPC8, BPC8, 379 379 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 380 380 true, 4, DPU_FORMAT_FLAG_DX, 381 - DPU_FETCH_LINEAR, 1), 381 + MDP_FETCH_LINEAR, 1), 382 382 383 383 INTERLEAVED_RGB_FMT(ARGB2101010, 384 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 384 + BPC8A, BPC8, BPC8, BPC8, 385 385 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 386 386 true, 4, DPU_FORMAT_FLAG_DX, 387 - DPU_FETCH_LINEAR, 1), 387 + MDP_FETCH_LINEAR, 1), 388 388 389 389 INTERLEAVED_RGB_FMT(XRGB2101010, 390 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 390 + BPC8A, BPC8, BPC8, BPC8, 391 391 C1_B_Cb, C0_G_Y, C2_R_Cr, C3_ALPHA, 4, 392 392 false, 4, DPU_FORMAT_FLAG_DX, 393 - DPU_FETCH_LINEAR, 1), 393 + MDP_FETCH_LINEAR, 1), 394 394 395 395 INTERLEAVED_RGB_FMT(BGRX1010102, 396 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 396 + BPC8A, BPC8, BPC8, BPC8, 397 397 C3_ALPHA, C2_R_Cr, C0_G_Y, C1_B_Cb, 4, 398 398 false, 4, DPU_FORMAT_FLAG_DX, 399 - DPU_FETCH_LINEAR, 1), 399 + MDP_FETCH_LINEAR, 1), 400 400 401 401 INTERLEAVED_RGB_FMT(XBGR2101010, 402 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 402 + BPC8A, BPC8, BPC8, BPC8, 403 403 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 404 404 false, 4, DPU_FORMAT_FLAG_DX, 405 - DPU_FETCH_LINEAR, 1), 405 + MDP_FETCH_LINEAR, 1), 406 406 407 407 INTERLEAVED_RGB_FMT(RGBX1010102, 408 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 408 + BPC8A, BPC8, BPC8, BPC8, 409 409 C3_ALPHA, C1_B_Cb, C0_G_Y, C2_R_Cr, 4, 410 410 false, 4, DPU_FORMAT_FLAG_DX, 411 - DPU_FETCH_LINEAR, 1), 411 + MDP_FETCH_LINEAR, 1), 412 412 413 413 PSEUDO_YUV_FMT(NV12, 414 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 414 + 0, BPC8, BPC8, BPC8, 415 415 C1_B_Cb, C2_R_Cr, 416 - DPU_CHROMA_420, DPU_FORMAT_FLAG_YUV, 417 - DPU_FETCH_LINEAR, 2), 416 + CHROMA_420, DPU_FORMAT_FLAG_YUV, 417 + MDP_FETCH_LINEAR, 2), 418 418 419 419 PSEUDO_YUV_FMT(NV21, 420 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 420 + 0, BPC8, BPC8, BPC8, 421 421 C2_R_Cr, C1_B_Cb, 422 - DPU_CHROMA_420, DPU_FORMAT_FLAG_YUV, 423 - DPU_FETCH_LINEAR, 2), 422 + CHROMA_420, DPU_FORMAT_FLAG_YUV, 423 + MDP_FETCH_LINEAR, 2), 424 424 425 425 PSEUDO_YUV_FMT(NV16, 426 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 426 + 0, BPC8, BPC8, BPC8, 427 427 C1_B_Cb, C2_R_Cr, 428 - DPU_CHROMA_H2V1, DPU_FORMAT_FLAG_YUV, 429 - DPU_FETCH_LINEAR, 2), 428 + CHROMA_H2V1, DPU_FORMAT_FLAG_YUV, 429 + MDP_FETCH_LINEAR, 2), 430 430 431 431 PSEUDO_YUV_FMT(NV61, 432 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 432 + 0, BPC8, BPC8, BPC8, 433 433 C2_R_Cr, C1_B_Cb, 434 - DPU_CHROMA_H2V1, DPU_FORMAT_FLAG_YUV, 435 - DPU_FETCH_LINEAR, 2), 434 + CHROMA_H2V1, DPU_FORMAT_FLAG_YUV, 435 + MDP_FETCH_LINEAR, 2), 436 436 437 437 PSEUDO_YUV_FMT_LOOSE(P010, 438 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 438 + 0, BPC8, BPC8, BPC8, 439 439 C1_B_Cb, C2_R_Cr, 440 - DPU_CHROMA_420, DPU_FORMAT_FLAG_DX | DPU_FORMAT_FLAG_YUV, 441 - DPU_FETCH_LINEAR, 2), 440 + CHROMA_420, DPU_FORMAT_FLAG_DX | DPU_FORMAT_FLAG_YUV, 441 + MDP_FETCH_LINEAR, 2), 442 442 443 443 INTERLEAVED_YUV_FMT(VYUY, 444 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 444 + 0, BPC8, BPC8, BPC8, 445 445 C2_R_Cr, C0_G_Y, C1_B_Cb, C0_G_Y, 446 - false, DPU_CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 447 - DPU_FETCH_LINEAR, 2), 446 + false, CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 447 + MDP_FETCH_LINEAR, 2), 448 448 449 449 INTERLEAVED_YUV_FMT(UYVY, 450 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 450 + 0, BPC8, BPC8, BPC8, 451 451 C1_B_Cb, C0_G_Y, C2_R_Cr, C0_G_Y, 452 - false, DPU_CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 453 - DPU_FETCH_LINEAR, 2), 452 + false, CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 453 + MDP_FETCH_LINEAR, 2), 454 454 455 455 INTERLEAVED_YUV_FMT(YUYV, 456 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 456 + 0, BPC8, BPC8, BPC8, 457 457 C0_G_Y, C1_B_Cb, C0_G_Y, C2_R_Cr, 458 - false, DPU_CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 459 - DPU_FETCH_LINEAR, 2), 458 + false, CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 459 + MDP_FETCH_LINEAR, 2), 460 460 461 461 INTERLEAVED_YUV_FMT(YVYU, 462 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 462 + 0, BPC8, BPC8, BPC8, 463 463 C0_G_Y, C2_R_Cr, C0_G_Y, C1_B_Cb, 464 - false, DPU_CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 465 - DPU_FETCH_LINEAR, 2), 464 + false, CHROMA_H2V1, 4, 2, DPU_FORMAT_FLAG_YUV, 465 + MDP_FETCH_LINEAR, 2), 466 466 467 467 PLANAR_YUV_FMT(YUV420, 468 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 468 + 0, BPC8, BPC8, BPC8, 469 469 C2_R_Cr, C1_B_Cb, C0_G_Y, 470 - false, DPU_CHROMA_420, 1, DPU_FORMAT_FLAG_YUV, 471 - DPU_FETCH_LINEAR, 3), 470 + false, CHROMA_420, 1, DPU_FORMAT_FLAG_YUV, 471 + MDP_FETCH_LINEAR, 3), 472 472 473 473 PLANAR_YUV_FMT(YVU420, 474 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 474 + 0, BPC8, BPC8, BPC8, 475 475 C1_B_Cb, C2_R_Cr, C0_G_Y, 476 - false, DPU_CHROMA_420, 1, DPU_FORMAT_FLAG_YUV, 477 - DPU_FETCH_LINEAR, 3), 476 + false, CHROMA_420, 1, DPU_FORMAT_FLAG_YUV, 477 + MDP_FETCH_LINEAR, 3), 478 478 }; 479 479 480 480 /* ··· 485 485 */ 486 486 static const struct dpu_format dpu_format_map_ubwc[] = { 487 487 INTERLEAVED_RGB_FMT_TILED(BGR565, 488 - 0, COLOR_5BIT, COLOR_6BIT, COLOR_5BIT, 488 + 0, BPC5, BPC6, BPC5, 489 489 C2_R_Cr, C0_G_Y, C1_B_Cb, 0, 3, 490 490 false, 2, DPU_FORMAT_FLAG_COMPRESSED, 491 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 491 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 492 492 493 493 INTERLEAVED_RGB_FMT_TILED(ABGR8888, 494 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 494 + BPC8A, BPC8, BPC8, BPC8, 495 495 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 496 496 true, 4, DPU_FORMAT_FLAG_COMPRESSED, 497 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 497 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 498 498 499 499 /* ARGB8888 and ABGR8888 purposely have the same color 500 500 * ordering. The hardware only supports ABGR8888 UBWC 501 501 * natively. 502 502 */ 503 503 INTERLEAVED_RGB_FMT_TILED(ARGB8888, 504 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 504 + BPC8A, BPC8, BPC8, BPC8, 505 505 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 506 506 true, 4, DPU_FORMAT_FLAG_COMPRESSED, 507 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 507 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 508 508 509 509 INTERLEAVED_RGB_FMT_TILED(XBGR8888, 510 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 510 + BPC8A, BPC8, BPC8, BPC8, 511 511 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 512 512 false, 4, DPU_FORMAT_FLAG_COMPRESSED, 513 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 513 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 514 514 515 515 INTERLEAVED_RGB_FMT_TILED(XRGB8888, 516 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 516 + BPC8A, BPC8, BPC8, BPC8, 517 517 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 518 518 false, 4, DPU_FORMAT_FLAG_COMPRESSED, 519 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 519 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 520 520 521 521 INTERLEAVED_RGB_FMT_TILED(ABGR2101010, 522 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 522 + BPC8A, BPC8, BPC8, BPC8, 523 523 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 524 524 true, 4, DPU_FORMAT_FLAG_DX | DPU_FORMAT_FLAG_COMPRESSED, 525 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 525 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 526 526 527 527 INTERLEAVED_RGB_FMT_TILED(XBGR2101010, 528 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 528 + BPC8A, BPC8, BPC8, BPC8, 529 529 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 530 530 true, 4, DPU_FORMAT_FLAG_DX | DPU_FORMAT_FLAG_COMPRESSED, 531 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 531 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 532 532 533 533 INTERLEAVED_RGB_FMT_TILED(XRGB2101010, 534 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 534 + BPC8A, BPC8, BPC8, BPC8, 535 535 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 536 536 true, 4, DPU_FORMAT_FLAG_DX | DPU_FORMAT_FLAG_COMPRESSED, 537 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 537 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 538 538 539 539 /* XRGB2101010 and ARGB2101010 purposely have the same color 540 540 * ordering. The hardware only supports ARGB2101010 UBWC 541 541 * natively. 542 542 */ 543 543 INTERLEAVED_RGB_FMT_TILED(ARGB2101010, 544 - COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 544 + BPC8A, BPC8, BPC8, BPC8, 545 545 C2_R_Cr, C0_G_Y, C1_B_Cb, C3_ALPHA, 4, 546 546 true, 4, DPU_FORMAT_FLAG_DX | DPU_FORMAT_FLAG_COMPRESSED, 547 - DPU_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 547 + MDP_FETCH_UBWC, 2, DPU_TILE_HEIGHT_UBWC), 548 548 549 549 PSEUDO_YUV_FMT_TILED(NV12, 550 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 550 + 0, BPC8, BPC8, BPC8, 551 551 C1_B_Cb, C2_R_Cr, 552 - DPU_CHROMA_420, DPU_FORMAT_FLAG_YUV | 552 + CHROMA_420, DPU_FORMAT_FLAG_YUV | 553 553 DPU_FORMAT_FLAG_COMPRESSED, 554 - DPU_FETCH_UBWC, 4, DPU_TILE_HEIGHT_NV12), 554 + MDP_FETCH_UBWC, 4, DPU_TILE_HEIGHT_NV12), 555 555 556 556 PSEUDO_YUV_FMT_TILED(P010, 557 - 0, COLOR_8BIT, COLOR_8BIT, COLOR_8BIT, 557 + 0, BPC8, BPC8, BPC8, 558 558 C1_B_Cb, C2_R_Cr, 559 - DPU_CHROMA_420, DPU_FORMAT_FLAG_DX | 559 + CHROMA_420, DPU_FORMAT_FLAG_DX | 560 560 DPU_FORMAT_FLAG_YUV | 561 561 DPU_FORMAT_FLAG_COMPRESSED, 562 - DPU_FETCH_UBWC, 4, DPU_TILE_HEIGHT_UBWC), 562 + MDP_FETCH_UBWC, 4, DPU_TILE_HEIGHT_UBWC), 563 563 }; 564 564 565 565 /* _dpu_get_v_h_subsample_rate - Get subsample rates for all formats we support 566 566 * Note: Not using the drm_format_*_subsampling since we have formats 567 567 */ 568 568 static void _dpu_get_v_h_subsample_rate( 569 - enum dpu_chroma_samp_type chroma_sample, 569 + enum mdp_chroma_samp_type chroma_sample, 570 570 uint32_t *v_sample, 571 571 uint32_t *h_sample) 572 572 { ··· 574 574 return; 575 575 576 576 switch (chroma_sample) { 577 - case DPU_CHROMA_H2V1: 577 + case CHROMA_H2V1: 578 578 *v_sample = 1; 579 579 *h_sample = 2; 580 580 break; 581 - case DPU_CHROMA_H1V2: 581 + case CHROMA_H1V2: 582 582 *v_sample = 2; 583 583 *h_sample = 1; 584 584 break; 585 - case DPU_CHROMA_420: 585 + case CHROMA_420: 586 586 *v_sample = 2; 587 587 *h_sample = 2; 588 588 break; ··· 724 724 layout->num_planes = fmt->num_planes; 725 725 726 726 /* Due to memset above, only need to set planes of interest */ 727 - if (fmt->fetch_planes == DPU_PLANE_INTERLEAVED) { 727 + if (fmt->fetch_planes == MDP_PLANE_INTERLEAVED) { 728 728 layout->num_planes = 1; 729 729 layout->plane_size[0] = width * height * layout->format->bpp; 730 730 layout->plane_pitch[0] = width * layout->format->bpp; ··· 751 751 layout->plane_size[1] = layout->plane_pitch[1] * 752 752 (height / v_subsample); 753 753 754 - if (fmt->fetch_planes == DPU_PLANE_PSEUDO_PLANAR) { 754 + if (fmt->fetch_planes == MDP_PLANE_PSEUDO_PLANAR) { 755 755 layout->num_planes = 2; 756 756 layout->plane_size[1] *= 2; 757 757 layout->plane_pitch[1] *= 2;
+1 -1
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c
··· 186 186 dpu_hw_cdm_setup_cdwn(ctx, cdm); 187 187 188 188 if (cdm->output_type == CDM_CDWN_OUTPUT_HDMI) { 189 - if (fmt->chroma_sample == DPU_CHROMA_H1V2) 189 + if (fmt->chroma_sample == CHROMA_H1V2) 190 190 return -EINVAL; /*unsupported format */ 191 191 opmode = CDM_HDMI_PACK_OP_MODE_EN; 192 192 opmode |= (fmt->chroma_sample << 1);
+3 -3
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
··· 201 201 (0x21 << 8)); 202 202 else 203 203 /* Interface treats all the pixel data in RGB888 format */ 204 - panel_format = (COLOR_8BIT | 205 - (COLOR_8BIT << 2) | 206 - (COLOR_8BIT << 4) | 204 + panel_format = (BPC8 | 205 + (BPC8 << 2) | 206 + (BPC8 << 4) | 207 207 (0x21 << 8)); 208 208 209 209 DPU_REG_WRITE(c, INTF_HSYNC_CTL, hsync_ctl);
+7 -57
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h
··· 9 9 #include <linux/err.h> 10 10 11 11 #include "msm_drv.h" 12 + #include "mdp_common.xml.h" 12 13 13 14 #define DPU_DBG_NAME "dpu" 14 15 ··· 50 49 (test_bit(DPU_FORMAT_FLAG_YUV_BIT, (X)->flag)) 51 50 #define DPU_FORMAT_IS_DX(X) \ 52 51 (test_bit(DPU_FORMAT_FLAG_DX_BIT, (X)->flag)) 53 - #define DPU_FORMAT_IS_LINEAR(X) ((X)->fetch_mode == DPU_FETCH_LINEAR) 52 + #define DPU_FORMAT_IS_LINEAR(X) ((X)->fetch_mode == MDP_FETCH_LINEAR) 54 53 #define DPU_FORMAT_IS_TILE(X) \ 55 - (((X)->fetch_mode == DPU_FETCH_UBWC) && \ 54 + (((X)->fetch_mode == MDP_FETCH_UBWC) && \ 56 55 !test_bit(DPU_FORMAT_FLAG_COMPRESSED_BIT, (X)->flag)) 57 56 #define DPU_FORMAT_IS_UBWC(X) \ 58 - (((X)->fetch_mode == DPU_FETCH_UBWC) && \ 57 + (((X)->fetch_mode == MDP_FETCH_UBWC) && \ 59 58 test_bit(DPU_FORMAT_FLAG_COMPRESSED_BIT, (X)->flag)) 60 59 61 60 #define DPU_BLEND_FG_ALPHA_FG_CONST (0 << 0) ··· 302 301 }; 303 302 304 303 /** 305 - * enum dpu_plane_type - defines how the color component pixel packing 306 - * @DPU_PLANE_INTERLEAVED : Color components in single plane 307 - * @DPU_PLANE_PLANAR : Color component in separate planes 308 - * @DPU_PLANE_PSEUDO_PLANAR : Chroma components interleaved in separate plane 309 - */ 310 - enum dpu_plane_type { 311 - DPU_PLANE_INTERLEAVED, 312 - DPU_PLANE_PLANAR, 313 - DPU_PLANE_PSEUDO_PLANAR, 314 - }; 315 - 316 - /** 317 - * enum dpu_chroma_samp_type - chroma sub-samplng type 318 - * @DPU_CHROMA_RGB : No chroma subsampling 319 - * @DPU_CHROMA_H2V1 : Chroma pixels are horizontally subsampled 320 - * @DPU_CHROMA_H1V2 : Chroma pixels are vertically subsampled 321 - * @DPU_CHROMA_420 : 420 subsampling 322 - */ 323 - enum dpu_chroma_samp_type { 324 - DPU_CHROMA_RGB, 325 - DPU_CHROMA_H2V1, 326 - DPU_CHROMA_H1V2, 327 - DPU_CHROMA_420 328 - }; 329 - 330 - /** 331 - * dpu_fetch_type - Defines How DPU HW fetches data 332 - * @DPU_FETCH_LINEAR : fetch is line by line 333 - * @DPU_FETCH_TILE : fetches data in Z order from a tile 334 - * @DPU_FETCH_UBWC : fetch and decompress data 335 - */ 336 - enum dpu_fetch_type { 337 - DPU_FETCH_LINEAR, 338 - DPU_FETCH_TILE, 339 - DPU_FETCH_UBWC 340 - }; 341 - 342 - /** 343 - * Value of enum chosen to fit the number of bits 344 - * expected by the HW programming. 345 - */ 346 - enum { 347 - COLOR_ALPHA_1BIT = 0, 348 - COLOR_ALPHA_4BIT = 1, 349 - COLOR_4BIT = 0, 350 - COLOR_5BIT = 1, /* No 5-bit Alpha */ 351 - COLOR_6BIT = 2, /* 6-Bit Alpha also = 2 */ 352 - COLOR_8BIT = 3, /* 8-Bit Alpha also = 3 */ 353 - }; 354 - 355 - /** 356 304 * enum dpu_3d_blend_mode 357 305 * Desribes how the 3d data is blended 358 306 * @BLEND_3D_NONE : 3d blending not enabled ··· 340 390 */ 341 391 struct dpu_format { 342 392 struct msm_format base; 343 - enum dpu_plane_type fetch_planes; 393 + enum mdp_fetch_type fetch_planes; 344 394 u8 element[DPU_MAX_PLANES]; 345 395 u8 bits[DPU_MAX_PLANES]; 346 - enum dpu_chroma_samp_type chroma_sample; 396 + enum mdp_chroma_samp_type chroma_sample; 347 397 u8 unpack_align_msb; 348 398 u8 unpack_tight; 349 399 u8 unpack_count; 350 400 u8 bpp; 351 401 u8 alpha_enable; 352 402 u8 num_planes; 353 - enum dpu_fetch_type fetch_mode; 403 + enum mdp_fetch_mode fetch_mode; 354 404 DECLARE_BITMAP(flag, DPU_FORMAT_FLAG_BIT_MAX); 355 405 u16 tile_width; 356 406 u16 tile_height;
+6 -6
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
··· 241 241 242 242 chroma_samp = fmt->chroma_sample; 243 243 if (flags & DPU_SSPP_SOURCE_ROTATED_90) { 244 - if (chroma_samp == DPU_CHROMA_H2V1) 245 - chroma_samp = DPU_CHROMA_H1V2; 246 - else if (chroma_samp == DPU_CHROMA_H1V2) 247 - chroma_samp = DPU_CHROMA_H2V1; 244 + if (chroma_samp == CHROMA_H2V1) 245 + chroma_samp = CHROMA_H1V2; 246 + else if (chroma_samp == CHROMA_H1V2) 247 + chroma_samp = CHROMA_H2V1; 248 248 } 249 249 250 250 src_format = (chroma_samp << 23) | (fmt->fetch_planes << 19) | ··· 254 254 if (flags & DPU_SSPP_ROT_90) 255 255 src_format |= BIT(11); /* ROT90 */ 256 256 257 - if (fmt->alpha_enable && fmt->fetch_planes == DPU_PLANE_INTERLEAVED) 257 + if (fmt->alpha_enable && fmt->fetch_planes == MDP_PLANE_INTERLEAVED) 258 258 src_format |= BIT(8); /* SRCC3_EN */ 259 259 260 260 if (flags & DPU_SSPP_SOLID_FILL) ··· 267 267 (fmt->unpack_align_msb << 18) | 268 268 ((fmt->bpp - 1) << 9); 269 269 270 - if (fmt->fetch_mode != DPU_FETCH_LINEAR) { 270 + if (fmt->fetch_mode != MDP_FETCH_LINEAR) { 271 271 if (DPU_FORMAT_IS_UBWC(fmt)) 272 272 opmode |= MDSS_MDP_OP_BWC_EN; 273 273 src_format |= (fmt->fetch_mode & 3) << 30; /*FRAME_FORMAT */
+2 -2
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
··· 214 214 215 215 /* FIXME: in multirect case account for the src_width of all the planes */ 216 216 217 - if (fmt->fetch_planes == DPU_PLANE_PSEUDO_PLANAR) { 218 - if (fmt->chroma_sample == DPU_CHROMA_420) { 217 + if (fmt->fetch_planes == MDP_PLANE_PSEUDO_PLANAR) { 218 + if (fmt->chroma_sample == CHROMA_420) { 219 219 /* NV12 */ 220 220 total_fl = (fixed_buff_size / 2) / 221 221 ((src_width + 32) * fmt->bpp);