From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 6/7] drm/i915: Restart RPS using the same RP_CONTROL as from initialisation Date: Mon, 20 Feb 2017 16:40:47 +0200 Message-ID: <87tw7pc4cw.fsf@gaia.fi.intel.com> References: <20170220094713.22874-1-chris@chris-wilson.co.uk> <20170220094713.22874-6-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B046E6E225 for ; Mon, 20 Feb 2017 14:42:29 +0000 (UTC) In-Reply-To: <20170220094713.22874-6-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gRHVyaW5n IGluaXRpYWxpc2F0aW9uLCB3ZSBzZXQgZGlmZmVyZW50IGZsYWdzIGZvciBkaWZmZXJlbnQKPiBh cmNoaXRlY3R1cmVzIC0gdGhlc2Ugc2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIHdlIHJlbG9hZCB0 aGUgUlBTCj4gdGhyZXNob2xkcy4gSWYgd2UgdXNlIGEgbW1pbyByZWFkLCBpdCB3aWxsIGZpcnN0 IGVuc3VyZSB0aGF0IHRoZQo+IHRocmVzaG9sZCByZWdpc3RlcnMgYXJlIHdyaXR0ZW4gYmVmb3Jl IHdlIGFwcGx5IHRoZSBsYXRjaCBpbiBSUF9DT05UUk9MLgo+Cj4gU2lnbmVkLW9mZi1ieTogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Cj4gQ2M6IE1pa2EgS3VvcHBhbGEg PG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgo+IENjOiBzdGFibGVAdmdlci5rZXJuZWwu b3JnCgpUaGlzIHdpbGwgY2hhbmdlIGhvdyB0aGUgdmFsbGV5dmlldyB3aWxsIGRvIHRoZSBET1dO X0lETEUsCmR1ZSB0byByZWFkYmFjayB5b3Ugd2lsbCBnZXQgYSBHRU42X1JQX0RPV05fSURMRV9D T05ULgoKSSBjYW4ndCB0aGluayBvZiB3aHkgd2Ugd291bGQgbGlrZSB0byBrZWVwIHRoYXQgYmVo YXZpb3VyCmFzIHRoZSBJRExFX0NPTlQgc2V0dXAgaXMgYSB0d2FydCBpbiBteSBvcGluaW9uLgoK SWYgeW91IGFncmVlIHdpdGggdGhlIGFib3ZlLCBzdWJzdGl0dXRlIHRoZSBJRExFX0NPTlQgaW4K dmFsbGV2aWV3IHNldHVwIGFuZCB5b3UgY2FuIGFkZCwKClJldmlld2VkLWJ5OiBNaWthIEt1b3Bw YWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMgfCA4ICsrLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlv bnMoKyksIDYgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBpbmRleCAz MDQxY2Q0OTg4YTYuLmQzN2U5NWIzNTI1ZCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ IEBAIC00ODg0LDEzICs0ODg0LDkgQEAgc3RhdGljIHZvaWQgZ2VuNl9zZXRfcnBzX3RocmVzaG9s ZHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1OCB2YWwpCj4gIAkJICAgICAg R1RfSU5URVJWQUxfRlJPTV9VUyhkZXZfcHJpdiwKPiAgCQkJCQkgIGVpX2Rvd24gKiB0aHJlc2hv bGRfZG93biAvIDEwMCkpOwo+ICAKPiArCS8qIFJlc3RhcnQgUlBTIHRvIHJlbG9hZCB0aGUgdGhy ZXNob2xkcyAqLwo+ICAJSTkxNV9XUklURV9GVyhHRU42X1JQX0NPTlRST0wsCj4gLQkJICAgICAg R0VONl9SUF9NRURJQV9UVVJCTyB8Cj4gLQkJICAgICAgR0VONl9SUF9NRURJQV9IV19OT1JNQUxf TU9ERSB8Cj4gLQkJICAgICAgR0VONl9SUF9NRURJQV9JU19HRlggfAo+IC0JCSAgICAgIEdFTjZf UlBfRU5BQkxFIHwKPiAtCQkgICAgICBHRU42X1JQX1VQX0JVU1lfQVZHIHwKPiAtCQkgICAgICBH RU42X1JQX0RPV05fSURMRV9BVkcpOwo+ICsJCSAgICAgIEk5MTVfUkVBRF9GVyhHRU42X1JQX0NP TlRST0wpIHwgR0VONl9SUF9FTkFCTEUpOwo+ICAKPiAgCWludGVsX3VuY29yZV9mb3JjZXdha2Vf cHV0X19sb2NrZWQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwo+ICAJc3Bpbl91bmxvY2tfaXJx KCZkZXZfcHJpdi0+dW5jb3JlLmxvY2spOwo+IC0tIAo+IDIuMTEuMApfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com ([134.134.136.100]:63311 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbdBTOnJ (ORCPT ); Mon, 20 Feb 2017 09:43:09 -0500 From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: Chris Wilson , stable@vger.kernel.org Subject: Re: [PATCH 6/7] drm/i915: Restart RPS using the same RP_CONTROL as from initialisation In-Reply-To: <20170220094713.22874-6-chris@chris-wilson.co.uk> References: <20170220094713.22874-1-chris@chris-wilson.co.uk> <20170220094713.22874-6-chris@chris-wilson.co.uk> Date: Mon, 20 Feb 2017 16:40:47 +0200 Message-ID: <87tw7pc4cw.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: Chris Wilson writes: > During initialisation, we set different flags for different > architectures - these should be preserved when we reload the RPS > thresholds. If we use a mmio read, it will first ensure that the > threshold registers are written before we apply the latch in RP_CONTROL. > > Signed-off-by: Chris Wilson > Cc: Mika Kuoppala > Cc: stable@vger.kernel.org This will change how the valleyview will do the DOWN_IDLE, due to readback you will get a GEN6_RP_DOWN_IDLE_CONT. I can't think of why we would like to keep that behaviour as the IDLE_CONT setup is a twart in my opinion. If you agree with the above, substitute the IDLE_CONT in valleview setup and you can add, Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/intel_pm.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 3041cd4988a6..d37e95b3525d 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4884,13 +4884,9 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) > GT_INTERVAL_FROM_US(dev_priv, > ei_down * threshold_down / 100)); > > + /* Restart RPS to reload the thresholds */ > I915_WRITE_FW(GEN6_RP_CONTROL, > - GEN6_RP_MEDIA_TURBO | > - GEN6_RP_MEDIA_HW_NORMAL_MODE | > - GEN6_RP_MEDIA_IS_GFX | > - GEN6_RP_ENABLE | > - GEN6_RP_UP_BUSY_AVG | > - GEN6_RP_DOWN_IDLE_AVG); > + I915_READ_FW(GEN6_RP_CONTROL) | GEN6_RP_ENABLE); > > intel_uncore_forcewake_put__locked(dev_priv, FORCEWAKE_ALL); > spin_unlock_irq(&dev_priv->uncore.lock); > -- > 2.11.0