diff options
| author |  Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-07-29 20:49:36 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch>
| 2014-07-29 20:49:36 +0200 |
| commit | 4dac3edfe68e5e1b3c2216b84ba160572420fa40 (patch) | |
| tree | 924c0d117dbcc6d374eea603ed64e627b35b043b /include/drm/drm_of.h | |
| parent | drm/i915/userptr: Keep spin_lock/unlock in the same block (diff) | |
| parent | drm/i915: fix initial fbdev setup warnings (diff) | |
| download | linux-4dac3edfe68e5e1b3c2216b84ba160572420fa40.tar.gz linux-4dac3edfe68e5e1b3c2216b84ba160572420fa40.tar.bz2 linux-4dac3edfe68e5e1b3c2216b84ba160572420fa40.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
Pull in drm-next with Dave's DP MST support so that I can merge some
conflicting patches which also touch the driver load sequencing around
interrupt handling.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm/drm_of.h')
| -rw-r--r-- | include/drm/drm_of.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h new file mode 100644 index 000000000000..2441f7112074 --- /dev/null +++ b/include/drm/drm_of.h @@ -0,0 +1,18 @@ +#ifndef __DRM_OF_H__ +#define __DRM_OF_H__ + +struct drm_device; +struct device_node; + +#ifdef CONFIG_OF +extern uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, + struct device_node *port); +#else +static inline uint32_t drm_of_find_possible_crtcs(struct drm_device *dev, + struct device_node *port) +{ + return 0; +} +#endif + +#endif /* __DRM_OF_H__ */ |