summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2013-08-06 15:07:45 +1000
committerJonathan Gray <jsg@jsg.id.au>2013-08-12 10:47:22 +1000
commitf95c00988380463a3fc04d4a7b2a80064ca3bd7d (patch)
tree3e6299b9ac945b576aa7aa1ec6cf3b8820aae2b2
parent97a853dadd0b10970f1ffddcd3eabe5acb971d8a (diff)
unstub drm_fb_helper_debug_enter/drm_fb_helper_debug_leave
-rw-r--r--sys/dev/pci/drm/drm_fb_helper.c10
-rw-r--r--sys/dev/pci/drm/drm_fb_helper.h4
2 files changed, 4 insertions, 10 deletions
diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c
index 10758d51af2..121326390ed 100644
--- a/sys/dev/pci/drm/drm_fb_helper.c
+++ b/sys/dev/pci/drm/drm_fb_helper.c
@@ -190,11 +190,9 @@ drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc)
crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);
}
-#if 0
int
-drm_fb_helper_debug_enter(struct fb_info *info)
+drm_fb_helper_debug_enter(struct drm_fb_helper *helper)
{
- struct drm_fb_helper *helper = info->par;
struct drm_crtc_helper_funcs *funcs;
int i;
@@ -222,7 +220,6 @@ drm_fb_helper_debug_enter(struct fb_info *info)
return 0;
}
EXPORT_SYMBOL(drm_fb_helper_debug_enter);
-#endif
/* Find the real fb for a given fb helper CRTC */
struct drm_framebuffer *
@@ -239,11 +236,9 @@ drm_mode_config_fb(struct drm_crtc *crtc)
return NULL;
}
-#if 0
int
-drm_fb_helper_debug_leave(struct fb_info *info)
+drm_fb_helper_debug_leave(struct drm_fb_helper *helper)
{
- struct drm_fb_helper *helper = info->par;
struct drm_crtc *crtc;
struct drm_crtc_helper_funcs *funcs;
struct drm_framebuffer *fb;
@@ -271,7 +266,6 @@ drm_fb_helper_debug_leave(struct fb_info *info)
return 0;
}
EXPORT_SYMBOL(drm_fb_helper_debug_leave);
-#endif
bool
drm_fb_helper_restore_fbdev_mode(struct drm_fb_helper *fb_helper)
diff --git a/sys/dev/pci/drm/drm_fb_helper.h b/sys/dev/pci/drm/drm_fb_helper.h
index 52db932b26c..9cda94a8491 100644
--- a/sys/dev/pci/drm/drm_fb_helper.h
+++ b/sys/dev/pci/drm/drm_fb_helper.h
@@ -116,8 +116,8 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info);
int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper);
bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel);
int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper);
-int drm_fb_helper_debug_enter(struct fb_info *info);
-int drm_fb_helper_debug_leave(struct fb_info *info);
+int drm_fb_helper_debug_enter(struct drm_fb_helper *);
+int drm_fb_helper_debug_leave(struct drm_fb_helper *);
void drm_fb_helper_dpms(struct drm_fb_helper *fb_helper, int dpms_mode);