From patchwork Thu Aug 3 18:36:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13340742 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 AE87AC04A6A for ; Thu, 3 Aug 2023 18:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fO19aD7FZXY8ZuertkjbeQkQX9Pkqb0xxMKlYrWP3R4=; b=d++V2Rf5DVKJZP zbKA10KF8btXchb0Maz73fKa4vRYMqUXsmJ2nlXYR2w3Ut2rMbfaiXyc3xjC0gXHDEwcLeNR5D5A4 H2wLaeeiUy+3tN172tzTqtwPJNv4y48mGUe9r1v/tDzvBkPIqrD4nJSiTgiwsNMqtRwMSZLzJJI2d 99k/4QhCvxb16Ao1gAmqOO/AbFU+4gbf79sh39XRU8nqZpPR9TY6bLsQkOPTWo0a+cHoQ47wllgdO xhkubDU5Z43RyXYumdsV3SkoZMdUXuHZ7NkGV4G8qphIqIKxusmh0pGIcoJ6+ZKabpQoSxNR5cXZa 1Pxxat8PLDxyfVSVC+mQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qRdHX-00AdsG-2T; Thu, 03 Aug 2023 18:42:43 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qRdFw-00Ac01-2i; Thu, 03 Aug 2023 18:41:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ikvYrt9WSI00R7n6bFAYvx4bSk25PYyS0sam7/z9c94=; b=SC1K70283pfBiXDuVZxs/8YNHE ml2HaTL+F93qwundgytE1w0nmI9qlSttRMbwB0TDPu7f3jOEJm4c8Zmz8X1dHJgxa94U2KOJE3Jqx 5jIIl0E8zJc77FjNJlH8TKAt6yivSUMIKBcSdvPBXle9+VXwt1sSrj/uJW2XJb4bpMTVjWWhApWqT TSKkOvB6f92Fko3NVKK7KScglT+/Z0i7j1fQzIMzwANjTUWPpnXQ6YGpjbiMtabdcEoSpXHc3PWB+ 8bh+1asmJlMptj5gxCP9pzTxAi+7+FpmmYDaTDdOAkgXRYCLSM5st4SwhV9nLAOLjZp/AQjtJ7+wk n4ywUApQ==; Received: from smtp-out1.suse.de ([195.135.220.28]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qRdFs-00GzVA-0c; Thu, 03 Aug 2023 18:41:03 +0000 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 53B0321983; Thu, 3 Aug 2023 18:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691088047; 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=ikvYrt9WSI00R7n6bFAYvx4bSk25PYyS0sam7/z9c94=; b=hR9X7T+4F0PfiDaj6URi5FKl12e8i5o7fZ4wcHLm4iB2RUp4Fx+em+3TKto+/C/v0zaRMh qnrW0xLFuJgDLn3mbCEiUcjy4+uTh1J0ZpyKW1xlzIzawzUZvUCPpu9YVnUd59C2fBjtdu VLL5+GikFiDcJwvVg+MplhMyvMFzxos= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691088047; 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=ikvYrt9WSI00R7n6bFAYvx4bSk25PYyS0sam7/z9c94=; b=NhRyWGR7On2r+/A4HBY8AX2pdCvMCX+FbnvP729agTI/p+poLgtFgq5s8uNdMEvSwngYYl 3d73phP2QSjtSuAA== 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 1A146139BD; Thu, 3 Aug 2023 18:40:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gNeEBa/0y2TLGAAAMHmgww (envelope-from ); Thu, 03 Aug 2023 18:40:47 +0000 From: Thomas Zimmermann 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 , Jingoo Han Subject: [PATCH v3 37/47] fbdev/s3cfb: Use fbdev I/O helpers Date: Thu, 3 Aug 2023 20:36:02 +0200 Message-ID: <20230803184034.6456-38-tzimmermann@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230803184034.6456-1-tzimmermann@suse.de> References: <20230803184034.6456-1-tzimmermann@suse.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230803_194100_438587_13995DD6 X-CRM114-Status: GOOD ( 13.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Set struct fb_ops and with FB_DEFAULT_IOMEM_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_IOMEM_HELPERS token. The macro and token set the currently selected values, so there is no functional change. v3: * use _IOMEM_ in commit message v2: * updated to use _IOMEM_ tokens Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg Acked-by: Helge Deller Cc: Jingoo Han --- drivers/video/fbdev/Kconfig | 4 +--- drivers/video/fbdev/s3c-fb.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 4986586c63b0..71766639c542 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -1653,9 +1653,7 @@ config FB_S3C tristate "Samsung S3C framebuffer support" depends on FB && HAVE_CLK && HAS_IOMEM depends on ARCH_S3C64XX || COMPILE_TEST - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_IOMEM_HELPERS help Frame buffer driver for the built-in FB controller in the Samsung SoC line such as the S3C6400 and S3C6410. diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c index c50b92c06c5d..2b85aad6a304 100644 --- a/drivers/video/fbdev/s3c-fb.c +++ b/drivers/video/fbdev/s3c-fb.c @@ -1038,13 +1038,11 @@ static int s3c_fb_ioctl(struct fb_info *info, unsigned int cmd, static const struct fb_ops s3c_fb_ops = { .owner = THIS_MODULE, + FB_DEFAULT_IOMEM_OPS, .fb_check_var = s3c_fb_check_var, .fb_set_par = s3c_fb_set_par, .fb_blank = s3c_fb_blank, .fb_setcolreg = s3c_fb_setcolreg, - .fb_fillrect = cfb_fillrect, - .fb_copyarea = cfb_copyarea, - .fb_imageblit = cfb_imageblit, .fb_pan_display = s3c_fb_pan_display, .fb_ioctl = s3c_fb_ioctl, };