Commit e5e43d33 authored by Nirmoy Das's avatar Nirmoy Das Committed by Andi Shyti

drm/i915/display: Pass drm_i915_private as param to i915 funcs

For i915 functions pass struct drm_i915_private directly instead of
struct drm_device.

v2: Use to_i915(dev) directly without alias(Andrzej).

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Suggested-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230125095603.17845-1-nirmoy.das@intel.com
parent 7ee6f99d
...@@ -9051,7 +9051,7 @@ void intel_display_driver_register(struct drm_i915_private *i915) ...@@ -9051,7 +9051,7 @@ void intel_display_driver_register(struct drm_i915_private *i915)
* enabled. We do it last so that the async config cannot run * enabled. We do it last so that the async config cannot run
* before the connectors are registered. * before the connectors are registered.
*/ */
intel_fbdev_initial_config_async(&i915->drm); intel_fbdev_initial_config_async(i915);
/* /*
* We need to coordinate the hotplugs with the asynchronous * We need to coordinate the hotplugs with the asynchronous
......
...@@ -559,9 +559,9 @@ static void intel_fbdev_initial_config(void *data, async_cookie_t cookie) ...@@ -559,9 +559,9 @@ static void intel_fbdev_initial_config(void *data, async_cookie_t cookie)
intel_fbdev_unregister(to_i915(ifbdev->helper.dev)); intel_fbdev_unregister(to_i915(ifbdev->helper.dev));
} }
void intel_fbdev_initial_config_async(struct drm_device *dev) void intel_fbdev_initial_config_async(struct drm_i915_private *dev_priv)
{ {
struct intel_fbdev *ifbdev = to_i915(dev)->display.fbdev.fbdev; struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev;
if (!ifbdev) if (!ifbdev)
return; return;
...@@ -698,9 +698,9 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev) ...@@ -698,9 +698,9 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
drm_fb_helper_hotplug_event(&ifbdev->helper); drm_fb_helper_hotplug_event(&ifbdev->helper);
} }
void intel_fbdev_restore_mode(struct drm_device *dev) void intel_fbdev_restore_mode(struct drm_i915_private *dev_priv)
{ {
struct intel_fbdev *ifbdev = to_i915(dev)->display.fbdev.fbdev; struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev;
if (!ifbdev) if (!ifbdev)
return; return;
......
...@@ -15,12 +15,12 @@ struct intel_framebuffer; ...@@ -15,12 +15,12 @@ struct intel_framebuffer;
#ifdef CONFIG_DRM_FBDEV_EMULATION #ifdef CONFIG_DRM_FBDEV_EMULATION
int intel_fbdev_init(struct drm_device *dev); int intel_fbdev_init(struct drm_device *dev);
void intel_fbdev_initial_config_async(struct drm_device *dev); void intel_fbdev_initial_config_async(struct drm_i915_private *dev_priv);
void intel_fbdev_unregister(struct drm_i915_private *dev_priv); void intel_fbdev_unregister(struct drm_i915_private *dev_priv);
void intel_fbdev_fini(struct drm_i915_private *dev_priv); void intel_fbdev_fini(struct drm_i915_private *dev_priv);
void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous); void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous);
void intel_fbdev_output_poll_changed(struct drm_device *dev); void intel_fbdev_output_poll_changed(struct drm_device *dev);
void intel_fbdev_restore_mode(struct drm_device *dev); void intel_fbdev_restore_mode(struct drm_i915_private *dev_priv);
struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev); struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev);
#else #else
static inline int intel_fbdev_init(struct drm_device *dev) static inline int intel_fbdev_init(struct drm_device *dev)
...@@ -28,7 +28,7 @@ static inline int intel_fbdev_init(struct drm_device *dev) ...@@ -28,7 +28,7 @@ static inline int intel_fbdev_init(struct drm_device *dev)
return 0; return 0;
} }
static inline void intel_fbdev_initial_config_async(struct drm_device *dev) static inline void intel_fbdev_initial_config_async(struct drm_i915_private *dev_priv)
{ {
} }
...@@ -48,7 +48,7 @@ static inline void intel_fbdev_output_poll_changed(struct drm_device *dev) ...@@ -48,7 +48,7 @@ static inline void intel_fbdev_output_poll_changed(struct drm_device *dev)
{ {
} }
static inline void intel_fbdev_restore_mode(struct drm_device *dev) static inline void intel_fbdev_restore_mode(struct drm_i915_private *i915)
{ {
} }
static inline struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev) static inline struct intel_framebuffer *intel_fbdev_framebuffer(struct intel_fbdev *fbdev)
......
...@@ -940,7 +940,7 @@ static void i915_driver_lastclose(struct drm_device *dev) ...@@ -940,7 +940,7 @@ static void i915_driver_lastclose(struct drm_device *dev)
{ {
struct drm_i915_private *i915 = to_i915(dev); struct drm_i915_private *i915 = to_i915(dev);
intel_fbdev_restore_mode(dev); intel_fbdev_restore_mode(i915);
if (HAS_DISPLAY(i915)) if (HAS_DISPLAY(i915))
vga_switcheroo_process_delayed_switch(); vga_switcheroo_process_delayed_switch();
......
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