drm/i915/display: Enable FBC for fbcon
Subsystems (3)
PATCH 1/1 drm/i915/display: Enable FBC for fbcon
Remove frontbuffer invalidation code from FBC, and just use the dirtyfb helper.
Signed-off-by Maarten Lankhorst <[email protected]>
--- drivers/gpu/drm/i915/display/intel_fbdev.c | 68 +++++----------------- 1 file changed, 15 insertions(+), 53 deletions(-)
drivers/gpu/drm/i915/display/intel_fbdev.c +15 -53
@@ -40,6 +40,7 @@#include <drm/drm_crtc.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> +#include <drm/drm_fbdev_generic.h> #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)
Signature · 1 line
2.34.1