diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-24 08:29:45 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-06-24 08:29:45 +0200 |
| commit | 10bb667223f3d4e9c4eb53595f9d7f67a1018952 (patch) | |
| tree | eabb532439ac57e05d07d36f7432208e0782fde4 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 64989ca4b27acb026b6496ec21e43bee66f86a5b (diff) | |
| parent | 2a3467063ae3b17264578626dec2377dd48cd1c3 (diff) | |
| download | lwn-10bb667223f3d4e9c4eb53595f9d7f67a1018952.tar.gz lwn-10bb667223f3d4e9c4eb53595f9d7f67a1018952.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next for the reworked device register/unregistering.
Chris Wilson needs that to be able to land his i915 load/unload
demidlayering.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index b6c8ce484011..74d0a61de75a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -47,6 +47,7 @@ #include <drm/intel-gtt.h> #include <drm/drm_legacy.h> /* for struct drm_dma_handle */ #include <drm/drm_gem.h> +#include <drm/drm_auth.h> #include "i915_params.h" #include "i915_reg.h" @@ -3728,7 +3729,7 @@ extern void intel_modeset_init_hw(struct drm_device *dev); extern void intel_modeset_init(struct drm_device *dev); extern void intel_modeset_gem_init(struct drm_device *dev); extern void intel_modeset_cleanup(struct drm_device *dev); -extern void intel_connector_unregister(struct intel_connector *); +extern void intel_connector_unregister(struct drm_connector *); extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); extern void intel_display_resume(struct drm_device *dev); extern void i915_redisable_vga(struct drm_device *dev); |