From b65708a9181836a4dde2eebf89a0a57b66534738 Mon Sep 17 00:00:00 2001 From: Drew Davenport Date: Mon, 9 Nov 2020 18:37:55 -0700 Subject: [PATCH] helpers: Use backend num_planes_from_modifier only when modifier set If modifiers are not set, or if only linear modifier is set, just return the number of planes based on the format. If there are other modifiers set, then query the backend. BUG=b:172830088 TEST=Start camera on zork after mesa uprev Change-Id: I130e9ef3730b35f6e8777ce9c1919de2eb466733 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/2528204 Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Kristian H. Kristensen Tested-by: Drew Davenport Commit-Queue: Drew Davenport --- helpers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers.c b/helpers.c index d8c2818..7ed10ee 100644 --- a/helpers.c +++ b/helpers.c @@ -189,7 +189,8 @@ size_t drv_num_planes_from_modifier(struct driver *drv, uint32_t format, uint64_ if (!planes) return 0; - if (drv->backend->num_planes_from_modifier && modifier != DRM_FORMAT_MOD_INVALID) + if (drv->backend->num_planes_from_modifier && modifier != DRM_FORMAT_MOD_INVALID && + modifier != DRM_FORMAT_MOD_LINEAR) return drv->backend->num_planes_from_modifier(drv, format, modifier); return planes; -- 2.11.0