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 E70B7C5479D for ; Mon, 9 Jan 2023 11:46:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E1EF10E3E6; Mon, 9 Jan 2023 11:46:39 +0000 (UTC) X-Greylist: delayed 456 seconds by postgrey-1.36 at gabe; Mon, 09 Jan 2023 11:46:36 UTC Received: from mblankhorst.nl (lankhorst.se [IPv6:2a02:2308:0:7ec:e79c:4e97:b6c4:f0ae]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC77A10E3E6 for ; Mon, 9 Jan 2023 11:46:36 +0000 (UTC) From: Maarten Lankhorst To: intel-gfx@lists.freedesktop.org Date: Mon, 9 Jan 2023 12:38:46 +0100 Message-Id: <20230109113846.26765-1-maarten.lankhorst@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [PATCH] drm/i915/display: Enable FBC for fbcon X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Remove frontbuffer invalidation code from FBC, and just use the dirtyfb helper. Signed-off-by: Maarten Lankhorst --- drivers/gpu/drm/i915/display/intel_fbdev.c | 68 +++++----------------- 1 file changed, 15 insertions(+), 53 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c index ccee65d9ac16..04406f1162dd 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c @@ -40,6 +40,7 @@ #include #include #include +#include #ifdef I915 #include "gem/i915_gem_lmem.h" @@ -80,65 +81,17 @@ struct intel_fbdev { struct mutex hpd_lock; }; -static void intel_fbdev_invalidate(struct intel_fbdev *ifbdev) -{ - intel_frontbuffer_invalidate(ifbdev->fb, ORIGIN_CPU); -} - -static int intel_fbdev_set_par(struct fb_info *info) -{ - struct drm_fb_helper *fb_helper = info->par; - struct intel_fbdev *ifbdev = - container_of(fb_helper, struct intel_fbdev, helper); - int ret; - - ret = drm_fb_helper_set_par(info); - if (ret == 0) - intel_fbdev_invalidate(ifbdev); - - return ret; -} - -static int intel_fbdev_blank(int blank, struct fb_info *info) -{ - struct drm_fb_helper *fb_helper = info->par; - struct intel_fbdev *ifbdev = - container_of(fb_helper, struct intel_fbdev, helper); - int ret; - - ret = drm_fb_helper_blank(blank, info); - if (ret == 0) - intel_fbdev_invalidate(ifbdev); - - return ret; -} - -static int intel_fbdev_pan_display(struct fb_var_screeninfo *var, - struct fb_info *info) -{ - struct drm_fb_helper *fb_helper = info->par; - struct intel_fbdev *ifbdev = - container_of(fb_helper, struct intel_fbdev, helper); - int ret; - - ret = drm_fb_helper_pan_display(var, info); - if (ret == 0) - intel_fbdev_invalidate(ifbdev); - - return ret; -} - static const struct fb_ops intelfb_ops = { .owner = THIS_MODULE, DRM_FB_HELPER_DEFAULT_OPS, - .fb_set_par = intel_fbdev_set_par, + .fb_set_par = drm_fb_helper_set_par, .fb_read = drm_fb_helper_cfb_read, .fb_write = drm_fb_helper_cfb_write, .fb_fillrect = drm_fb_helper_cfb_fillrect, .fb_copyarea = drm_fb_helper_cfb_copyarea, .fb_imageblit = drm_fb_helper_cfb_imageblit, - .fb_pan_display = intel_fbdev_pan_display, - .fb_blank = intel_fbdev_blank, + .fb_pan_display = drm_fb_helper_pan_display, + .fb_blank = drm_fb_helper_blank, }; static int intelfb_alloc(struct drm_fb_helper *helper, @@ -399,8 +352,18 @@ static int intelfb_create(struct drm_fb_helper *helper, return ret; } +static int intel_fbdev_fb_dirty(struct drm_fb_helper *helper, struct drm_clip_rect *clip) +{ + struct intel_fbdev *ifbdev = + container_of(helper, struct intel_fbdev, helper); + struct drm_framebuffer *fb = &ifbdev->fb->base; + + return fb->funcs->dirty(fb, NULL, 0, 0, clip, 1); +} + static const struct drm_fb_helper_funcs intel_fb_helper_funcs = { .fb_probe = intelfb_create, + .fb_dirty = intel_fbdev_fb_dirty, }; static void intel_fbdev_destroy(struct intel_fbdev *ifbdev) @@ -780,8 +743,7 @@ void intel_fbdev_restore_mode(struct drm_device *dev) if (!ifbdev->vma) return; - if (drm_fb_helper_restore_fbdev_mode_unlocked(&ifbdev->helper) == 0) - intel_fbdev_invalidate(ifbdev); + drm_fb_helper_restore_fbdev_mode_unlocked(&ifbdev->helper); } struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev) -- 2.34.1