From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1F023D1D467 for ; Thu, 8 Jan 2026 14:51:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7671310E78B; Thu, 8 Jan 2026 14:51:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="JW+2+aqC"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="2yQWwAQO"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="JW+2+aqC"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="2yQWwAQO"; dkim-atps=neutral Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 063F210E78A for ; Thu, 8 Jan 2026 14:51:21 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6BAD63430F; Thu, 8 Jan 2026 14:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1767883864; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92A2FB2myzzQMEvfoDga5Ni/NGWmhoTEUhbn2m8vACI=; b=JW+2+aqCtGIlHull5NFMtj/+OA8k4AroO7vpeTmTvedFEtO4URNLDkUff3U+PSyrD6LywV kw4rPlBkURZJmKtDft44OA/lMrgbqCFYknIDR2EctoYhJOsb9ipSySjxL2uWAArF+DUvz6 +9b+R4kl7lQgCETeU0kwBB61l+LJbJE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1767883864; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92A2FB2myzzQMEvfoDga5Ni/NGWmhoTEUhbn2m8vACI=; b=2yQWwAQO2f5etGW5EOOiD6jBvI+2rvwHX7zluCLXi/truAvegD2+sAPW0GfpX1BdQ9MGOV j9fHbl4nQuwPgeAQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1767883864; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92A2FB2myzzQMEvfoDga5Ni/NGWmhoTEUhbn2m8vACI=; b=JW+2+aqCtGIlHull5NFMtj/+OA8k4AroO7vpeTmTvedFEtO4URNLDkUff3U+PSyrD6LywV kw4rPlBkURZJmKtDft44OA/lMrgbqCFYknIDR2EctoYhJOsb9ipSySjxL2uWAArF+DUvz6 +9b+R4kl7lQgCETeU0kwBB61l+LJbJE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1767883864; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92A2FB2myzzQMEvfoDga5Ni/NGWmhoTEUhbn2m8vACI=; b=2yQWwAQO2f5etGW5EOOiD6jBvI+2rvwHX7zluCLXi/truAvegD2+sAPW0GfpX1BdQ9MGOV j9fHbl4nQuwPgeAQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 244D93EA65; Thu, 8 Jan 2026 14:51:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2DGtB1jEX2n0WQAAD6G6ig (envelope-from ); Thu, 08 Jan 2026 14:51:04 +0000 From: Thomas Zimmermann To: tzungbi@kernel.org, briannorris@chromium.org, jwerner@chromium.org, javierm@redhat.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, airlied@gmail.com, simona@ffwll.ch Cc: chrome-platform@lists.linux.dev, dri-devel@lists.freedesktop.org, Thomas Zimmermann Subject: [PATCH 7/8] drm/sysfb: Generalize pixel-format matching Date: Thu, 8 Jan 2026 15:19:47 +0100 Message-ID: <20260108145058.56943-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260108145058.56943-1-tzimmermann@suse.de> References: <20260108145058.56943-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-6.80 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.997]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_TO(0.00)[kernel.org,chromium.org,redhat.com,linux.intel.com,gmail.com,ffwll.ch]; RCPT_COUNT_SEVEN(0.00)[11]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLf8s8spogujn9h9roxabhn3pd)]; RCVD_TLS_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; RCVD_COUNT_TWO(0.00)[2]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Provide drm_sysfb_get_format(), a helper that finds a specific DRM format from a list of pixel formats. The new function builds upon drm_sysfb_get_format_si(), which finds the DRM format from a given instance of struct screen_info. Now get the screen_info's pixel format in the caller. Allows for matching pixel formats in drivers without screen_info. Convert the callers in efidrm and vesadrm to the new interface. Signed-off-by: Thomas Zimmermann --- drivers/gpu/drm/sysfb/drm_sysfb.c | 24 +++++++++++++++ drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 8 ++--- drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c | 30 ------------------- drivers/gpu/drm/sysfb/efidrm.c | 8 ++++- drivers/gpu/drm/sysfb/vesadrm.c | 8 ++++- 5 files changed, 42 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/sysfb/drm_sysfb.c b/drivers/gpu/drm/sysfb/drm_sysfb.c index 308f82153b15..fbfb37d0fae1 100644 --- a/drivers/gpu/drm/sysfb/drm_sysfb.c +++ b/drivers/gpu/drm/sysfb/drm_sysfb.c @@ -31,5 +31,29 @@ int drm_sysfb_get_validated_int0(struct drm_device *dev, const char *name, } EXPORT_SYMBOL(drm_sysfb_get_validated_int0); +const struct drm_format_info *drm_sysfb_get_format(struct drm_device *dev, + const struct drm_sysfb_format *formats, + size_t nformats, + const struct pixel_format *pixel) +{ + const struct drm_format_info *format = NULL; + size_t i; + + for (i = 0; i < nformats; ++i) { + const struct drm_sysfb_format *f = &formats[i]; + + if (pixel_format_equal(pixel, &f->pixel)) { + format = drm_format_info(f->fourcc); + break; + } + } + + if (!format) + drm_warn(dev, "No compatible color format found\n"); + + return format; +} +EXPORT_SYMBOL(drm_sysfb_get_format); + MODULE_DESCRIPTION("Helpers for DRM sysfb drivers"); MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/sysfb/drm_sysfb_helper.h b/drivers/gpu/drm/sysfb/drm_sysfb_helper.h index de96bfe7562c..b14df5b54bc9 100644 --- a/drivers/gpu/drm/sysfb/drm_sysfb_helper.h +++ b/drivers/gpu/drm/sysfb/drm_sysfb_helper.h @@ -36,6 +36,10 @@ int drm_sysfb_get_validated_int(struct drm_device *dev, const char *name, u64 value, u32 max); int drm_sysfb_get_validated_int0(struct drm_device *dev, const char *name, u64 value, u32 max); +const struct drm_format_info *drm_sysfb_get_format(struct drm_device *dev, + const struct drm_sysfb_format *formats, + size_t nformats, + const struct pixel_format *pixel); #if defined(CONFIG_SCREEN_INFO) int drm_sysfb_get_width_si(struct drm_device *dev, const struct screen_info *si); @@ -48,10 +52,6 @@ int drm_sysfb_get_stride_si(struct drm_device *dev, const struct screen_info *si unsigned int width, unsigned int height, u64 size); u64 drm_sysfb_get_visible_size_si(struct drm_device *dev, const struct screen_info *si, unsigned int height, unsigned int stride, u64 size); -const struct drm_format_info *drm_sysfb_get_format_si(struct drm_device *dev, - const struct drm_sysfb_format *formats, - size_t nformats, - const struct screen_info *si); #endif /* diff --git a/drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c b/drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c index 885864168c54..749290196c6a 100644 --- a/drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c +++ b/drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c @@ -72,33 +72,3 @@ u64 drm_sysfb_get_visible_size_si(struct drm_device *dev, const struct screen_in return drm_sysfb_get_validated_size0(dev, "visible size", vsize, size); } EXPORT_SYMBOL(drm_sysfb_get_visible_size_si); - -const struct drm_format_info *drm_sysfb_get_format_si(struct drm_device *dev, - const struct drm_sysfb_format *formats, - size_t nformats, - const struct screen_info *si) -{ - const struct drm_format_info *format = NULL; - struct pixel_format pixel; - size_t i; - int ret; - - ret = screen_info_pixel_format(si, &pixel); - if (ret) - return NULL; - - for (i = 0; i < nformats; ++i) { - const struct drm_sysfb_format *f = &formats[i]; - - if (pixel_format_equal(&pixel, &f->pixel)) { - format = drm_format_info(f->fourcc); - break; - } - } - - if (!format) - drm_warn(dev, "No compatible color format found\n"); - - return format; -} -EXPORT_SYMBOL(drm_sysfb_get_format_si); diff --git a/drivers/gpu/drm/sysfb/efidrm.c b/drivers/gpu/drm/sysfb/efidrm.c index 1b683d55d6ea..ee525f330441 100644 --- a/drivers/gpu/drm/sysfb/efidrm.c +++ b/drivers/gpu/drm/sysfb/efidrm.c @@ -45,8 +45,14 @@ static const struct drm_format_info *efidrm_get_format_si(struct drm_device *dev { PIXEL_FORMAT_XBGR8888, DRM_FORMAT_XBGR8888, }, { PIXEL_FORMAT_XRGB2101010, DRM_FORMAT_XRGB2101010, }, }; + struct pixel_format pixel; + int ret; + + ret = screen_info_pixel_format(si, &pixel); + if (ret) + return NULL; - return drm_sysfb_get_format_si(dev, formats, ARRAY_SIZE(formats), si); + return drm_sysfb_get_format(dev, formats, ARRAY_SIZE(formats), &pixel); } static u64 efidrm_get_mem_flags(struct drm_device *dev, resource_size_t start, diff --git a/drivers/gpu/drm/sysfb/vesadrm.c b/drivers/gpu/drm/sysfb/vesadrm.c index 7b7b5ba26317..b8c16ae3faad 100644 --- a/drivers/gpu/drm/sysfb/vesadrm.c +++ b/drivers/gpu/drm/sysfb/vesadrm.c @@ -49,8 +49,14 @@ static const struct drm_format_info *vesadrm_get_format_si(struct drm_device *de { PIXEL_FORMAT_XBGR8888, DRM_FORMAT_XBGR8888, }, { PIXEL_FORMAT_C8, DRM_FORMAT_C8, }, }; + struct pixel_format pixel; + int ret; + + ret = screen_info_pixel_format(si, &pixel); + if (ret) + return NULL; - return drm_sysfb_get_format_si(dev, formats, ARRAY_SIZE(formats), si); + return drm_sysfb_get_format(dev, formats, ARRAY_SIZE(formats), &pixel); } /* -- 2.52.0