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

drm/meson: viu: add AFBC modules routing functions

The Amlogic G12A AFBC Decoder pixel input need to be routed diferently
than the Amlogic GXM AFBC decoder, this adds support for routing the
VIU OSD1 pixel source to the AFBC "Mali Unpack" module.

This "Mali Unpack" module is also configured with a static RGBA mapping
for now until we support more pixel formats.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191021091509.3864-8-narmstrong@baylibre.com

+85
+81
drivers/gpu/drm/meson/meson_viu.c
··· 7 7 */ 8 8 9 9 #include <linux/export.h> 10 + #include <linux/bitfield.h> 11 + 12 + #include <drm/drm_fourcc.h> 10 13 11 14 #include "meson_drv.h" 12 15 #include "meson_viu.h" ··· 338 335 meson_viu_load_matrix(priv); 339 336 } 340 337 338 + #define OSD1_MALI_ORDER_ABGR \ 339 + (FIELD_PREP(VIU_OSD1_MALI_AFBCD_A_REORDER, \ 340 + VIU_OSD1_MALI_REORDER_A) | \ 341 + FIELD_PREP(VIU_OSD1_MALI_AFBCD_B_REORDER, \ 342 + VIU_OSD1_MALI_REORDER_B) | \ 343 + FIELD_PREP(VIU_OSD1_MALI_AFBCD_G_REORDER, \ 344 + VIU_OSD1_MALI_REORDER_G) | \ 345 + FIELD_PREP(VIU_OSD1_MALI_AFBCD_R_REORDER, \ 346 + VIU_OSD1_MALI_REORDER_R)) 347 + 348 + #define OSD1_MALI_ORDER_ARGB \ 349 + (FIELD_PREP(VIU_OSD1_MALI_AFBCD_A_REORDER, \ 350 + VIU_OSD1_MALI_REORDER_A) | \ 351 + FIELD_PREP(VIU_OSD1_MALI_AFBCD_B_REORDER, \ 352 + VIU_OSD1_MALI_REORDER_R) | \ 353 + FIELD_PREP(VIU_OSD1_MALI_AFBCD_G_REORDER, \ 354 + VIU_OSD1_MALI_REORDER_G) | \ 355 + FIELD_PREP(VIU_OSD1_MALI_AFBCD_R_REORDER, \ 356 + VIU_OSD1_MALI_REORDER_B)) 357 + 358 + void meson_viu_g12a_enable_osd1_afbc(struct meson_drm *priv) 359 + { 360 + u32 afbc_order = OSD1_MALI_ORDER_ARGB; 361 + 362 + /* Enable Mali AFBC Unpack */ 363 + writel_bits_relaxed(VIU_OSD1_MALI_UNPACK_EN, 364 + VIU_OSD1_MALI_UNPACK_EN, 365 + priv->io_base + _REG(VIU_OSD1_MALI_UNPACK_CTRL)); 366 + 367 + switch (priv->afbcd.format) { 368 + case DRM_FORMAT_XBGR8888: 369 + case DRM_FORMAT_ABGR8888: 370 + afbc_order = OSD1_MALI_ORDER_ABGR; 371 + break; 372 + } 373 + 374 + /* Setup RGBA Reordering */ 375 + writel_bits_relaxed(VIU_OSD1_MALI_AFBCD_A_REORDER | 376 + VIU_OSD1_MALI_AFBCD_B_REORDER | 377 + VIU_OSD1_MALI_AFBCD_G_REORDER | 378 + VIU_OSD1_MALI_AFBCD_R_REORDER, 379 + afbc_order, 380 + priv->io_base + _REG(VIU_OSD1_MALI_UNPACK_CTRL)); 381 + 382 + /* Select AFBCD path for OSD1 */ 383 + writel_bits_relaxed(OSD_PATH_OSD_AXI_SEL_OSD1_AFBCD, 384 + OSD_PATH_OSD_AXI_SEL_OSD1_AFBCD, 385 + priv->io_base + _REG(OSD_PATH_MISC_CTRL)); 386 + } 387 + 388 + void meson_viu_g12a_disable_osd1_afbc(struct meson_drm *priv) 389 + { 390 + /* Disable AFBCD path for OSD1 */ 391 + writel_bits_relaxed(OSD_PATH_OSD_AXI_SEL_OSD1_AFBCD, 0, 392 + priv->io_base + _REG(OSD_PATH_MISC_CTRL)); 393 + 394 + /* Disable AFBCD unpack */ 395 + writel_bits_relaxed(VIU_OSD1_MALI_UNPACK_EN, 0, 396 + priv->io_base + _REG(VIU_OSD1_MALI_UNPACK_CTRL)); 397 + } 398 + 399 + void meson_viu_gxm_enable_osd1_afbc(struct meson_drm *priv) 400 + { 401 + writel_bits_relaxed(MALI_AFBC_MISC, FIELD_PREP(MALI_AFBC_MISC, 0x90), 402 + priv->io_base + _REG(VIU_MISC_CTRL1)); 403 + } 404 + 405 + void meson_viu_gxm_disable_osd1_afbc(struct meson_drm *priv) 406 + { 407 + writel_bits_relaxed(MALI_AFBC_MISC, FIELD_PREP(MALI_AFBC_MISC, 0x00), 408 + priv->io_base + _REG(VIU_MISC_CTRL1)); 409 + } 410 + 341 411 static inline uint32_t meson_viu_osd_burst_length_reg(uint32_t length) 342 412 { 343 413 uint32_t val = (((length & 0x80) % 24) / 12); ··· 496 420 497 421 writel_bits_relaxed(DOLBY_BYPASS_EN(0xc), DOLBY_BYPASS_EN(0xc), 498 422 priv->io_base + _REG(DOLBY_PATH_CTRL)); 423 + 424 + meson_viu_g12a_disable_osd1_afbc(priv); 499 425 } 426 + 427 + if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM)) 428 + meson_viu_gxm_disable_osd1_afbc(priv); 500 429 501 430 priv->viu.osd1_enabled = false; 502 431 priv->viu.osd1_commit = false;
+4
drivers/gpu/drm/meson/meson_viu.h
··· 63 63 #define OSD_PENDING_STAT_CLEAN BIT(1) 64 64 65 65 void meson_viu_osd1_reset(struct meson_drm *priv); 66 + void meson_viu_g12a_enable_osd1_afbc(struct meson_drm *priv); 67 + void meson_viu_g12a_disable_osd1_afbc(struct meson_drm *priv); 68 + void meson_viu_gxm_enable_osd1_afbc(struct meson_drm *priv); 69 + void meson_viu_gxm_disable_osd1_afbc(struct meson_drm *priv); 66 70 void meson_viu_init(struct meson_drm *priv); 67 71 68 72 #endif /* __MESON_VIU_H */