Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Ifdef out some ...
details: https://anonhg.NetBSD.org/src/rev/665bbda5c156
branches: riastradh-drm2
changeset: 788305:665bbda5c156
user: riastradh <riastradh%NetBSD.org@localhost>
date: Wed Jul 24 03:09:58 2013 +0000
description:
Ifdef out some Linux framebuffer stuff in i915.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/intel_drv.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (40 lines):
diff -r cc09a9f0e091 -r 665bbda5c156 sys/external/bsd/drm2/dist/drm/i915/intel_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h Wed Jul 24 03:09:42 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_drv.h Wed Jul 24 03:09:58 2013 +0000
@@ -30,7 +30,9 @@
#include "i915_drv.h"
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
+#ifndef __NetBSD__
#include <drm/drm_fb_helper.h>
+#endif
#include <drm/drm_dp_helper.h>
#define _wait_for(COND, MS, W) ({ \
@@ -129,12 +131,14 @@
struct drm_i915_gem_object *obj;
};
+#ifndef __NetBSD__ /* XXX fb */
struct intel_fbdev {
struct drm_fb_helper helper;
struct intel_framebuffer ifb;
struct list_head fbdev_list;
struct drm_display_mode *our_mode;
};
+#endif
struct intel_encoder {
struct drm_encoder base;
@@ -588,9 +592,11 @@
struct intel_framebuffer *ifb,
struct drm_mode_fb_cmd2 *mode_cmd,
struct drm_i915_gem_object *obj);
+#ifndef __NetBSD__ /* XXX fb */
extern int intel_fbdev_init(struct drm_device *dev);
extern void intel_fbdev_fini(struct drm_device *dev);
extern void intel_fbdev_set_suspend(struct drm_device *dev, int state);
+#endif
extern void intel_prepare_page_flip(struct drm_device *dev, int plane);
extern void intel_finish_page_flip(struct drm_device *dev, int pipe);
extern void intel_finish_page_flip_plane(struct drm_device *dev, int plane);
Home |
Main Index |
Thread Index |
Old Index