From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 4/4] drm/i915: move gmbus setup down to intel_modeset_init()
Date: Wed, 2 Oct 2019 18:07:08 +0300 [thread overview]
Message-ID: <20191002150708.GZ1208@intel.com> (raw)
In-Reply-To: <20191002131800.21054-4-jani.nikula@intel.com>
On Wed, Oct 02, 2019 at 04:18:00PM +0300, Jani Nikula wrote:
> Pair the gmbus setup and teardown in the same layer. This also fixes the
> double gmbus teardown on the i915_driver_modeset_probe() error path.
>
> Move the gmbus setup a bit later in the sequence to make the follow-up
> refactoring easier, and to pinpoint any unexpected consequences of this
> change right here, instead of the later refactoring.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Seems safe.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 2 ++
> drivers/gpu/drm/i915/i915_drv.c | 4 ----
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index d99c59e97568..2a7554e3b96d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -16233,6 +16233,8 @@ int intel_modeset_init(struct drm_i915_private *i915)
>
> intel_panel_sanitize_ssc(i915);
>
> + intel_gmbus_setup(i915);
> +
> DRM_DEBUG_KMS("%d display pipe%s available.\n",
> INTEL_NUM_PIPES(i915),
> INTEL_NUM_PIPES(i915) > 1 ? "s" : "");
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 7503e16aadef..91362682f489 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -53,7 +53,6 @@
> #include "display/intel_display_types.h"
> #include "display/intel_dp.h"
> #include "display/intel_fbdev.h"
> -#include "display/intel_gmbus.h"
> #include "display/intel_hotplug.h"
> #include "display/intel_overlay.h"
> #include "display/intel_pipe_crc.h"
> @@ -301,8 +300,6 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
> if (ret)
> goto cleanup_csr;
>
> - intel_gmbus_setup(i915);
> -
> /* Important: The output setup functions called by modeset_init need
> * working irqs for e.g. gmbus and dp aux transfers. */
> ret = intel_modeset_init(i915);
> @@ -337,7 +334,6 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915)
> intel_modeset_driver_remove(i915);
> cleanup_irq:
> intel_irq_uninstall(i915);
> - intel_gmbus_teardown(i915);
> cleanup_csr:
> intel_csr_ucode_fini(i915);
> intel_power_domains_driver_remove(i915);
> --
> 2.20.1
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-10-02 15:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 13:17 [PATCH 1/4] drm/i915/vga: rename intel_vga_msr_write() to intel_vga_reset_io_mem() Jani Nikula
2019-10-02 13:17 ` [PATCH 2/4] drm/i915: split out i915_switcheroo.[ch] from i915_drv.c Jani Nikula
2019-10-02 15:04 ` Ville Syrjälä
2019-10-02 13:17 ` [PATCH 3/4] drm/i915: register vga switcheroo later, unregister earlier Jani Nikula
2019-10-02 13:18 ` [PATCH 4/4] drm/i915: move gmbus setup down to intel_modeset_init() Jani Nikula
2019-10-02 15:07 ` Ville Syrjälä [this message]
2019-10-02 15:03 ` [PATCH 1/4] drm/i915/vga: rename intel_vga_msr_write() to intel_vga_reset_io_mem() Ville Syrjälä
2019-10-02 17:28 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] " Patchwork
2019-10-02 17:54 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-10-03 10:23 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/vga: rename intel_vga_msr_write() to intel_vga_reset_io_mem() (rev2) Patchwork
2019-10-03 10:48 ` ✓ Fi.CI.BAT: success " Patchwork
2019-10-03 17:34 ` ✗ Fi.CI.IGT: failure " 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=20191002150708.GZ1208@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.