Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Ifdef out linux fb api s...



details:   https://anonhg.NetBSD.org/src/rev/aed479754c19
branches:  trunk
changeset: 366129:aed479754c19
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:55:39 2018 +0000

description:
Ifdef out linux fb api stuff.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 530e04dc6130 -r aed479754c19 sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Mon Aug 27 07:55:28 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_fbdev.c Mon Aug 27 07:55:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_fbdev.c,v 1.8 2018/08/27 07:55:28 riastradh Exp $        */
+/*     $NetBSD: intel_fbdev.c,v 1.9 2018/08/27 07:55:39 riastradh Exp $        */
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.8 2018/08/27 07:55:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_fbdev.c,v 1.9 2018/08/27 07:55:39 riastradh Exp $");
 
 #include <linux/async.h>
 #include <linux/module.h>
@@ -327,8 +327,10 @@
 #endif
        return 0;
 
+#ifndef __NetBSD__
 out_destroy_fbi:
        drm_fb_helper_release_fbi(helper);
+#endif
 out_unpin:
        i915_gem_object_ggtt_unpin(obj);
        drm_gem_object_unreference(&obj->base);



Home | Main Index | Thread Index | Old Index