Message ID | 20230728182234.10680-43-tzimmermann@suse.de (mailing list archive) |
---|---|
State | Handled Elsewhere |
Headers | show
Return-Path: <linux-fbdev-owner@vger.kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AAD6C0015E for <linux-fbdev@archiver.kernel.org>; Fri, 28 Jul 2023 18:24:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236621AbjG1SYg (ORCPT <rfc822;linux-fbdev@archiver.kernel.org>); Fri, 28 Jul 2023 14:24:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236622AbjG1SYf (ORCPT <rfc822;linux-fbdev@vger.kernel.org>); Fri, 28 Jul 2023 14:24:35 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC7A2449E; Fri, 28 Jul 2023 11:24:14 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 361EE219A6; Fri, 28 Jul 2023 18:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690568566; 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=ujE4CJBGNqS7MF0X4eNbuaZgzfHDtI52f0CYb0nf6EE=; b=F+7QZ19IWRMEhyCvgvdCJNHdDg2lnfe3L1yo8uiJ9TpRGOCGO6nSVsRtelj5xJllQDdNp2 tUOXrMwLWgM287fHLmk/L0ir11PoPrvY1MAwFTWib7KvLUVyC/MnKkj1jxfS5Rx0y9lJbz Nbh7SzV4eepXnefzvvvBuF55AgIwUEE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690568566; 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=ujE4CJBGNqS7MF0X4eNbuaZgzfHDtI52f0CYb0nf6EE=; b=nowLDdLQ7Ex5FD8G7gvnu+yIdYZEWhnStLB8dADUOH2f93U9wSz6kK9Y7L+JwHGP7YyDTf k4cMN7AAkmL6UtBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id EFA7E13276; Fri, 28 Jul 2023 18:22:45 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 4JxiOXUHxGQ3CwAAMHmgww (envelope-from <tzimmermann@suse.de>); Fri, 28 Jul 2023 18:22:45 +0000 From: Thomas Zimmermann <tzimmermann@suse.de> To: deller@gmx.de, javierm@redhat.com, sam@ravnborg.org Cc: linux-media@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-geode@lists.infradead.org, linux-omap@vger.kernel.org, kvm@vger.kernel.org, Thomas Zimmermann <tzimmermann@suse.de> Subject: [PATCH 42/47] fbdev/sunxvr2500: Use fbdev I/O helpers Date: Fri, 28 Jul 2023 18:40:25 +0200 Message-ID: <20230728182234.10680-43-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728182234.10680-1-tzimmermann@suse.de> References: <20230728182234.10680-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-fbdev.vger.kernel.org> X-Mailing-List: linux-fbdev@vger.kernel.org |
Series |
fbdev: Use I/O helpers
|
expand
|
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 9b3433194eeb..72ddeb296568 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -617,9 +617,7 @@ config FB_XVR500 config FB_XVR2500 bool "Sun XVR-2500 3DLABS Wildcat support" depends on (FB = y) && PCI && SPARC64 - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_IO_HELPERS select VIDEO_NOMODESET help This is the framebuffer device for the Sun XVR-2500 and similar diff --git a/drivers/video/fbdev/sunxvr2500.c b/drivers/video/fbdev/sunxvr2500.c index 07ebf6941708..6c1bb8948686 100644 --- a/drivers/video/fbdev/sunxvr2500.c +++ b/drivers/video/fbdev/sunxvr2500.c @@ -66,10 +66,8 @@ static int s3d_setcolreg(unsigned regno, static const struct fb_ops s3d_ops = { .owner = THIS_MODULE, + FB_DEFAULT_IO_OPS, .fb_setcolreg = s3d_setcolreg, - .fb_fillrect = cfb_fillrect, - .fb_copyarea = cfb_copyarea, - .fb_imageblit = cfb_imageblit, }; static int s3d_set_fbinfo(struct s3d_info *sp)
Set struct fb_ops and with FB_DEFAULT_IO_OPS, fbdev's initializer for I/O memory. Sets the callbacks to the cfb_ and fb_io_ functions. Select the correct modules with Kconfig's FB_IO_HELPERS token. The macro and token set the currently selected values, so there is no functional change. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/video/fbdev/Kconfig | 4 +--- drivers/video/fbdev/sunxvr2500.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)