* [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
@ 2023-01-19 9:58 Nirmoy Das
2023-01-19 10:58 ` Jani Nikula
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Nirmoy Das @ 2023-01-19 9:58 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi, Nirmoy Das
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>
---
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 c38a54efedbe..7584f65c6a7e 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8999,7 +8999,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);
vga_switcheroo_process_delayed_switch();
}
--
2.39.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-19 9:58 [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs Nirmoy Das
@ 2023-01-19 10:58 ` Jani Nikula
2023-01-19 11:08 ` Das, Nirmoy
2023-02-10 12:21 ` Andi Shyti
2023-01-19 12:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (2 subsequent siblings)
3 siblings, 2 replies; 12+ messages in thread
From: Jani Nikula @ 2023-01-19 10:58 UTC (permalink / raw)
To: Nirmoy Das, intel-gfx; +Cc: Rodrigo Vivi, Nirmoy Das
On Thu, 19 Jan 2023, Nirmoy Das <nirmoy.das@intel.com> wrote:
> For i915 functions pass struct drm_i915_private directly instead of
> struct drm_device.
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
but maybe let's wait until we've synced up with drm-misc-next to avoid
the unnecessary conflict in drm-tip and linux-next?
>
> 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>
> ---
> 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 c38a54efedbe..7584f65c6a7e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -8999,7 +8999,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);
>
> vga_switcheroo_process_delayed_switch();
> }
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-19 10:58 ` Jani Nikula
@ 2023-01-19 11:08 ` Das, Nirmoy
2023-02-10 12:21 ` Andi Shyti
1 sibling, 0 replies; 12+ messages in thread
From: Das, Nirmoy @ 2023-01-19 11:08 UTC (permalink / raw)
To: Jani Nikula, Nirmoy Das, intel-gfx; +Cc: Rodrigo Vivi
On 1/19/2023 11:58 AM, Jani Nikula wrote:
> On Thu, 19 Jan 2023, Nirmoy Das <nirmoy.das@intel.com> wrote:
>> For i915 functions pass struct drm_i915_private directly instead of
>> struct drm_device.
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> but maybe let's wait until we've synced up with drm-misc-next to avoid
> the unnecessary conflict in drm-tip and linux-next?
Yes, makes sense, let's wait a bit. Thanks for reviewing,
Nirmoy
>
>
>> 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>
>> ---
>> 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 c38a54efedbe..7584f65c6a7e 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -8999,7 +8999,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);
>>
>> vga_switcheroo_process_delayed_switch();
>> }
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-19 9:58 [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs Nirmoy Das
2023-01-19 10:58 ` Jani Nikula
@ 2023-01-19 12:19 ` Patchwork
2023-01-19 14:06 ` [Intel-gfx] [PATCH] " Andrzej Hajda
2023-01-20 11:37 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2023-01-19 12:19 UTC (permalink / raw)
To: Nirmoy Das; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 7942 bytes --]
== Series Details ==
Series: drm/i915/display: Pass drm_i915_private as param to i915 funcs
URL : https://patchwork.freedesktop.org/series/113083/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12610 -> Patchwork_113083v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/index.html
Participating hosts (36 -> 35)
------------------------------
Additional (1): fi-adl-ddr5
Missing (2): fi-bsw-kefka fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_113083v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- fi-adl-ddr5: NOTRUN -> [SKIP][1] ([i915#7456])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@debugfs_test@basic-hwmon.html
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-adl-ddr5: NOTRUN -> [SKIP][2] ([i915#4613]) +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@gem_tiled_pread_basic:
- fi-adl-ddr5: NOTRUN -> [SKIP][3] ([i915#3282])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- fi-adl-ddr5: NOTRUN -> [SKIP][4] ([i915#7561])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_selftest@live@execlists:
- fi-bsw-n3050: [PASS][5] -> [INCOMPLETE][6] ([i915#6972])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
- fi-bsw-nick: [PASS][7] -> [INCOMPLETE][8] ([i915#6972])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [PASS][9] -> [DMESG-FAIL][10] ([i915#5334])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hangcheck:
- fi-adl-ddr5: NOTRUN -> [DMESG-WARN][11] ([i915#5591])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@i915_selftest@live@hangcheck.html
* igt@kms_chamelium_edid@hdmi-edid-read:
- fi-adl-ddr5: NOTRUN -> [SKIP][12] ([i915#7828]) +8 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@kms_chamelium_edid@hdmi-edid-read.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-adl-ddr5: NOTRUN -> [SKIP][13] ([i915#4103])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-adl-ddr5: NOTRUN -> [SKIP][14] ([fdo#109285])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_psr@cursor_plane_move:
- fi-adl-ddr5: NOTRUN -> [SKIP][15] ([i915#1072]) +3 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@kms_psr@cursor_plane_move.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-adl-ddr5: NOTRUN -> [SKIP][16] ([i915#3555])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-userptr:
- fi-adl-ddr5: NOTRUN -> [SKIP][17] ([fdo#109295] / [i915#3301])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@prime_vgem@basic-userptr.html
* igt@prime_vgem@basic-write:
- fi-adl-ddr5: NOTRUN -> [SKIP][18] ([fdo#109295] / [i915#3291]) +2 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-adl-ddr5/igt@prime_vgem@basic-write.html
* igt@runner@aborted:
- fi-bsw-n3050: NOTRUN -> [FAIL][19] ([fdo#109271] / [i915#4312])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-bsw-n3050/igt@runner@aborted.html
- fi-bsw-nick: NOTRUN -> [FAIL][20] ([fdo#109271] / [i915#4312])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-bsw-nick/igt@runner@aborted.html
#### Possible fixes ####
* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [FAIL][21] ([i915#7229]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
* igt@i915_selftest@live@requests:
- {bat-rpls-1}: [INCOMPLETE][23] ([i915#6257]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/bat-rpls-1/igt@i915_selftest@live@requests.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/bat-rpls-1/igt@i915_selftest@live@requests.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6972]: https://gitlab.freedesktop.org/drm/intel/issues/6972
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
Build changes
-------------
* Linux: CI_DRM_12610 -> Patchwork_113083v1
CI-20190529: 20190529
CI_DRM_12610: db241d6cbe142a97152a55097c91036355c41002 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7126: 3aa9364a1e478010aba0d3dfe9183486560ecc60 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113083v1: db241d6cbe142a97152a55097c91036355c41002 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
b81331c640f0 drm/i915/display: Pass drm_i915_private as param to i915 funcs
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/index.html
[-- Attachment #2: Type: text/html, Size: 9017 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-19 9:58 [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs Nirmoy Das
2023-01-19 10:58 ` Jani Nikula
2023-01-19 12:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2023-01-19 14:06 ` Andrzej Hajda
2023-01-19 15:15 ` Das, Nirmoy
2023-01-20 11:37 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
3 siblings, 1 reply; 12+ messages in thread
From: Andrzej Hajda @ 2023-01-19 14:06 UTC (permalink / raw)
To: Nirmoy Das, intel-gfx; +Cc: Rodrigo Vivi
On 19.01.2023 10:58, 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>
It could be good start for boring refactoring :) of similar cases, for
example:
intel_fbdev_restore_mode
intel_fbdev_set_suspend
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Regards
Andrzej
> ---
> 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 c38a54efedbe..7584f65c6a7e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -8999,7 +8999,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);
>
> vga_switcheroo_process_delayed_switch();
> }
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-19 14:06 ` [Intel-gfx] [PATCH] " Andrzej Hajda
@ 2023-01-19 15:15 ` Das, Nirmoy
0 siblings, 0 replies; 12+ messages in thread
From: Das, Nirmoy @ 2023-01-19 15:15 UTC (permalink / raw)
To: Andrzej Hajda, Nirmoy Das, intel-gfx; +Cc: Rodrigo Vivi
On 1/19/2023 3:06 PM, Andrzej Hajda wrote:
> On 19.01.2023 10:58, 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>
>
> It could be good start for boring refactoring :) of similar cases, for
> example:
> intel_fbdev_restore_mode
> intel_fbdev_set_suspend
>
Ah I missed those. I was mostly looked into the intel_display.c. I can
send another one.
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Thanks,
Nirmoy
>
>
> Regards
> Andrzej
>
>
>> ---
>> 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 c38a54efedbe..7584f65c6a7e 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -8999,7 +8999,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);
>> vga_switcheroo_process_delayed_switch();
>> }
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-19 9:58 [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs Nirmoy Das
` (2 preceding siblings ...)
2023-01-19 14:06 ` [Intel-gfx] [PATCH] " Andrzej Hajda
@ 2023-01-20 11:37 ` Patchwork
3 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2023-01-20 11:37 UTC (permalink / raw)
To: Das, Nirmoy; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 18230 bytes --]
== Series Details ==
Series: drm/i915/display: Pass drm_i915_private as param to i915 funcs
URL : https://patchwork.freedesktop.org/series/113083/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12610_full -> Patchwork_113083v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/index.html
Participating hosts (13 -> 11)
------------------------------
Missing (2): pig-skl-6260u pig-kbl-iris
Known issues
------------
Here are the changes found in Patchwork_113083v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2346])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-glk1/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-glk4/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a2:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#79]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-glk4/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a2.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-glk3/igt@kms_flip@flip-vs-expired-vblank@b-hdmi-a2.html
#### Possible fixes ####
* igt@fbdev@read:
- {shard-rkl}: [SKIP][5] ([i915#2582]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-5/igt@fbdev@read.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@fbdev@read.html
* igt@gem_exec_endless@dispatch@bcs0:
- {shard-rkl}: [SKIP][7] ([i915#6247]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-5/igt@gem_exec_endless@dispatch@bcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@gem_exec_endless@dispatch@bcs0.html
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- {shard-rkl}: [FAIL][9] ([i915#2842]) -> [PASS][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-2/igt@gem_exec_fair@basic-none-rrul@rcs0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-5/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- {shard-tglu}: [FAIL][11] ([i915#2842]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-tglu-3/igt@gem_exec_fair@basic-none-share@rcs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-tglu-4/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_reloc@basic-write-read:
- {shard-rkl}: [SKIP][13] ([i915#3281]) -> [PASS][14] +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-2/igt@gem_exec_reloc@basic-write-read.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-5/igt@gem_exec_reloc@basic-write-read.html
* igt@gem_partial_pwrite_pread@writes-after-reads-snoop:
- {shard-rkl}: [SKIP][15] ([i915#3282]) -> [PASS][16] +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-2/igt@gem_partial_pwrite_pread@writes-after-reads-snoop.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-5/igt@gem_partial_pwrite_pread@writes-after-reads-snoop.html
* igt@gen9_exec_parse@valid-registers:
- {shard-rkl}: [SKIP][17] ([i915#2527]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-2/igt@gen9_exec_parse@valid-registers.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-5/igt@gen9_exec_parse@valid-registers.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1:
- shard-glk: [FAIL][19] ([i915#79]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-glk9/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-badstride:
- {shard-rkl}: [SKIP][21] ([i915#1849] / [i915#4098]) -> [PASS][22] +16 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-1/igt@kms_frontbuffer_tracking@fbc-badstride.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-badstride.html
* igt@kms_plane@pixel-format@pipe-b-planes:
- {shard-rkl}: [SKIP][23] ([i915#1849]) -> [PASS][24] +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-1/igt@kms_plane@pixel-format@pipe-b-planes.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@kms_plane@pixel-format@pipe-b-planes.html
* igt@kms_psr@sprite_mmap_cpu:
- {shard-rkl}: [SKIP][25] ([i915#1072]) -> [PASS][26] +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-3/igt@kms_psr@sprite_mmap_cpu.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@kms_psr@sprite_mmap_cpu.html
* igt@kms_psr_stress_test@flip-primary-invalidate-overlay:
- {shard-rkl}: [SKIP][27] ([i915#5461]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-1/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
* igt@kms_rotation_crc@sprite-rotation-90-pos-100-0:
- {shard-rkl}: [SKIP][29] ([i915#1845] / [i915#4098]) -> [PASS][30] +22 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-1/igt@kms_rotation_crc@sprite-rotation-90-pos-100-0.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@kms_rotation_crc@sprite-rotation-90-pos-100-0.html
* igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-b:
- {shard-rkl}: [SKIP][31] ([i915#4098]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-5/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-b.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-b.html
* igt@kms_universal_plane@universal-plane-pipe-b-functional:
- {shard-rkl}: [SKIP][33] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-1/igt@kms_universal_plane@universal-plane-pipe-b-functional.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@kms_universal_plane@universal-plane-pipe-b-functional.html
* igt@prime_vgem@basic-fence-flip:
- {shard-rkl}: [SKIP][35] ([fdo#109295] / [i915#3708] / [i915#4098]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-1/igt@prime_vgem@basic-fence-flip.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-6/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-write:
- {shard-rkl}: [SKIP][37] ([fdo#109295] / [i915#3291] / [i915#3708]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12610/shard-rkl-2/igt@prime_vgem@basic-write.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/shard-rkl-5/igt@prime_vgem@basic-write.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109303]: https://bugs.freedesktop.org/show_bug.cgi?id=109303
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110542]: https://bugs.freedesktop.org/show_bug.cgi?id=110542
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2232]: https://gitlab.freedesktop.org/drm/intel/issues/2232
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3825]: https://gitlab.freedesktop.org/drm/intel/issues/3825
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3966]: https://gitlab.freedesktop.org/drm/intel/issues/3966
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[i915#4884]: https://gitlab.freedesktop.org/drm/intel/issues/4884
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#7178]: https://gitlab.freedesktop.org/drm/intel/issues/7178
[i915#7276]: https://gitlab.freedesktop.org/drm/intel/issues/7276
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7582]: https://gitlab.freedesktop.org/drm/intel/issues/7582
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12610 -> Patchwork_113083v1
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12610: db241d6cbe142a97152a55097c91036355c41002 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7126: 3aa9364a1e478010aba0d3dfe9183486560ecc60 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113083v1: db241d6cbe142a97152a55097c91036355c41002 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113083v1/index.html
[-- Attachment #2: Type: text/html, Size: 11689 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
@ 2023-01-24 14:17 Nirmoy Das
2023-01-25 7:50 ` Andrzej Hajda
0 siblings, 1 reply; 12+ messages in thread
From: Nirmoy Das @ 2023-01-24 14:17 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi, Andrzej Hajda, Nirmoy Das
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);
vga_switcheroo_process_delayed_switch();
}
--
2.39.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-24 14:17 [Intel-gfx] [PATCH] " Nirmoy Das
@ 2023-01-25 7:50 ` Andrzej Hajda
2023-01-25 9:55 ` Das, Nirmoy
0 siblings, 1 reply; 12+ messages in thread
From: Andrzej Hajda @ 2023-01-25 7:50 UTC (permalink / raw)
To: Nirmoy Das, intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi
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.
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Regards
Andrzej
>
> vga_switcheroo_process_delayed_switch();
> }
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-01-25 7:50 ` Andrzej Hajda
@ 2023-01-25 9:55 ` Das, Nirmoy
0 siblings, 0 replies; 12+ messages in thread
From: Das, Nirmoy @ 2023-01-25 9:55 UTC (permalink / raw)
To: Andrzej Hajda, Nirmoy Das, intel-gfx; +Cc: Jani Nikula, Rodrigo Vivi
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();
>> }
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
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
1 sibling, 1 reply; 12+ messages in thread
From: Andi Shyti @ 2023-02-10 12:21 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, Rodrigo Vivi, Nirmoy Das
Hi Jani,
On Thu, Jan 19, 2023 at 12:58:47PM +0200, Jani Nikula wrote:
> On Thu, 19 Jan 2023, Nirmoy Das <nirmoy.das@intel.com> wrote:
> > For i915 functions pass struct drm_i915_private directly instead of
> > struct drm_device.
>
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> but maybe let's wait until we've synced up with drm-misc-next to avoid
> the unnecessary conflict in drm-tip and linux-next?
can we push it now? Do you want me to take care of it?
Andi
> >
> > 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>
> > ---
> > 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 c38a54efedbe..7584f65c6a7e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -8999,7 +8999,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);
> >
> > vga_switcheroo_process_delayed_switch();
> > }
>
> --
> Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs
2023-02-10 12:21 ` Andi Shyti
@ 2023-02-10 12:27 ` Das, Nirmoy
0 siblings, 0 replies; 12+ messages in thread
From: Das, Nirmoy @ 2023-02-10 12:27 UTC (permalink / raw)
To: Andi Shyti, Jani Nikula; +Cc: intel-gfx, Rodrigo Vivi
On 2/10/2023 1:21 PM, Andi Shyti wrote:
> Hi Jani,
>
> On Thu, Jan 19, 2023 at 12:58:47PM +0200, Jani Nikula wrote:
>> On Thu, 19 Jan 2023, Nirmoy Das <nirmoy.das@intel.com> wrote:
>>> For i915 functions pass struct drm_i915_private directly instead of
>>> struct drm_device.
>> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>>
>> but maybe let's wait until we've synced up with drm-misc-next to avoid
>> the unnecessary conflict in drm-tip and linux-next?
> can we push it now? Do you want me to take care of it?
Would be nice if this is gets picked, though I still didn't manage to
work on Jani's follow up "dev_privs to i915" cleanup patches.
FYI: this v1, I have a v2 for this
https://patchwork.freedesktop.org/patch/520148/?series=113083&rev=3
Regards,
Nirmoy
>
> Andi
>
>>> 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>
>>> ---
>>> 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 c38a54efedbe..7584f65c6a7e 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>>> @@ -8999,7 +8999,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);
>>>
>>> vga_switcheroo_process_delayed_switch();
>>> }
>> --
>> Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-02-10 12:28 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-19 9:58 [Intel-gfx] [PATCH] drm/i915/display: Pass drm_i915_private as param to i915 funcs 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 12:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2023-01-19 14:06 ` [Intel-gfx] [PATCH] " Andrzej Hajda
2023-01-19 15:15 ` Das, Nirmoy
2023-01-20 11:37 ` [Intel-gfx] ✓ Fi.CI.IGT: success for " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-01-24 14:17 [Intel-gfx] [PATCH] " Nirmoy Das
2023-01-25 7:50 ` Andrzej Hajda
2023-01-25 9:55 ` Das, Nirmoy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox