From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Christian_K=c3=b6nig?= Subject: Re: [PATCH 1/2] drm/amd/powerplay: fix bugs of checking if dpm is running on Tonga Date: Fri, 20 May 2016 15:54:57 +0200 Message-ID: <573F1731.7020800@vodafone.de> References: <1463752436-28045-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id A716C6EACC for ; Fri, 20 May 2016 13:55:05 +0000 (UTC) In-Reply-To: <1463752436-28045-1-git-send-email-deathsimple@vodafone.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: daniel.vetter@ffwll.ch, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org UGxlYXNlIGlnbm9yZSB0aGlzIG9uZSwgSSB3YXMgb24gdGhlIHdyb25nIGJyYW5jaCB3aGlsZSBz ZW5kaW5nIG1haWxzLgoKQ2hyaXN0aWFuLgoKQW0gMjAuMDUuMjAxNiB1bSAxNTo1MyBzY2hyaWVi IENocmlzdGlhbiBLw7ZuaWc6Cj4gRnJvbTogRXJpYyBIdWFuZyA8SmluSHVpRXJpYy5IdWFuZ0Bh bWQuY29tPgo+Cj4gRml4ZXMgT0QgZmFpbHVyZXMgb24gVG9uZ2EuCj4KPiBSZXZpZXdlZC1ieTog QWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgo+IFNpZ25lZC1vZmYtYnk6 IEVyaWMgSHVhbmcgPEppbkh1aUVyaWMuSHVhbmdAYW1kLmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBB bGV4IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Cj4gLS0tCj4gICBkcml2ZXJz L2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci90b25nYV9od21nci5jIHwgOCArKysrLS0tLQo+ ICAgMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKPgo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci90b25nYV9od21n ci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvdG9uZ2FfaHdtZ3IuYwo+ IGluZGV4IGNiMjgzMzUuLjdjM2Y4MmIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9wb3dlcnBsYXkvaHdtZ3IvdG9uZ2FfaHdtZ3IuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvcG93ZXJwbGF5L2h3bWdyL3RvbmdhX2h3bWdyLmMKPiBAQCAtNTMzMSw3ICs1MzMxLDcgQEAg c3RhdGljIGludCB0b25nYV9mcmVlemVfc2Nsa19tY2xrX2RwbShzdHJ1Y3QgcHBfaHdtZ3IgKmh3 bWdyKQo+ICAgCQkoZGF0YS0+bmVlZF91cGRhdGVfc211N19kcG1fdGFibGUgJgo+ICAgCQkoRFBN VEFCTEVfT0RfVVBEQVRFX1NDTEsgKyBEUE1UQUJMRV9VUERBVEVfU0NMSykpKSB7Cj4gICAJCVBQ X0FTU0VSVF9XSVRIX0NPREUoCj4gLQkJCXRydWUgPT0gdG9uZ2FfaXNfZHBtX3J1bm5pbmcoaHdt Z3IpLAo+ICsJCQkwID09IHRvbmdhX2lzX2RwbV9ydW5uaW5nKGh3bWdyKSwKPiAgIAkJCSJUcnlp bmcgdG8gZnJlZXplIFNDTEsgRFBNIHdoZW4gRFBNIGlzIGRpc2FibGVkIiwKPiAgIAkJCSk7Cj4g ICAJCVBQX0FTU0VSVF9XSVRIX0NPREUoCj4gQEAgLTUzNDQsNyArNTM0NCw3IEBAIHN0YXRpYyBp bnQgdG9uZ2FfZnJlZXplX3NjbGtfbWNsa19kcG0oc3RydWN0IHBwX2h3bWdyICpod21ncikKPiAg IAlpZiAoKDAgPT0gZGF0YS0+bWNsa19kcG1fa2V5X2Rpc2FibGVkKSAmJgo+ICAgCQkoZGF0YS0+ bmVlZF91cGRhdGVfc211N19kcG1fdGFibGUgJgo+ICAgCQkgRFBNVEFCTEVfT0RfVVBEQVRFX01D TEspKSB7Cj4gLQkJUFBfQVNTRVJUX1dJVEhfQ09ERSh0cnVlID09IHRvbmdhX2lzX2RwbV9ydW5u aW5nKGh3bWdyKSwKPiArCQlQUF9BU1NFUlRfV0lUSF9DT0RFKDAgPT0gdG9uZ2FfaXNfZHBtX3J1 bm5pbmcoaHdtZ3IpLAo+ICAgCQkJIlRyeWluZyB0byBmcmVlemUgTUNMSyBEUE0gd2hlbiBEUE0g aXMgZGlzYWJsZWQiLAo+ICAgCQkJKTsKPiAgIAkJUFBfQVNTRVJUX1dJVEhfQ09ERSgKPiBAQCAt NTY0Nyw3ICs1NjQ3LDcgQEAgc3RhdGljIGludCB0b25nYV91bmZyZWV6ZV9zY2xrX21jbGtfZHBt KHN0cnVjdCBwcF9od21nciAqaHdtZ3IpCj4gICAJCShkYXRhLT5uZWVkX3VwZGF0ZV9zbXU3X2Rw bV90YWJsZSAmCj4gICAJCShEUE1UQUJMRV9PRF9VUERBVEVfU0NMSyArIERQTVRBQkxFX1VQREFU RV9TQ0xLKSkpIHsKPiAgIAo+IC0JCVBQX0FTU0VSVF9XSVRIX0NPREUodHJ1ZSA9PSB0b25nYV9p c19kcG1fcnVubmluZyhod21nciksCj4gKwkJUFBfQVNTRVJUX1dJVEhfQ09ERSgwID09IHRvbmdh X2lzX2RwbV9ydW5uaW5nKGh3bWdyKSwKPiAgIAkJCSJUcnlpbmcgdG8gVW5mcmVlemUgU0NMSyBE UE0gd2hlbiBEUE0gaXMgZGlzYWJsZWQiLAo+ICAgCQkJKTsKPiAgIAkJUFBfQVNTRVJUX1dJVEhf Q09ERSgKPiBAQCAtNTY2MSw3ICs1NjYxLDcgQEAgc3RhdGljIGludCB0b25nYV91bmZyZWV6ZV9z Y2xrX21jbGtfZHBtKHN0cnVjdCBwcF9od21nciAqaHdtZ3IpCj4gICAJCShkYXRhLT5uZWVkX3Vw ZGF0ZV9zbXU3X2RwbV90YWJsZSAmIERQTVRBQkxFX09EX1VQREFURV9NQ0xLKSkgewo+ICAgCj4g ICAJCVBQX0FTU0VSVF9XSVRIX0NPREUoCj4gLQkJCQl0cnVlID09IHRvbmdhX2lzX2RwbV9ydW5u aW5nKGh3bWdyKSwKPiArCQkJCTAgPT0gdG9uZ2FfaXNfZHBtX3J1bm5pbmcoaHdtZ3IpLAo+ICAg CQkJCSJUcnlpbmcgdG8gVW5mcmVlemUgTUNMSyBEUE0gd2hlbiBEUE0gaXMgZGlzYWJsZWQiLAo+ ICAgCQkJCSk7Cj4gICAJCVBQX0FTU0VSVF9XSVRIX0NPREUoCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756049AbcETODV (ORCPT ); Fri, 20 May 2016 10:03:21 -0400 Received: from pegasos-out.vodafone.de ([80.84.1.38]:47008 "EHLO pegasos-out.vodafone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751258AbcETODS (ORCPT ); Fri, 20 May 2016 10:03:18 -0400 X-Spam-Flag: NO X-Spam-Score: -0.045 Authentication-Results: rohrpostix1.prod.vfnet.de (amavisd-new); dkim=pass header.i=@vodafone.de X-DKIM: OpenDKIM Filter v2.6.8 pegasos-out.vodafone.de 3CFEC261A53 Subject: Re: [PATCH 1/2] drm/amd/powerplay: fix bugs of checking if dpm is running on Tonga To: dri-devel@lists.freedesktop.org References: <1463752436-28045-1-git-send-email-deathsimple@vodafone.de> Cc: daniel.vetter@ffwll.ch, linux-kernel@vger.kernel.org From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <573F1731.7020800@vodafone.de> Date: Fri, 20 May 2016 15:54:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 In-Reply-To: <1463752436-28045-1-git-send-email-deathsimple@vodafone.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Please ignore this one, I was on the wrong branch while sending mails. Christian. Am 20.05.2016 um 15:53 schrieb Christian König: > From: Eric Huang > > Fixes OD failures on Tonga. > > Reviewed-by: Alex Deucher > Signed-off-by: Eric Huang > Signed-off-by: Alex Deucher > --- > drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c > index cb28335..7c3f82b 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c > @@ -5331,7 +5331,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > (data->need_update_smu7_dpm_table & > (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { > PP_ASSERT_WITH_CODE( > - true == tonga_is_dpm_running(hwmgr), > + 0 == tonga_is_dpm_running(hwmgr), > "Trying to freeze SCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE( > @@ -5344,7 +5344,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > if ((0 == data->mclk_dpm_key_disabled) && > (data->need_update_smu7_dpm_table & > DPMTABLE_OD_UPDATE_MCLK)) { > - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), > + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), > "Trying to freeze MCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE( > @@ -5647,7 +5647,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > (data->need_update_smu7_dpm_table & > (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { > > - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), > + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), > "Trying to Unfreeze SCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE( > @@ -5661,7 +5661,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) > (data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_MCLK)) { > > PP_ASSERT_WITH_CODE( > - true == tonga_is_dpm_running(hwmgr), > + 0 == tonga_is_dpm_running(hwmgr), > "Trying to Unfreeze MCLK DPM when DPM is disabled", > ); > PP_ASSERT_WITH_CODE(