From: Roman Stratiienko Date: Tue, 29 Dec 2020 10:27:00 +0000 (+0200) Subject: Revert "WIP: Pinephone optimization experements" X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-minigbm.git;a=commitdiff_plain;h=fe6d747787212b2ae946e76862caf03873a11241 Revert "WIP: Pinephone optimization experements" This reverts commit 4b3de7042c073970a1229b537eda6a64f3088286. --- diff --git a/dri_generic_driver.c b/dri_generic_driver.c index 5ef5aad..135803d 100644 --- a/dri_generic_driver.c +++ b/dri_generic_driver.c @@ -17,7 +17,7 @@ static const uint32_t scanout_render_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_ABGR8888, DRM_FORMAT_XBGR8888, - DRM_FORMAT_RGB565, DRM_FORMAT_ARGB4444 }; + DRM_FORMAT_RGB565 }; static const uint32_t texture_only_formats[] = { DRM_FORMAT_NV12, DRM_FORMAT_NV21, DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID }; @@ -44,9 +44,6 @@ static int dri_generic_init(struct driver *drv) drv_add_combinations(drv, texture_only_formats, ARRAY_SIZE(texture_only_formats), &LINEAR_METADATA, BO_USE_TEXTURE_MASK); - /* Android CTS tests require this. */ - drv_add_combination(drv, DRM_FORMAT_BGR888, &LINEAR_METADATA, BO_USE_SW_MASK); - drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA, BO_USE_HW_VIDEO_ENCODER | BO_USE_HW_VIDEO_DECODER | BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE); @@ -57,18 +54,6 @@ static int dri_generic_init(struct driver *drv) static uint32_t dri_generic_resolve_format(struct driver *drv, uint32_t format, uint64_t use_flags) { - if (!(use_flags & (BO_USE_SW_MASK/* | BO_USE_COMPOSER_TARGET*/))) { - switch (format) { - case DRM_FORMAT_XBGR8888: - /* Try to optimize pinephone performance */ - return DRM_FORMAT_RGB565; - case DRM_FORMAT_ABGR8888: - /* Try to optimize pinephone performance */ - return DRM_FORMAT_ARGB8888; -// return DRM_FORMAT_ARGB4444; - } - } - switch (format) { case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED: /* Camera subsystem requires NV12. */