Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddfe1567 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Export intel_framebuffer_fini 



Rather than open-code the teardown of a framebuffer, export the routine
from intel_display.c. This then make intel_fbdev symmetric in its use of
the common intel_framebuffer routines to initialise and clean up the
struct intel_framebuffer. (And new features need only be added in one
location!)

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 350ec881

drivers/gpu/drm/i915/intel_display.c

+7 −3
Original line number Diff line number Diff line
@@ -9402,13 +9402,17 @@ static void intel_setup_outputs(struct drm_device *dev) 
	drm_helper_move_panel_connectors_to_head(dev);

}



void intel_framebuffer_fini(struct intel_framebuffer *fb)

{

	drm_framebuffer_cleanup(&fb->base);

	drm_gem_object_unreference_unlocked(&fb->obj->base);

}



static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)

{

	struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);



	drm_framebuffer_cleanup(fb);

	drm_gem_object_unreference_unlocked(&intel_fb->obj->base);



	intel_framebuffer_fini(intel_fb);

	kfree(intel_fb);

}

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ extern int intel_framebuffer_init(struct drm_device *dev, 
				  struct intel_framebuffer *ifb,

				  struct drm_mode_fb_cmd2 *mode_cmd,

				  struct drm_i915_gem_object *obj);

extern void intel_framebuffer_fini(struct intel_framebuffer *fb);

extern int intel_fbdev_init(struct drm_device *dev);

extern void intel_fbdev_initial_config(struct drm_device *dev);

extern void intel_fbdev_fini(struct drm_device *dev);

drivers/gpu/drm/i915/intel_fb.c

+5 −10
Original line number Diff line number Diff line
@@ -193,26 +193,21 @@ static struct drm_fb_helper_funcs intel_fb_helper_funcs = { 
static void intel_fbdev_destroy(struct drm_device *dev,

				struct intel_fbdev *ifbdev)

{

	struct fb_info *info;

	struct intel_framebuffer *ifb = &ifbdev->ifb;



	if (ifbdev->helper.fbdev) {

		info = ifbdev->helper.fbdev;

		struct fb_info *info = ifbdev->helper.fbdev;



		unregister_framebuffer(info);

		iounmap(info->screen_base);

		if (info->cmap.len)

			fb_dealloc_cmap(&info->cmap);



		framebuffer_release(info);

	}



	drm_fb_helper_fini(&ifbdev->helper);



	drm_framebuffer_unregister_private(&ifb->base);

	drm_framebuffer_cleanup(&ifb->base);

	if (ifb->obj) {

		drm_gem_object_unreference_unlocked(&ifb->obj->base);

		ifb->obj = NULL;

	}

	drm_framebuffer_unregister_private(&ifbdev->ifb.base);

	intel_framebuffer_fini(&ifbdev->ifb);

}



int intel_fbdev_init(struct drm_device *dev)