From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA6F3C35247 for ; Tue, 4 Feb 2020 15:16:15 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 85D4920730 for ; Tue, 4 Feb 2020 15:16:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85D4920730 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 15AD36E842; Tue, 4 Feb 2020 15:16:15 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B0936E842 for ; Tue, 4 Feb 2020 15:16:13 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Feb 2020 07:16:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,402,1574150400"; d="scan'208";a="249371126" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga002.jf.intel.com with SMTP; 04 Feb 2020 07:16:10 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 04 Feb 2020 17:16:09 +0200 Date: Tue, 4 Feb 2020 17:16:09 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: <20200204151609.GY13686@intel.com> References: <3d045ba95b020f057ab27601ab8486cf0602da96.1580823606.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <3d045ba95b020f057ab27601ab8486cf0602da96.1580823606.git.jani.nikula@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH 9/9] drm/i915: remove the now redundant i915_driver_modeset_* call layer X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Feb 04, 2020 at 03:42:28PM +0200, Jani Nikula wrote: > The i915_driver_modeset_*() functions have become irrelevant, and the > extra layer can be removed. > = > Cc: Ville Syrj=E4l=E4 > Signed-off-by: Jani Nikula Ok, some extraneous layers scraped off. Good. Reviewed-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/i915_drv.c | 76 +++++++++------------------------ > 1 file changed, 19 insertions(+), 57 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_= drv.c > index fca693ad6cd7..c097dced0d9b 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -272,58 +272,6 @@ intel_teardown_mchbar(struct drm_i915_private *dev_p= riv) > release_resource(&dev_priv->mch_res); > } > = > -/* part #1: call before irq install */ > -static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915) > -{ > - return intel_modeset_init_noirq(i915); > -} > - > -/* part #2: call after irq install */ > -static int i915_driver_modeset_probe(struct drm_i915_private *i915) > -{ > - int ret; > - > - /* Important: The output setup functions called by modeset_init need > - * working irqs for e.g. gmbus and dp aux transfers. */ > - ret =3D intel_modeset_init_nogem(i915); > - if (ret) > - goto out; > - > - ret =3D i915_gem_init(i915); > - if (ret) > - goto cleanup_modeset; > - > - ret =3D intel_modeset_init(i915); > - if (ret) > - goto cleanup_gem; > - > - return 0; > - > -cleanup_gem: > - i915_gem_suspend(i915); > - i915_gem_driver_remove(i915); > - i915_gem_driver_release(i915); > -cleanup_modeset: > - /* FIXME */ > - intel_modeset_driver_remove(i915); > - intel_irq_uninstall(i915); > - intel_modeset_driver_remove_noirq(i915); > -out: > - return ret; > -} > - > -/* part #1: call before irq uninstall */ > -static void i915_driver_modeset_remove(struct drm_i915_private *i915) > -{ > - intel_modeset_driver_remove(i915); > -} > - > -/* part #2: call after irq uninstall */ > -static void i915_driver_modeset_remove_noirq(struct drm_i915_private *i9= 15) > -{ > - intel_modeset_driver_remove_noirq(i915); > -} > - > static void intel_init_dpio(struct drm_i915_private *dev_priv) > { > /* > @@ -1502,7 +1450,7 @@ int i915_driver_probe(struct pci_dev *pdev, const s= truct pci_device_id *ent) > if (ret < 0) > goto out_cleanup_mmio; > = > - ret =3D i915_driver_modeset_probe_noirq(i915); > + ret =3D intel_modeset_init_noirq(i915); > if (ret < 0) > goto out_cleanup_hw; > = > @@ -1510,10 +1458,20 @@ int i915_driver_probe(struct pci_dev *pdev, const= struct pci_device_id *ent) > if (ret) > goto out_cleanup_modeset; > = > - ret =3D i915_driver_modeset_probe(i915); > - if (ret < 0) > + /* Important: The output setup functions called by modeset_init need > + * working irqs for e.g. gmbus and dp aux transfers. */ > + ret =3D intel_modeset_init_nogem(i915); > + if (ret) > goto out_cleanup_irq; > = > + ret =3D i915_gem_init(i915); > + if (ret) > + goto out_cleanup_modeset; > + > + ret =3D intel_modeset_init(i915); > + if (ret) > + goto out_cleanup_gem; > + > i915_driver_register(i915); > = > enable_rpm_wakeref_asserts(&i915->runtime_pm); > @@ -1522,6 +1480,10 @@ int i915_driver_probe(struct pci_dev *pdev, const = struct pci_device_id *ent) > = > return 0; > = > +out_cleanup_gem: > + i915_gem_suspend(i915); > + i915_gem_driver_remove(i915); > + i915_gem_driver_release(i915); > out_cleanup_irq: > intel_irq_uninstall(i915); > out_cleanup_modeset: > @@ -1565,11 +1527,11 @@ void i915_driver_remove(struct drm_i915_private *= i915) > = > intel_gvt_driver_remove(i915); > = > - i915_driver_modeset_remove(i915); > + intel_modeset_driver_remove(i915); > = > intel_irq_uninstall(i915); > = > - i915_driver_modeset_remove_noirq(i915); > + intel_modeset_driver_remove_noirq(i915); > = > i915_reset_error_state(i915); > i915_gem_driver_remove(i915); > -- = > 2.20.1 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx