mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
350ec881d9
commit
ddfe15677d
3 changed files with 13 additions and 13 deletions
|
@ -9402,13 +9402,17 @@ static void intel_setup_outputs(struct drm_device *dev)
|
||||||
drm_helper_move_panel_connectors_to_head(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)
|
static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
|
||||||
{
|
{
|
||||||
struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
|
struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
|
||||||
|
|
||||||
drm_framebuffer_cleanup(fb);
|
intel_framebuffer_fini(intel_fb);
|
||||||
drm_gem_object_unreference_unlocked(&intel_fb->obj->base);
|
|
||||||
|
|
||||||
kfree(intel_fb);
|
kfree(intel_fb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -720,6 +720,7 @@ extern int intel_framebuffer_init(struct drm_device *dev,
|
||||||
struct intel_framebuffer *ifb,
|
struct intel_framebuffer *ifb,
|
||||||
struct drm_mode_fb_cmd2 *mode_cmd,
|
struct drm_mode_fb_cmd2 *mode_cmd,
|
||||||
struct drm_i915_gem_object *obj);
|
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 int intel_fbdev_init(struct drm_device *dev);
|
||||||
extern void intel_fbdev_initial_config(struct drm_device *dev);
|
extern void intel_fbdev_initial_config(struct drm_device *dev);
|
||||||
extern void intel_fbdev_fini(struct drm_device *dev);
|
extern void intel_fbdev_fini(struct drm_device *dev);
|
||||||
|
|
|
@ -193,26 +193,21 @@ static struct drm_fb_helper_funcs intel_fb_helper_funcs = {
|
||||||
static void intel_fbdev_destroy(struct drm_device *dev,
|
static void intel_fbdev_destroy(struct drm_device *dev,
|
||||||
struct intel_fbdev *ifbdev)
|
struct intel_fbdev *ifbdev)
|
||||||
{
|
{
|
||||||
struct fb_info *info;
|
|
||||||
struct intel_framebuffer *ifb = &ifbdev->ifb;
|
|
||||||
|
|
||||||
if (ifbdev->helper.fbdev) {
|
if (ifbdev->helper.fbdev) {
|
||||||
info = ifbdev->helper.fbdev;
|
struct fb_info *info = ifbdev->helper.fbdev;
|
||||||
|
|
||||||
unregister_framebuffer(info);
|
unregister_framebuffer(info);
|
||||||
iounmap(info->screen_base);
|
iounmap(info->screen_base);
|
||||||
if (info->cmap.len)
|
if (info->cmap.len)
|
||||||
fb_dealloc_cmap(&info->cmap);
|
fb_dealloc_cmap(&info->cmap);
|
||||||
|
|
||||||
framebuffer_release(info);
|
framebuffer_release(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
drm_fb_helper_fini(&ifbdev->helper);
|
drm_fb_helper_fini(&ifbdev->helper);
|
||||||
|
|
||||||
drm_framebuffer_unregister_private(&ifb->base);
|
drm_framebuffer_unregister_private(&ifbdev->ifb.base);
|
||||||
drm_framebuffer_cleanup(&ifb->base);
|
intel_framebuffer_fini(&ifbdev->ifb);
|
||||||
if (ifb->obj) {
|
|
||||||
drm_gem_object_unreference_unlocked(&ifb->obj->base);
|
|
||||||
ifb->obj = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int intel_fbdev_init(struct drm_device *dev)
|
int intel_fbdev_init(struct drm_device *dev)
|
||||||
|
|
Loading…
Reference in a new issue