From: Jani Nikula <jani.nikula@intel.com>
To: Gustavo Sousa <gustavo.sousa@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 06/10] drm/i915/display: rename intel_display_driver_* functions
Date: Fri, 14 Apr 2023 12:02:21 +0300 [thread overview]
Message-ID: <87y1mug7ky.fsf@intel.com> (raw)
In-Reply-To: <168139282706.4412.15825674669289194174@gjsousa-mobl2>
On Thu, 13 Apr 2023, Gustavo Sousa <gustavo.sousa@intel.com> wrote:
> Quoting Jani Nikula (2023-04-13 06:47:32)
>> Follow the usual naming conventions.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>> .../drm/i915/display/intel_display_driver.c | 16 +++++++-------
>> .../drm/i915/display/intel_display_driver.h | 14 ++++++-------
>> drivers/gpu/drm/i915/i915_driver.c | 21 ++++++++++---------
>> 4 files changed, 27 insertions(+), 26 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 56e3aab7e1c6..f425e5ed155b 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -833,7 +833,7 @@ void intel_display_finish_reset(struct drm_i915_private *i915)
>> * so need a full re-initialization.
>> */
>> intel_pps_unlock_regs_wa(i915);
>> - intel_modeset_init_hw(i915);
>> + intel_display_driver_init_hw(i915);
>> intel_clock_gating_init(i915);
>> intel_hpd_init(i915);
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
>> index f7805c6f1b63..45e425100385 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
>> @@ -72,7 +72,7 @@ bool intel_display_driver_probe_defer(struct pci_dev *pdev)
>> return false;
>> }
>>
>> -void intel_modeset_init_hw(struct drm_i915_private *i915)
>> +void intel_display_driver_init_hw(struct drm_i915_private *i915)
>> {
>> struct intel_cdclk_state *cdclk_state;
>>
>> @@ -170,7 +170,7 @@ static void intel_plane_possible_crtcs_init(struct drm_i915_private *dev_priv)
>> }
>>
>> /* part #1: call before irq install */
>> -int intel_modeset_init_noirq(struct drm_i915_private *i915)
>> +int intel_display_driver_probe_noirq(struct drm_i915_private *i915)
>> {
>> int ret;
>>
>> @@ -246,7 +246,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
>> }
>>
>> /* part #2: call after irq install, but before gem init */
>> -int intel_modeset_init_nogem(struct drm_i915_private *i915)
>> +int intel_display_driver_probe_nogem(struct drm_i915_private *i915)
>> {
>> struct drm_device *dev = &i915->drm;
>> enum pipe pipe;
>> @@ -281,7 +281,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)
>> intel_fdi_pll_freq_update(i915);
>>
>> intel_update_czclk(i915);
>> - intel_modeset_init_hw(i915);
>> + intel_display_driver_init_hw(i915);
>> intel_dpll_update_ref_clks(i915);
>>
>> intel_hdcp_component_init(i915);
>> @@ -318,7 +318,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915)
>> }
>>
>> /* part #3: call after gem init */
>> -int intel_modeset_init(struct drm_i915_private *i915)
>> +int intel_display_driver_probe(struct drm_i915_private *i915)
>> {
>> int ret;
>>
>> @@ -382,7 +382,7 @@ void intel_display_driver_register(struct drm_i915_private *i915)
>> }
>>
>> /* part #1: call before irq uninstall */
>> -void intel_modeset_driver_remove(struct drm_i915_private *i915)
>> +void intel_display_driver_remove(struct drm_i915_private *i915)
>> {
>> if (!HAS_DISPLAY(i915))
>> return;
>> @@ -402,7 +402,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915)
>> }
>>
>> /* part #2: call after irq uninstall */
>> -void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
>> +void intel_display_driver_remove_noirq(struct drm_i915_private *i915)
>> {
>> if (!HAS_DISPLAY(i915))
>> return;
>> @@ -436,7 +436,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
>> }
>>
>> /* part #3: call after gem init */
>> -void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)
>> +void intel_display_driver_remove_nogem(struct drm_i915_private *i915)
>> {
>> intel_dmc_fini(i915);
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h
>> index 947b666575ee..aab498617b90 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_driver.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h
>> @@ -12,14 +12,14 @@ struct drm_i915_private;
>> struct pci_dev;
>>
>> bool intel_display_driver_probe_defer(struct pci_dev *pdev);
>> -void intel_modeset_init_hw(struct drm_i915_private *i915);
>> -int intel_modeset_init_noirq(struct drm_i915_private *i915);
>> -int intel_modeset_init_nogem(struct drm_i915_private *i915);
>> -int intel_modeset_init(struct drm_i915_private *i915);
>> +void intel_display_driver_init_hw(struct drm_i915_private *i915);
>> +int intel_display_driver_probe_noirq(struct drm_i915_private *i915);
>> +int intel_display_driver_probe_nogem(struct drm_i915_private *i915);
>> +int intel_display_driver_probe(struct drm_i915_private *i915);
>> void intel_display_driver_register(struct drm_i915_private *i915);
>> -void intel_modeset_driver_remove(struct drm_i915_private *i915);
>> -void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915);
>> -void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915);
>> +void intel_display_driver_remove(struct drm_i915_private *i915);
>> +void intel_display_driver_remove_noirq(struct drm_i915_private *i915);
>> +void intel_display_driver_remove_nogem(struct drm_i915_private *i915);
>> void intel_display_driver_unregister(struct drm_i915_private *i915);
>
> Looks like some comments need to be fixed now:
>
> ❯ git grep -w -e intel_modeset_init_hw -e intel_modeset_init_noirq -e intel_modeset_init_nogem -e intel_modeset_init -e intel_modeset_driver_remove -e intel_modeset_driver_remove_noirq -e intel_modeset_driver_remove_nogem
> i915_driver.c: * - drive output discovery via intel_modeset_init()
> i915_driver.c: * Modeset enabling in intel_modeset_init_hw() also needs working
> i915_irq.c: * intel_modeset_driver_remove() calling us out of sequence.
Thanks, will fix.
BR,
Jani.
>
> --
> Gustavo Sousa
>
>>
>> #endif /* __INTEL_DISPLAY_DRIVER_H__ */
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>> index 5ccb24498cbf..9d06dae47735 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -791,7 +791,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>> if (ret < 0)
>> goto out_cleanup_mmio;
>>
>> - ret = intel_modeset_init_noirq(i915);
>> + ret = intel_display_driver_probe_noirq(i915);
>> if (ret < 0)
>> goto out_cleanup_hw;
>>
>> @@ -799,7 +799,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>> if (ret)
>> goto out_cleanup_modeset;
>>
>> - ret = intel_modeset_init_nogem(i915);
>> + ret = intel_display_driver_probe_nogem(i915);
>> if (ret)
>> goto out_cleanup_irq;
>>
>> @@ -809,7 +809,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>>
>> intel_pxp_init(i915);
>>
>> - ret = intel_modeset_init(i915);
>> + ret = intel_display_driver_probe(i915);
>> if (ret)
>> goto out_cleanup_gem;
>>
>> @@ -829,14 +829,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>> i915_gem_driver_release(i915);
>> out_cleanup_modeset2:
>> /* FIXME clean up the error path */
>> - intel_modeset_driver_remove(i915);
>> + intel_display_driver_remove(i915);
>> intel_irq_uninstall(i915);
>> - intel_modeset_driver_remove_noirq(i915);
>> + intel_display_driver_remove_noirq(i915);
>> goto out_cleanup_modeset;
>> out_cleanup_irq:
>> intel_irq_uninstall(i915);
>> out_cleanup_modeset:
>> - intel_modeset_driver_remove_nogem(i915);
>> + intel_display_driver_remove_nogem(i915);
>> out_cleanup_hw:
>> i915_driver_hw_remove(i915);
>> intel_memory_regions_driver_release(i915);
>> @@ -872,16 +872,16 @@ void i915_driver_remove(struct drm_i915_private *i915)
>>
>> intel_gvt_driver_remove(i915);
>>
>> - intel_modeset_driver_remove(i915);
>> + intel_display_driver_remove(i915);
>>
>> intel_irq_uninstall(i915);
>>
>> - intel_modeset_driver_remove_noirq(i915);
>> + intel_display_driver_remove_noirq(i915);
>>
>> i915_reset_error_state(i915);
>> i915_gem_driver_remove(i915);
>>
>> - intel_modeset_driver_remove_nogem(i915);
>> + intel_display_driver_remove_nogem(i915);
>>
>> i915_driver_hw_remove(i915);
>>
>> @@ -1244,7 +1244,8 @@ static int i915_drm_resume(struct drm_device *dev)
>>
>> i915_gem_resume(dev_priv);
>>
>> - intel_modeset_init_hw(dev_priv);
>> + intel_display_driver_init_hw(dev_priv);
>> +
>> intel_clock_gating_init(dev_priv);
>> intel_hpd_init(dev_priv);
>>
>> --
>> 2.39.2
>>
--
Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2023-04-14 9:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 9:47 [Intel-gfx] [PATCH 00/10] drm/i915/display: split out high level display entry points Jani Nikula
2023-04-13 9:47 ` [Intel-gfx] [PATCH 01/10] drm/i915/display: remove intel_display_commit_duplicated_state() Jani Nikula
2023-04-13 16:13 ` Gustavo Sousa
2023-04-13 9:47 ` [Intel-gfx] [PATCH 02/10] drm/i915/display: start high level display driver file Jani Nikula
2023-04-13 16:55 ` Gustavo Sousa
2023-04-13 9:47 ` [Intel-gfx] [PATCH 03/10] drm/i915/display: move intel_modeset_probe_defer() to intel_display_driver.[ch] Jani Nikula
2023-04-13 16:56 ` Gustavo Sousa
2023-04-13 9:47 ` [Intel-gfx] [PATCH 04/10] drm/i915/display: rename intel_modeset_probe_defer() -> intel_display_driver_probe_defer() Jani Nikula
2023-04-13 16:57 ` Gustavo Sousa
2023-04-13 19:11 ` Lucas De Marchi
2023-04-13 9:47 ` [Intel-gfx] [PATCH 05/10] drm/i915/display: move modeset probe/remove functions to intel_display_driver.c Jani Nikula
2023-04-13 13:20 ` Gustavo Sousa
2023-04-14 9:01 ` Jani Nikula
2023-04-14 9:20 ` Jani Nikula
2023-04-13 9:47 ` [Intel-gfx] [PATCH 06/10] drm/i915/display: rename intel_display_driver_* functions Jani Nikula
2023-04-13 13:33 ` Gustavo Sousa
2023-04-14 9:02 ` Jani Nikula [this message]
2023-04-13 9:47 ` [Intel-gfx] [PATCH 07/10] drm/i915/display: add intel_display_reset.[ch] Jani Nikula
2023-04-13 16:59 ` Gustavo Sousa
2023-04-13 9:47 ` [Intel-gfx] [PATCH 08/10] drm/i915/display: move display suspend/resume to intel_display_driver.[ch] Jani Nikula
2023-04-13 17:01 ` Gustavo Sousa
2023-04-13 9:47 ` [Intel-gfx] [PATCH 09/10] drm/i915/display: rename intel_display_driver_suspend/resume functions Jani Nikula
2023-04-13 17:02 ` Gustavo Sousa
2023-04-13 9:47 ` [Intel-gfx] [PATCH 10/10] drm/i915/display: add intel_display_driver_early_probe() Jani Nikula
2023-04-13 17:02 ` Gustavo Sousa
2023-04-13 13:15 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: split out high level display entry points Patchwork
2023-04-13 13:15 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-04-13 13:24 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-04-13 16:06 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=87y1mug7ky.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=gustavo.sousa@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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.