X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=msm.c;h=add04a8b93111d4f5422e7216dac97120106c06d;hb=0a7aeab1c6dd29aceae129f8dd2903f2f41de62f;hp=268e6d35a248418d41871b3d3c6fe0b8cd0d3546;hpb=5ff0cfd262c4660afbb8edc90719f4a3c2e32b0c;p=android-x86%2Fexternal-minigbm.git diff --git a/msm.c b/msm.c index 268e6d3..add04a8 100644 --- a/msm.c +++ b/msm.c @@ -7,6 +7,7 @@ #ifdef DRV_MSM #include +#include #include #include #include @@ -69,24 +70,27 @@ static void msm_calculate_layout(struct bo *bo) { uint32_t width, height; - width = bo->width; - height = bo->height; + width = bo->meta.width; + height = bo->meta.height; /* NV12 format requires extra padding with platform * specific alignments for venus driver */ - if (bo->format == DRM_FORMAT_NV12) { + if (bo->meta.format == DRM_FORMAT_NV12) { uint32_t y_stride, uv_stride, y_scanline, uv_scanline, y_plane, uv_plane, size, extra_padding; y_stride = ALIGN(width, VENUS_STRIDE_ALIGN); uv_stride = ALIGN(width, VENUS_STRIDE_ALIGN); y_scanline = ALIGN(height, VENUS_SCANLINE_ALIGN * 2); - uv_scanline = ALIGN(DIV_ROUND_UP(height, 2), VENUS_SCANLINE_ALIGN); + uv_scanline = ALIGN(DIV_ROUND_UP(height, 2), + VENUS_SCANLINE_ALIGN * (bo->meta.tiling ? 2 : 1)); y_plane = y_stride * y_scanline; uv_plane = uv_stride * uv_scanline; - if (bo->tiling == MSM_UBWC_TILING) { + if (bo->meta.tiling == MSM_UBWC_TILING) { + y_plane = ALIGN(y_plane, PLANE_SIZE_ALIGN); + uv_plane = ALIGN(uv_plane, PLANE_SIZE_ALIGN); y_plane += get_ubwc_meta_size(width, height, 32, 8); uv_plane += get_ubwc_meta_size(width >> 1, height >> 1, 16, 8); extra_padding = NV12_UBWC_PADDING(y_stride); @@ -94,34 +98,37 @@ static void msm_calculate_layout(struct bo *bo) extra_padding = NV12_LINEAR_PADDING; } - bo->strides[0] = y_stride; - bo->sizes[0] = y_plane; - bo->offsets[1] = y_plane; - bo->strides[1] = uv_stride; + bo->meta.strides[0] = y_stride; + bo->meta.sizes[0] = y_plane; + bo->meta.offsets[1] = y_plane; + bo->meta.strides[1] = uv_stride; size = y_plane + uv_plane + extra_padding; - bo->total_size = ALIGN(size, BUFFER_SIZE_ALIGN); - bo->sizes[1] = bo->total_size - bo->sizes[0]; + bo->meta.total_size = ALIGN(size, BUFFER_SIZE_ALIGN); + bo->meta.sizes[1] = bo->meta.total_size - bo->meta.sizes[0]; } else { uint32_t stride, alignw, alignh; alignw = ALIGN(width, DEFAULT_ALIGNMENT); - /* HAL_PIXEL_FORMAT_YV12 requires that the buffer's height not be aligned. */ - if (bo->format == DRM_FORMAT_YVU420_ANDROID) { + /* HAL_PIXEL_FORMAT_YV12 requires that the buffer's height not be aligned. + DRM_FORMAT_R8 of height one is used for JPEG camera output, so don't + height align that. */ + if (bo->meta.format == DRM_FORMAT_YVU420_ANDROID || + (bo->meta.format == DRM_FORMAT_R8 && height == 1)) { alignh = height; } else { alignh = ALIGN(height, DEFAULT_ALIGNMENT); } - stride = drv_stride_from_format(bo->format, alignw, 0); + stride = drv_stride_from_format(bo->meta.format, alignw, 0); /* Calculate size and assign stride, size, offset to each plane based on format */ - drv_bo_from_format(bo, stride, alignh, bo->format); + drv_bo_from_format(bo, stride, alignh, bo->meta.format); /* For all RGB UBWC formats */ - if (bo->tiling == MSM_UBWC_TILING) { - bo->sizes[0] += get_ubwc_meta_size(width, height, 16, 4); - bo->total_size = bo->sizes[0]; - assert(IS_ALIGNED(bo->total_size, BUFFER_SIZE_ALIGN)); + if (bo->meta.tiling == MSM_UBWC_TILING) { + bo->meta.sizes[0] += get_ubwc_meta_size(width, height, 16, 4); + bo->meta.total_size = bo->meta.sizes[0]; + assert(IS_ALIGNED(bo->meta.total_size, BUFFER_SIZE_ALIGN)); } } } @@ -131,6 +138,8 @@ static bool is_ubwc_fmt(uint32_t format) switch (format) { case DRM_FORMAT_XBGR8888: case DRM_FORMAT_ABGR8888: + case DRM_FORMAT_XRGB8888: + case DRM_FORMAT_ARGB8888: case DRM_FORMAT_NV12: return 1; default: @@ -152,13 +161,51 @@ static void msm_add_ubwc_combinations(struct driver *drv, const uint32_t *format } } +/** + * Check for buggy apps that are known to not support modifiers, to avoid surprising them + * with a UBWC buffer. + */ +static bool should_avoid_ubwc(void) +{ +#ifndef __ANDROID__ + /* waffle is buggy and, requests a renderable buffer (which on qcom platforms, we + * want to use UBWC), and then passes it to the kernel discarding the modifier. + * So mesa ends up correctly rendering to as tiled+compressed, but kernel tries + * to display as linear. Other platforms do not see this issue, simply because + * they only use compressed (ex, AFBC) with the BO_USE_SCANOUT flag. + * + * See b/163137550 + */ + if (dlsym(RTLD_DEFAULT, "waffle_display_connect")) { + drv_log("WARNING: waffle detected, disabling UBWC\n"); + return true; + } + + /* The video_decode_accelerator_tests needs to read back the frames + * to verify they are correct. The frame verification relies on + * computing the MD5 of the video frame. UBWC results in a different + * MD5. This turns off UBWC for gtest until a proper frame + * comparison can be made + * Rely on the same mechanism that waffle is using, but this time check + * for a dynamic library function that is present in chrome, but missing + * in gtest. Cups is not loaded for video tests. + * + * See b/171260705 + */ + if (!dlsym(RTLD_DEFAULT, "cupsFilePrintf")) { + drv_log("WARNING: gtest detected, disabling UBWC\n"); + return true; + } +#endif + return false; +} + static int msm_init(struct driver *drv) { struct format_metadata metadata; - uint64_t render_use_flags = BO_USE_RENDER_MASK; + uint64_t render_use_flags = BO_USE_RENDER_MASK | BO_USE_SCANOUT; uint64_t texture_use_flags = BO_USE_TEXTURE_MASK | BO_USE_HW_VIDEO_DECODER; - uint64_t sw_flags = (BO_USE_RENDERSCRIPT | BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_OFTEN | - BO_USE_LINEAR | BO_USE_PROTECTED); + uint64_t sw_flags = (BO_USE_RENDERSCRIPT | BO_USE_SW_MASK | BO_USE_LINEAR); drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats), &LINEAR_METADATA, render_use_flags); @@ -166,11 +213,28 @@ static int msm_init(struct driver *drv) drv_add_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats), &LINEAR_METADATA, texture_use_flags); + /* The camera stack standardizes on NV12 for YUV buffers. */ + /* YVU420 and NV12 formats for camera, display and encoding. */ + drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA, + BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SCANOUT | + BO_USE_HW_VIDEO_ENCODER); + + /* + * R8 format is used for Android's HAL_PIXEL_FORMAT_BLOB and is used for JPEG snapshots + * from camera and input/output from hardware decoder/encoder. + */ + drv_modify_combination(drv, DRM_FORMAT_R8, &LINEAR_METADATA, + BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER | + BO_USE_HW_VIDEO_ENCODER); + /* Android CTS tests require this. */ drv_add_combination(drv, DRM_FORMAT_BGR888, &LINEAR_METADATA, BO_USE_SW_MASK); drv_modify_linear_combinations(drv); + if (should_avoid_ubwc()) + return 0; + metadata.tiling = MSM_UBWC_TILING; metadata.priority = 2; metadata.modifier = DRM_FORMAT_MOD_QCOM_COMPRESSED; @@ -184,23 +248,25 @@ static int msm_init(struct driver *drv) msm_add_ubwc_combinations(drv, texture_source_formats, ARRAY_SIZE(texture_source_formats), &metadata, texture_use_flags); + drv_modify_combination(drv, DRM_FORMAT_NV12, &metadata, + BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_SCANOUT | + BO_USE_HW_VIDEO_ENCODER); + return 0; } static int msm_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t height, uint32_t format, const uint64_t modifier) { - struct drm_msm_gem_new req; + struct drm_msm_gem_new req = { 0 }; int ret; size_t i; - bo->tiling = (modifier == DRM_FORMAT_MOD_QCOM_COMPRESSED) ? MSM_UBWC_TILING : 0; - + bo->meta.tiling = (modifier == DRM_FORMAT_MOD_QCOM_COMPRESSED) ? MSM_UBWC_TILING : 0; msm_calculate_layout(bo); - memset(&req, 0, sizeof(req)); req.flags = MSM_BO_WC | MSM_BO_SCANOUT; - req.size = bo->total_size; + req.size = bo->meta.total_size; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MSM_GEM_NEW, &req); if (ret) { @@ -212,9 +278,9 @@ static int msm_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t he * Though we use only one plane, we need to set handle for * all planes to pass kernel checks */ - for (i = 0; i < bo->num_planes; i++) { + for (i = 0; i < bo->meta.num_planes; i++) { bo->handles[i].u32 = req.handle; - bo->format_modifiers[i] = modifier; + bo->meta.format_modifiers[i] = modifier; } return 0; @@ -251,22 +317,36 @@ static int msm_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_ static void *msm_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map_flags) { int ret; - struct drm_msm_gem_info req; + struct drm_msm_gem_info req = { 0 }; - memset(&req, 0, sizeof(req)); req.handle = bo->handles[0].u32; - ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MSM_GEM_INFO, &req); if (ret) { drv_log("DRM_IOCLT_MSM_GEM_INFO failed with %s\n", strerror(errno)); return MAP_FAILED; } - vma->length = bo->total_size; + vma->length = bo->meta.total_size; - return mmap(0, bo->total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd, + return mmap(0, bo->meta.total_size, drv_get_prot(map_flags), MAP_SHARED, bo->drv->fd, req.offset); } +static uint32_t msm_resolve_format(struct driver *drv, uint32_t format, uint64_t use_flags) +{ + switch (format) { + case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED: + /* Camera subsystem requires NV12. */ + if (use_flags & (BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE)) + return DRM_FORMAT_NV12; + /*HACK: See b/28671744 */ + return DRM_FORMAT_XBGR8888; + case DRM_FORMAT_FLEX_YCbCr_420_888: + return DRM_FORMAT_NV12; + default: + return format; + } +} + const struct backend backend_msm = { .name = "msm", .init = msm_init, @@ -276,5 +356,6 @@ const struct backend backend_msm = { .bo_import = drv_prime_bo_import, .bo_map = msm_bo_map, .bo_unmap = drv_bo_munmap, + .resolve_format = msm_resolve_format, }; #endif /* DRV_MSM */