From: "Das, Nirmoy" <nirmoy.das@linux.intel.com>
To: Andrzej Hajda <andrzej.hajda@intel.com>,
Nirmoy Das <nirmoy.das@intel.com>,
intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
Date: Wed, 25 Jan 2023 10:55:30 +0100 [thread overview]
Message-ID: <edbebc62-2ebd-5519-9b18-b1f282b98e56@linux.intel.com> (raw)
In-Reply-To: <f1440b52-55bf-42e1-0015-7c831b945694@intel.com>
On 1/25/2023 8:50 AM, Andrzej Hajda wrote:
> On 24.01.2023 15:17, Nirmoy Das wrote:
>> For i915 functions pass struct drm_i915_private directly instead of
>> struct drm_device.
>>
>> 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>
>> ---
>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>> drivers/gpu/drm/i915/display/intel_fbdev.c | 8 ++++----
>> drivers/gpu/drm/i915/display/intel_fbdev.h | 8 ++++----
>> drivers/gpu/drm/i915/i915_driver.c | 4 +++-
>> 4 files changed, 12 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
>> b/drivers/gpu/drm/i915/display/intel_display.c
>> index e37cca6b18c6..b014d8626ef7 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -9004,7 +9004,7 @@ void intel_display_driver_register(struct
>> drm_i915_private *i915)
>> * enabled. We do it last so that the async config cannot run
>> * 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
>> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c
>> b/drivers/gpu/drm/i915/display/intel_fbdev.c
>> index 19f3b5d92a55..c2c52f8e5887 100644
>> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
>> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
>> @@ -547,9 +547,9 @@ static void intel_fbdev_initial_config(void
>> *data, async_cookie_t cookie)
>> 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)
>> return;
>> @@ -686,9 +686,9 @@ void intel_fbdev_output_poll_changed(struct
>> drm_device *dev)
>> 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)
>> return;
>> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.h
>> b/drivers/gpu/drm/i915/display/intel_fbdev.h
>> index 0e95e9472fa3..04fd523a5023 100644
>> --- a/drivers/gpu/drm/i915/display/intel_fbdev.h
>> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.h
>> @@ -15,12 +15,12 @@ struct intel_framebuffer;
>> #ifdef CONFIG_DRM_FBDEV_EMULATION
>> 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_fini(struct drm_i915_private *dev_priv);
>> 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_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);
>> #else
>> 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;
>> }
>> -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)
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c
>> b/drivers/gpu/drm/i915/i915_driver.c
>> index 6469c7c1e154..cd6069c1762d 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1071,7 +1071,9 @@ static int i915_driver_open(struct drm_device
>> *dev, struct drm_file *file)
>> */
>> static void i915_driver_lastclose(struct drm_device *dev)
>> {
>> - intel_fbdev_restore_mode(dev);
>> + struct drm_i915_private *i915 = to_i915(dev);
>> +
>> + intel_fbdev_restore_mode(i915);
>
> You could use to_i915(dev) without alias.
Makes sense, I will resend.
Nirmoy
>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
>
> Regards
> Andrzej
>
>> vga_switcheroo_process_delayed_switch();
>> }
>
next prev parent reply other threads:[~2023-01-25 9:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 14:17 [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs Nirmoy Das
2023-01-24 20:23 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Pass drm_i915_private as param to i915 funcs (rev2) Patchwork
2023-01-24 23:10 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2023-01-25 7:50 ` [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs Andrzej Hajda
2023-01-25 9:55 ` Das, Nirmoy [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-19 9:58 Nirmoy Das
2023-01-19 10:58 ` Jani Nikula
2023-01-19 11:08 ` Das, Nirmoy
2023-02-10 12:21 ` Andi Shyti
2023-02-10 12:27 ` Das, Nirmoy
2023-01-19 14:06 ` Andrzej Hajda
2023-01-19 15:15 ` Das, Nirmoy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=edbebc62-2ebd-5519-9b18-b1f282b98e56@linux.intel.com \
--to=nirmoy.das@linux.intel.com \
--cc=andrzej.hajda@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=nirmoy.das@intel.com \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.