Commit 6315b5d3 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: dev_priv cleanup in intel_display.c

v2: Rebase.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 175fded1
...@@ -495,7 +495,7 @@ static unsigned int i915_vga_set_decode(void *cookie, bool state) ...@@ -495,7 +495,7 @@ static unsigned int i915_vga_set_decode(void *cookie, bool state)
{ {
struct drm_device *dev = cookie; struct drm_device *dev = cookie;
intel_modeset_vga_set_state(dev, state); intel_modeset_vga_set_state(to_i915(dev), state);
if (state) if (state)
return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM | return VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM |
VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM; VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM;
......
...@@ -3481,7 +3481,8 @@ extern void intel_modeset_gem_init(struct drm_device *dev); ...@@ -3481,7 +3481,8 @@ extern void intel_modeset_gem_init(struct drm_device *dev);
extern void intel_modeset_cleanup(struct drm_device *dev); extern void intel_modeset_cleanup(struct drm_device *dev);
extern int intel_connector_register(struct drm_connector *); extern int intel_connector_register(struct drm_connector *);
extern void intel_connector_unregister(struct drm_connector *); extern void intel_connector_unregister(struct drm_connector *);
extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); extern int intel_modeset_vga_set_state(struct drm_i915_private *dev_priv,
bool state);
extern void intel_display_resume(struct drm_device *dev); extern void intel_display_resume(struct drm_device *dev);
extern void i915_redisable_vga(struct drm_i915_private *dev_priv); extern void i915_redisable_vga(struct drm_i915_private *dev_priv);
extern void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv); extern void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment