From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp2.it.da.ut.ee ([193.40.5.67]:39624 "EHLO smtp2.it.da.ut.ee" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbcAGKoG convert rfc822-to-8bit (ORCPT ); Thu, 7 Jan 2016 05:44:06 -0500 Date: Thu, 7 Jan 2016 12:23:43 +0200 (EET) From: Meelis Roos To: Daniel Vetter cc: DRI Development , Intel Graphics Development , =?ISO-8859-15?Q?Ville_Syrj=E4l=E4?= , Patrik Jakobsson , Imre Deak , Jani Nikula , stable@vger.kernel.org, Daniel Vetter Subject: Re: [PATCH] drm/i915: Init power domains early in driver load In-Reply-To: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> Message-ID: References: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: > commit ac9b8236551d1177fd07b56aef9b565d1864420d > Author: Ville Syrjälä > 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ä > Cc: Patrik Jakobsson > Cc: Imre Deak > Cc: Jani Nikula > Cc: Meelis Roos > 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 Tested-by: Meelis Roos Worked fine on my SNB computer. > --- > 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"); > -- Meelis Roos (mroos@ut.ee) http://www.cs.ut.ee/~mroos/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Meelis Roos Subject: Re: [PATCH] drm/i915: Init power domains early in driver load Date: Thu, 7 Jan 2016 12:23:43 +0200 (EET) Message-ID: References: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1452157856-27360-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: Jani Nikula , DRI Development , stable@vger.kernel.org, Daniel Vetter , Intel Graphics Development List-Id: dri-devel@lists.freedesktop.org PiBjb21taXQgYWM5YjgyMzY1NTFkMTE3N2ZkMDdiNTZhZWY5YjU2NWQxODY0NDIwZAo+IEF1dGhv cjogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiBEYXRl OiAgIEZyaSBOb3YgMjcgMTg6NTU6MjYgMjAxNSArMDIwMAo+IAo+ICAgICBkcm0vaTkxNTogSW50 cm9kdWNlIGEgZ21idXMgcG93ZXIgZG9tYWluCj4gCj4gZ21idXMgYWxzbyBuZWVkcyB0aGUgcG93 ZXIgZG9tYWluIGluZnJhc3RydWN0dXJlIHJpZ2h0IGZyb20gdGhlIHN0YXJ0LAo+IHNpbmNlIGFz IHNvb24gYXMgd2UgcmVnaXN0ZXIgdGhlIGkyYyBjb250cm9sbGVycyBzb21lb25lIGNhbiB1c2Ug dGhlbS4KPiAKPiBDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KPiBDYzogUGF0cmlrIEpha29ic3NvbiA8cGF0cmlrLmpha29ic3NvbkBsaW51eC5pbnRl bC5jb20+Cj4gQ2M6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KPiBDYzogSmFuaSBO aWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KPiBDYzogTWVlbGlzIFJvb3MgPG1yb29zQGxp bnV4LmVlPgo+IEZpeGVzOiBhYzliODIzNjU1MWQgKCJkcm0vaTkxNTogSW50cm9kdWNlIGEgZ21i dXMgcG93ZXIgZG9tYWluIikKPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwo+IFJlZmVyZW5j ZXM6IGh0dHA6Ly93d3cuc3Bpbmljcy5uZXQvbGlzdHMvaW50ZWwtZ2Z4L21zZzgzMDc1Lmh0bWwK PiBTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4K ClRlc3RlZC1ieTogTWVlbGlzIFJvb3MgPG1yb29zQGxpbnV4LmVlPgoKV29ya2VkIGZpbmUgb24g bXkgU05CIGNvbXB1dGVyLgoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEu YyB8IDYgKystLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDQgZGVsZXRp b25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCj4gaW5kZXggYjQ3NDFkMTIxYTc0Li40 MDVhYmEyY2E3MzYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEu Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKPiBAQCAtMzk2LDggKzM5 Niw2IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQo+ICAJaWYgKHJldCkKPiAgCQlnb3RvIGNsZWFudXBfdmdhX3N3aXRjaGVyb287Cj4g IAo+IC0JaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KGRldl9wcml2KTsKPiAtCj4gIAlyZXQg PSBpbnRlbF9pcnFfaW5zdGFsbChkZXZfcHJpdik7Cj4gIAlpZiAocmV0KQo+ICAJCWdvdG8gY2xl YW51cF9nZW1fc3RvbGVuOwo+IEBAIC0xMDI1LDYgKzEwMjMsOCBAQCBpbnQgaTkxNV9kcml2ZXJf bG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQo+ICAKPiAg CWludGVsX2lycV9pbml0KGRldl9wcml2KTsKPiAgCWludGVsX3VuY29yZV9zYW5pdGl6ZShkZXYp Owo+ICsJaW50ZWxfcG93ZXJfZG9tYWluc19pbml0KGRldl9wcml2KTsKPiArCWludGVsX3Bvd2Vy X2RvbWFpbnNfaW5pdF9odyhkZXZfcHJpdik7Cj4gIAo+ICAJLyogVHJ5IHRvIG1ha2Ugc3VyZSBN Q0hCQVIgaXMgZW5hYmxlZCBiZWZvcmUgcG9raW5nIGF0IGl0ICovCj4gIAlpbnRlbF9zZXR1cF9t Y2hiYXIoZGV2KTsKPiBAQCAtMTA1Nyw4ICsxMDU3LDYgQEAgaW50IGk5MTVfZHJpdmVyX2xvYWQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKPiAgCQkJZ290byBv dXRfZ2VtX3VubG9hZDsKPiAgCX0KPiAgCj4gLQlpbnRlbF9wb3dlcl9kb21haW5zX2luaXQoZGV2 X3ByaXYpOwo+IC0KPiAgCXJldCA9IGk5MTVfbG9hZF9tb2Rlc2V0X2luaXQoZGV2KTsKPiAgCWlm IChyZXQgPCAwKSB7Cj4gIAkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gaW5pdCBtb2Rlc2V0XG4iKTsK PiAKCi0tIApNZWVsaXMgUm9vcyAobXJvb3NAdXQuZWUpICAgICAgaHR0cDovL3d3dy5jcy51dC5l ZS9+bXJvb3MvCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==