iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230125095603.17845-1-nirmoy.das@intel.com
This commit is contained in:
Nirmoy Das 2023-01-25 10:56:03 +01:00 committed by Andi Shyti
parent 7ee6f99dbc
commit e5e43d3363
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_display.c
View File

@ -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

8
drivers/gpu/drm/i915/display/intel_fbdev.c
View File

@ -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)
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;

8
drivers/gpu/drm/i915/display/intel_fbdev.h
View File

@ -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)
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)
{ {
} }
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)

2
drivers/gpu/drm/i915/i915_driver.c
View File

@ -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();