|
@@ -643,7 +643,6 @@ out:
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
-#if IS_ENABLED(CONFIG_FB)
|
|
|
|
static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
|
|
static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
|
|
{
|
|
{
|
|
struct apertures_struct *ap;
|
|
struct apertures_struct *ap;
|
|
@@ -668,12 +667,6 @@ static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
-#else
|
|
|
|
-static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
|
|
|
|
-{
|
|
|
|
- return 0;
|
|
|
|
-}
|
|
|
|
-#endif
|
|
|
|
|
|
|
|
#if !defined(CONFIG_VGA_CONSOLE)
|
|
#if !defined(CONFIG_VGA_CONSOLE)
|
|
static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
|
|
static int i915_kick_out_vgacon(struct drm_i915_private *dev_priv)
|