This series adds AFBC support for Rockchip. It is inspired by: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/refs/heads/factory-gru-9017.B-chromeos-4.4/drivers/gpu/drm/rockchip/rockchip_drm_vop.c This is the fourth iteration of the afbc series. This time a lot of rework has been done, the main goal of which is to move all afbc-related checks to helpers, so that core does not deal with it. Struct drm_framebuffer gains a new "modifier_info" pointer (overlaid in an union). That member can be used to store driver-specific data, which, for afbc, will be a struct drm_afbc. Because of that, in drivers that wish to use this feature, the struct drm_framebuffer must be allocated directly in the driver code rather than inside helpers, so the first portion of the patchset does the necessary refactoring. Then, there are 3 users of afbc: komeda, malidp and, finally, rockchip, the latter being the ultimate purpose of this work and the 3 subsequent portions of the patchset move komeda and malidp to generic helpers and add afbc support to rockchip. The idea is to make all afbc users follow a similar pattern. In fb_create() they allocate struct drm_framebuffer with struct drm_afbc in one chunk of memory (to ease freeing later), do their specific checks which can be done before object lookups, do object lookups and a special version of a size check, which understands struct drm_afbc, followed by any other driver-specific checks and initializing the gem object. The helpers for the common parts are factored out so that drivers can use them. The komeda driver has been the farthest away from such a pattern, so it required most changes. However, due to the fact that I don't have any komeda hardware I did the changes to komeda in an incremental fashion with a series of (usually) very small, easy to understand steps. malidp was pretty straightforward, and rockchip's afbc checks follow the pattern. I kindly ask for reviewing the series. I need to mention that my ultimate goal is merging afbc for rockchip and I don't have other hardware, so some help from malidp and komeda developers/maintainers would be appreciated. Rebased onto drm-misc-next. v3..v4: - addressed (some) comments from Daniel Stone, Ezequiel Garcia, Daniel Vetter and James Qian Wang - thank you for input - refactored helpers to ease accommodating drivers with afbc needs - moved afbc checks to helpers - converted komeda, malidp and (the newly added) rockchip to use the afbc helpers - eliminated a separate, dedicated source code file v2..v3: - addressed (some) comments from Daniel Stone, Liviu Dudau, Daniel Vetter and Brian Starkey - thank you all In this iteration some rework has been done. The checking logic is now moved to framebuffer_check() so it is common to all drivers. But the common part is not good for komeda, so this series is not good for merging yet. I kindly ask for feedback whether the changes are in the right direction. I also kindly ask for input on how to accommodate komeda. The CONFIG_DRM_AFBC option has been eliminated in favour of adding drm_afbc.c to drm_kms_helper. v1..v2: - addressed comments from Daniel Stone, Ayan Halder, Mihail Atanassov - coding style fixes Andrzej Pietrasiewicz (36): drm/framebuffer: Add optional modifier info drm/core: Add afbc helper functions drm/gem-fb-helper: Allow drivers to allocate struct drm_framebuffer on their own drm/gem-fb-helper: Add special version of drm_gem_fb_size_check drm/gem-fb-helper: Add generic afbc size checks drm/gem-fb-helper: Add method to allocate struct drm_framebuffer drm/komeda: Use afbc helper drm/komeda: Move checking src coordinates to komeda_fb_create drm/komeda: Use the already available local variable drm/komeda: Retrieve drm_format_info once drm/komeda: Explicitly require 1 plane for AFBC drm/komeda: Move pitches comparison to komeda_fb_create drm/komeda: Provide and use komeda_fb_get_pixel_addr variant not requiring a fb drm/komeda: Factor out object lookups for non-afbc case drm/komeda: Make komeda_fb_none_size_check independent from framebuffer drm/komeda: Factor out object lookups for afbc case drm/komeda: Free komeda_fb_afbc_size_check from framebuffer dependency drm/komeda: Simplify error handling drm/komeda: Move object lookup before size checks drm/komeda: Move object assignments to framebuffer to after size checks drm/komeda: Make the size checks independent from framebuffer structure drm/komeda: Move helper invocation to after size checks drm/komeda: Use helper for common tasks drm/komeda: Use return value of drm_gem_fb_lookup drm/komeda: Use special helper for non-afbc size checks drm/komeda: Factor in the invocation of special helper drm/komeda: Use special helper for afbc case size check drm/komeda: Factor in the invocation of special helper, afbc case drm/komeda: Move special helper invocation outside if-else drm/komeda: Move to helper checking afbc buffer size drm/arm/malidp: Make verify funcitons invocations independent drm/arm/malidp: Integrate verify functions drm/arm/malidp: Factor in afbc framebuffer verification drm/arm/malidp: Use generic helpers for afbc checks drm/rockchip: Use helper for common task drm/rockchip: Add support for afbc .../arm/display/komeda/d71/d71_component.c | 7 +- .../arm/display/komeda/komeda_framebuffer.c | 285 ++++++++--------- .../arm/display/komeda/komeda_framebuffer.h | 15 +- .../display/komeda/komeda_pipeline_state.c | 11 +- drivers/gpu/drm/arm/malidp_drv.c | 155 ++++----- drivers/gpu/drm/drm_fourcc.c | 63 +++- drivers/gpu/drm/drm_framebuffer.c | 3 + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 301 +++++++++++++++--- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 109 ++++++- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 141 +++++++- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 12 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 84 ++++- include/drm/drm_fourcc.h | 4 + include/drm/drm_framebuffer.h | 16 + include/drm/drm_gem_framebuffer_helper.h | 50 +++ 15 files changed, 933 insertions(+), 323 deletions(-) -- 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
