Same as v1 with the requested fixes and tags added. v1 is here: https://lists.freedesktop.org/archives/intel-gfx/2016-December/113639.html
I haven't yet updated kmscube to use Kristian's GET_PLANE2, but I will be doing it this week, I hope. Now all patches but the last should be safe to merge without the kernel actually defining, or supporting the new fourcc codes. Here is the branch: https://cgit.freedesktop.org/~bwidawsk/mesa/log/?h=modifiers Cc: Kristian H. Kristensen <hoegsb...@gmail.com> Cc: Daniel Stone <dan...@fooishbar.org> Cc: Eric Engestrom <e...@engestrom.ch> Daniel, I added your acked-by for all patches (even though I added a couple from the original). Ben Widawsky (32): i965: Fix SURFACE_STATE to handle non-zero aux offsets gbm: Move getters to match order in header file (trivial) gbm: Fix width height getters return type (trivial) gbm: Export a plane getter function gbm: Export a getter for per plane handles gbm: Create a gbm_device getter for stride gbm: Export a per plane getter for stride gbm: Export a per plane getter for offset i965/dri: Store the screen associated with the image dri: Add an image creation with modifiers gbm: Introduce modifiers into surface/bo creation i965: Handle Y-tile modifier i965: Handle X tiled modifier gbm: Get modifiers from DRI i965: Bring back always Y-tiled on SKL+ i965: Separate image allocation with modifiers i965: Support images with offset aux buffers i965/miptree: Add a helper functions for image creation i965/miptree: Allocate mcs_buf for an image's CCS_E i965: Support all known modifiers i965: Allocate tile aligned height i965: Create correctly sized mcs for an image i965/miptree: Add a return for updating of winsys i965/miptree: Allocate mt earlier in update winsys i965: Pretend that CCS modified images are two planes i965: Make CCS stride match kernel's expectations i965: Change resolve flags to enum i965: Plumb resolve hints from miptrees to blorp i965: Add new resolve hints full and partial i965: Use partial resolves for CCS buffers being scanned out i965: Remove scanout restriction from lossless compression i965: Handle compression modifier include/GL/internal/dri_interface.h | 27 ++- src/egl/drivers/dri2/platform_drm.c | 19 +- src/gallium/state_trackers/dri/dri2.c | 1 + src/gbm/backends/dri/gbm_dri.c | 171 ++++++++++++++++- src/gbm/gbm-symbols-check | 7 + src/gbm/main/gbm.c | 133 +++++++++++-- src/gbm/main/gbm.h | 27 +++ src/gbm/main/gbmint.h | 17 +- src/mesa/drivers/dri/i965/brw_blorp.c | 14 +- src/mesa/drivers/dri/i965/brw_blorp.h | 3 +- src/mesa/drivers/dri/i965/brw_context.c | 53 ++++-- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 3 +- src/mesa/drivers/dri/i965/intel_fbo.c | 17 +- src/mesa/drivers/dri/i965/intel_image.h | 5 + src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 151 +++++++++++---- src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 29 ++- src/mesa/drivers/dri/i965/intel_screen.c | 229 +++++++++++++++++++++-- src/mesa/drivers/dri/i965/intel_tex_image.c | 17 +- 18 files changed, 798 insertions(+), 125 deletions(-) -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev