[src/trunk]: src/sys/external/bsd/drm2/radeon Remove temporary drm_fb_helper_...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/55e1dbd3480a
branches:  trunk
changeset: 992854:55e1dbd3480a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 13:36:13 2018 +0000

description:
Remove temporary drm_fb_helper_set_config stub from old code.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_fb_helper.c         |  15 ++-------------
 sys/external/bsd/drm2/dist/include/drm/drm_fb_helper.h |   8 +++-----
 sys/external/bsd/drm2/drm/drmfb.c                      |   7 ++++---
 sys/external/bsd/drm2/radeon/radeondrmkmsfb.c          |  10 +++++-----
 4 files changed, 14 insertions(+), 26 deletions(-)

diffs (129 lines):

diff -r b2e1bfe5b379 -r 55e1dbd3480a sys/external/bsd/drm2/dist/drm/drm_fb_helper.c
--- a/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c    Mon Aug 27 13:35:55 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c    Mon Aug 27 13:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_fb_helper.c,v 1.10 2018/08/27 07:54:41 riastradh Exp $     */
+/*     $NetBSD: drm_fb_helper.c,v 1.11 2018/08/27 13:36:13 riastradh Exp $     */
 
 /*
  * Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
  *      Jesse Barnes <jesse.barnes%intel.com@localhost>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.10 2018/08/27 07:54:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.11 2018/08/27 13:36:13 riastradh Exp $");
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
@@ -1262,18 +1262,7 @@
        return 0;
 }
 EXPORT_SYMBOL(drm_fb_helper_set_par);
-#endif
 
-/* XXX Temporary -- just use drm_fb_helper_restore_fbdev_mode_unlocked.  */
-int
-drm_fb_helper_set_config(struct drm_fb_helper *fb_helper)
-{
-
-       drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper);
-       return 0;
-}
-
-#ifndef __NetBSD__             /* XXX fb info */
 static int pan_display_atomic(struct fb_var_screeninfo *var,
                              struct fb_info *info)
 {
diff -r b2e1bfe5b379 -r 55e1dbd3480a sys/external/bsd/drm2/dist/include/drm/drm_fb_helper.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_fb_helper.h    Mon Aug 27 13:35:55 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_fb_helper.h    Mon Aug 27 13:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_fb_helper.h,v 1.7 2018/08/27 04:58:37 riastradh Exp $      */
+/*     $NetBSD: drm_fb_helper.h,v 1.8 2018/08/27 13:36:14 riastradh Exp $      */
 
 /*
  * Copyright (c) 2006-2009 Red Hat Inc.
@@ -164,9 +164,7 @@
                       struct drm_fb_helper *helper, int crtc_count,
                       int max_conn);
 void drm_fb_helper_fini(struct drm_fb_helper *helper);
-#ifdef __NetBSD__              /* XXX fb info */
-int drm_fb_helper_set_config(struct drm_fb_helper *);
-#else
+#ifndef __NetBSD__             /* XXX fb info */
 int drm_fb_helper_blank(int blank, struct fb_info *info);
 int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
                              struct fb_info *info);
@@ -176,8 +174,8 @@
 #endif
 
 int drm_fb_helper_restore_fbdev_mode_unlocked(struct drm_fb_helper *fb_helper);
+
 #ifndef __NetBSD__             /* XXX fb info */
-
 struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper);
 void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper);
 void drm_fb_helper_release_fbi(struct drm_fb_helper *fb_helper);
diff -r b2e1bfe5b379 -r 55e1dbd3480a sys/external/bsd/drm2/drm/drmfb.c
--- a/sys/external/bsd/drm2/drm/drmfb.c Mon Aug 27 13:35:55 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drmfb.c Mon Aug 27 13:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmfb.c,v 1.3 2016/12/12 19:45:56 maya Exp $   */
+/*     $NetBSD: drmfb.c,v 1.4 2018/08/27 13:36:14 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.3 2016/12/12 19:45:56 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.4 2018/08/27 13:36:14 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -280,9 +280,10 @@
 {
        struct drmfb_softc *sc = container_of(genfb, struct drmfb_softc,
            sc_genfb);
+       struct drm_fb_helper *fb_helper = sc->sc_da.da_fb_helper;
 
        if (mode == WSDISPLAYIO_MODE_EMUL)
-               drm_fb_helper_set_config(sc->sc_da.da_fb_helper);
+               drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper);
 
        return true;
 }
diff -r b2e1bfe5b379 -r 55e1dbd3480a sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
--- a/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c     Mon Aug 27 13:35:55 2018 +0000
+++ b/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c     Mon Aug 27 13:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeondrmkmsfb.c,v 1.7 2017/01/20 12:25:07 maya Exp $  */
+/*     $NetBSD: radeondrmkmsfb.c,v 1.8 2018/08/27 13:36:14 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.7 2017/01/20 12:25:07 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.8 2018/08/27 13:36:14 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -367,10 +367,10 @@
 radeonfb_genfb_setmode(struct genfb_softc *genfb, int mode)
 {
        struct radeonfb_softc *sc = (struct radeonfb_softc *)genfb;
+       struct drm_fb_helper *fb_helper = sc->sc_rfa.rfa_fb_helper;
 
-       if (mode == WSDISPLAYIO_MODE_EMUL) {
-               drm_fb_helper_set_config(sc->sc_rfa.rfa_fb_helper);
-       }
+       if (mode == WSDISPLAYIO_MODE_EMUL)
+               drm_fb_helper_restore_fbdev_mode_unlocked(fb_helper);
 
        return true;
 }