From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Patrik Jakobsson" <patrik.jakobsson@linux.intel.com>, "Imre Deak" <imre.deak@intel.com>, "Jani Nikula" <jani.nikula@intel.com>, "Meelis Roos" <mroos@linux.ee>, stable@vger.kernel.org, "Daniel Vetter" <daniel.vetter@intel.com> Subject: [PATCH] drm/i915: Init power domains early in driver load Date: Thu, 7 Jan 2016 10:10:56 +0100 [thread overview] Message-ID: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> (raw) Since commit ac9b8236551d1177fd07b56aef9b565d1864420d Author: Ville Syrjälä <ville.syrjala@linux.intel.com> Date: Fri Nov 27 18:55:26 2015 +0200 drm/i915: Introduce a gmbus power domain gmbus also needs the power domain infrastructure right from the start, since as soon as we register the i2c controllers someone can use them. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Meelis Roos <mroos@linux.ee> Fixes: ac9b8236551d ("drm/i915: Introduce a gmbus power domain") Cc: stable@vger.kernel.org References: http://www.spinics.net/lists/intel-gfx/msg83075.html Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/i915_dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index b4741d121a74..405aba2ca736 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -396,8 +396,6 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_vga_switcheroo; - intel_power_domains_init_hw(dev_priv); - ret = intel_irq_install(dev_priv); if (ret) goto cleanup_gem_stolen; @@ -1025,6 +1023,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) intel_irq_init(dev_priv); intel_uncore_sanitize(dev); + intel_power_domains_init(dev_priv); + intel_power_domains_init_hw(dev_priv); /* Try to make sure MCHBAR is enabled before poking at it */ intel_setup_mchbar(dev); @@ -1057,8 +1057,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) goto out_gem_unload; } - intel_power_domains_init(dev_priv); - ret = i915_load_modeset_init(dev); if (ret < 0) { DRM_ERROR("failed to init modeset\n"); -- 2.6.4
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: Meelis Roos <mroos@linux.ee>, Jani Nikula <jani.nikula@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com> Subject: [PATCH] drm/i915: Init power domains early in driver load Date: Thu, 7 Jan 2016 10:10:56 +0100 [thread overview] Message-ID: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> (raw) Since commit ac9b8236551d1177fd07b56aef9b565d1864420d Author: Ville Syrjälä <ville.syrjala@linux.intel.com> Date: Fri Nov 27 18:55:26 2015 +0200 drm/i915: Introduce a gmbus power domain gmbus also needs the power domain infrastructure right from the start, since as soon as we register the i2c controllers someone can use them. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com> Cc: Imre Deak <imre.deak@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Meelis Roos <mroos@linux.ee> Fixes: ac9b8236551d ("drm/i915: Introduce a gmbus power domain") Cc: stable@vger.kernel.org References: http://www.spinics.net/lists/intel-gfx/msg83075.html Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/i915/i915_dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index b4741d121a74..405aba2ca736 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -396,8 +396,6 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_vga_switcheroo; - intel_power_domains_init_hw(dev_priv); - ret = intel_irq_install(dev_priv); if (ret) goto cleanup_gem_stolen; @@ -1025,6 +1023,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) intel_irq_init(dev_priv); intel_uncore_sanitize(dev); + intel_power_domains_init(dev_priv); + intel_power_domains_init_hw(dev_priv); /* Try to make sure MCHBAR is enabled before poking at it */ intel_setup_mchbar(dev); @@ -1057,8 +1057,6 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) goto out_gem_unload; } - intel_power_domains_init(dev_priv); - ret = i915_load_modeset_init(dev); if (ret < 0) { DRM_ERROR("failed to init modeset\n"); -- 2.6.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2016-01-07 9:11 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-07 9:10 Daniel Vetter [this message] 2016-01-07 9:10 ` [PATCH] drm/i915: Init power domains early in driver load Daniel Vetter 2016-01-07 9:22 ` [Intel-gfx] " Chris Wilson 2016-01-07 9:22 ` Chris Wilson 2016-01-07 10:23 ` Meelis Roos 2016-01-07 10:23 ` Meelis Roos 2016-01-07 11:44 ` Daniel Vetter 2016-01-07 11:52 ` Chris Wilson 2016-01-07 11:52 ` Chris Wilson 2016-01-07 11:52 ` [Intel-gfx] " kbuild test robot 2016-01-07 11:52 ` kbuild test robot 2016-01-07 12:14 ` Jani Nikula 2016-01-07 12:14 ` Jani Nikula 2016-01-07 12:52 ` Ville Syrjälä 2016-01-07 12:52 ` Ville Syrjälä 2016-01-07 13:15 ` Daniel Vetter 2016-01-07 13:25 ` Jani Nikula 2016-01-07 13:25 ` Jani Nikula 2016-01-07 13:26 ` Ville Syrjälä 2016-01-07 13:26 ` Ville Syrjälä 2016-01-07 13:16 ` Daniel Vetter 2016-01-07 13:51 ` Daniel Vetter 2016-01-07 14:32 ` Ville Syrjälä 2016-01-07 14:32 ` Ville Syrjälä 2016-01-07 15:49 ` Meelis Roos 2016-01-07 19:41 ` Meelis Roos 2016-01-07 19:41 ` Meelis Roos 2016-01-11 9:12 ` ✗ failure: Fi.CI.BAT Patchwork 2016-01-13 10:55 [PATCH] drm/i915: Init power domains early in driver load Daniel Vetter
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=1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=imre.deak@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=mroos@linux.ee \ --cc=patrik.jakobsson@linux.intel.com \ --cc=stable@vger.kernel.org \ --cc=ville.syrjala@linux.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: linkBe 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.