From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vTwJw2nS0zDqTx for ; Fri, 24 Feb 2017 13:38:40 +1100 (AEDT) Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vTwJv4RmFz9s7R for ; Fri, 24 Feb 2017 13:38:39 +1100 (AEDT) Message-ID: <1487903902.23576.253.camel@kernel.crashing.org> Subject: Re: [PATCH 05/12] drm/ast: Fix calculation of MCLK From: Benjamin Herrenschmidt To: Joel Stanley Cc: dri-devel@lists.freedesktop.org, linuxppc-dev@ozlabs.org, airlied@redhat.com, "Y . C . Chen" , eich@suse.com Date: Fri, 24 Feb 2017 13:38:22 +1100 In-Reply-To: References: <20170223225357.9572-1-benh@kernel.crashing.org> <20170223225357.9572-5-benh@kernel.crashing.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, 2017-02-24 at 12:54 +1030, Joel Stanley wrote: > On Fri, Feb 24, 2017 at 9:23 AM, Benjamin Herrenschmidt > wrote: > > Some braces were missing causing an incorrect calculation. > > > > Y.C. Chen from Aspeed provided me with the right formula > > which I tested on AST2400 and 2500. > > Y. C. Chen, can you point out this calculation in the programming > guide? > > All of the PLL calculations I can find in the ast2400 documentation > are different to this one. Different PLL register, see my other email. I've checked the result of the calculation on our AST2500 and AST2400 machines. Cheers, Ben. > Cheers, > > Joel > > > > > The MCLK isn't currently used by the driver (it will eventually > > to filter modes) so the issue isn't catastrophic. > > > > Also make the printed value a bit more meaningful > > > > Signed-off-by: Benjamin Herrenschmidt > > --- > >  drivers/gpu/drm/ast/ast_main.c | 6 ++++-- > >  1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/ast/ast_main.c > > b/drivers/gpu/drm/ast/ast_main.c > > index 718c15b..d194af3 100644 > > --- a/drivers/gpu/drm/ast/ast_main.c > > +++ b/drivers/gpu/drm/ast/ast_main.c > > @@ -352,7 +352,7 @@ static int ast_get_dram_info(struct drm_device > > *dev) > >                 div = 0x1; > >                 break; > >         } > > -       ast->mclk = ref_pll * (num + 2) / (denum + 2) * (div * > > 1000); > > +       ast->mclk = ref_pll * (num + 2) / ((denum + 2) * (div * > > 1000)); > >         return 0; > >  } > > > > @@ -496,7 +496,9 @@ int ast_driver_load(struct drm_device *dev, > > unsigned long flags) > >                 if (ret) > >                         goto out_free; > >                 ast->vram_size = ast_get_vram_info(dev); > > -               DRM_INFO("dram %d %d %d %08x\n", ast->mclk, ast- > > >dram_type, ast->dram_bus_width, ast->vram_size); > > +               DRM_INFO("dram MCLK=%u Mhz type=%d bus_width=%d > > size=%08x\n", > > +                        ast->mclk, ast->dram_type, > > +                        ast->dram_bus_width, ast->vram_size); > >         } > > > >         if (need_post) > > -- > > 2.9.3 > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Re: [PATCH 05/12] drm/ast: Fix calculation of MCLK Date: Fri, 24 Feb 2017 13:38:22 +1100 Message-ID: <1487903902.23576.253.camel@kernel.crashing.org> References: <20170223225357.9572-1-benh@kernel.crashing.org> <20170223225357.9572-5-benh@kernel.crashing.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC2846EB96 for ; Fri, 24 Feb 2017 02:38:36 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Joel Stanley Cc: linuxppc-dev@ozlabs.org, eich@suse.com, dri-devel@lists.freedesktop.org, airlied@redhat.com List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCAyMDE3LTAyLTI0IGF0IDEyOjU0ICsxMDMwLCBKb2VsIFN0YW5sZXkgd3JvdGU6Cj4g T24gRnJpLCBGZWIgMjQsIDIwMTcgYXQgOToyMyBBTSwgQmVuamFtaW4gSGVycmVuc2NobWlkdAo+ IDxiZW5oQGtlcm5lbC5jcmFzaGluZy5vcmc+IHdyb3RlOgo+ID4gU29tZSBicmFjZXMgd2VyZSBt aXNzaW5nIGNhdXNpbmcgYW4gaW5jb3JyZWN0IGNhbGN1bGF0aW9uLgo+ID4gCj4gPiBZLkMuIENo ZW4gZnJvbSBBc3BlZWQgcHJvdmlkZWQgbWUgd2l0aCB0aGUgcmlnaHQgZm9ybXVsYQo+ID4gd2hp Y2ggSSB0ZXN0ZWQgb24gQVNUMjQwMCBhbmQgMjUwMC4KPiAKPiBZLiBDLiBDaGVuLCBjYW4geW91 IHBvaW50IG91dCB0aGlzIGNhbGN1bGF0aW9uIGluIHRoZSBwcm9ncmFtbWluZwo+IGd1aWRlPwo+ IAo+IEFsbCBvZiB0aGUgUExMIGNhbGN1bGF0aW9ucyBJIGNhbiBmaW5kIGluIHRoZSBhc3QyNDAw IGRvY3VtZW50YXRpb24KPiBhcmUgZGlmZmVyZW50IHRvIHRoaXMgb25lLgoKRGlmZmVyZW50IFBM TCByZWdpc3Rlciwgc2VlIG15IG90aGVyIGVtYWlsLiBJJ3ZlIGNoZWNrZWQgdGhlIHJlc3VsdApv ZiB0aGUgY2FsY3VsYXRpb24gb24gb3VyIEFTVDI1MDAgYW5kIEFTVDI0MDAgbWFjaGluZXMuCgpD aGVlcnMsCkJlbi4KCj4gQ2hlZXJzLAo+IAo+IEpvZWwKPiAKPiA+IAo+ID4gVGhlIE1DTEsgaXNu J3QgY3VycmVudGx5IHVzZWQgYnkgdGhlIGRyaXZlciAoaXQgd2lsbCBldmVudHVhbGx5Cj4gPiB0 byBmaWx0ZXIgbW9kZXMpIHNvIHRoZSBpc3N1ZSBpc24ndCBjYXRhc3Ryb3BoaWMuCj4gPiAKPiA+ IEFsc28gbWFrZSB0aGUgcHJpbnRlZCB2YWx1ZSBhIGJpdCBtb3JlIG1lYW5pbmdmdWwKPiA+IAo+ ID4gU2lnbmVkLW9mZi1ieTogQmVuamFtaW4gSGVycmVuc2NobWlkdCA8YmVuaEBrZXJuZWwuY3Jh c2hpbmcub3JnPgo+ID4gLS0tCj4gPiDCoGRyaXZlcnMvZ3B1L2RybS9hc3QvYXN0X21haW4uYyB8 IDYgKysrKy0tCj4gPiDCoDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDIgZGVsZXRp b25zKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9tYWlu LmMKPiA+IGIvZHJpdmVycy9ncHUvZHJtL2FzdC9hc3RfbWFpbi5jCj4gPiBpbmRleCA3MThjMTVi Li5kMTk0YWYzIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FzdC9hc3RfbWFpbi5j Cj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYXN0L2FzdF9tYWluLmMKPiA+IEBAIC0zNTIsNyAr MzUyLDcgQEAgc3RhdGljIGludCBhc3RfZ2V0X2RyYW1faW5mbyhzdHJ1Y3QgZHJtX2RldmljZQo+ ID4gKmRldikKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgZGl2ID0gMHgxOwo+ ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBicmVhazsKPiA+IMKgwqDCoMKgwqDC oMKgwqB9Cj4gPiAtwqDCoMKgwqDCoMKgwqBhc3QtPm1jbGsgPSByZWZfcGxsICogKG51bSArIDIp IC8gKGRlbnVtICsgMikgKiAoZGl2ICoKPiA+IDEwMDApOwo+ID4gK8KgwqDCoMKgwqDCoMKgYXN0 LT5tY2xrID0gcmVmX3BsbCAqIChudW0gKyAyKSAvICgoZGVudW0gKyAyKSAqIChkaXYgKgo+ID4g MTAwMCkpOwo+ID4gwqDCoMKgwqDCoMKgwqDCoHJldHVybiAwOwo+ID4gwqB9Cj4gPiAKPiA+IEBA IC00OTYsNyArNDk2LDkgQEAgaW50IGFzdF9kcml2ZXJfbG9hZChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ID4gdW5zaWduZWQgbG9uZyBmbGFncykKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgaWYgKHJldCkKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoGdvdG8gb3V0X2ZyZWU7Cj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoGFzdC0+dnJhbV9zaXplID0gYXN0X2dldF92cmFtX2luZm8oZGV2KTsKPiA+IC3CoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBEUk1fSU5GTygiZHJhbSAlZCAlZCAlZCAlMDh4XG4i LCBhc3QtPm1jbGssIGFzdC0KPiA+ID5kcmFtX3R5cGUsIGFzdC0+ZHJhbV9idXNfd2lkdGgsIGFz dC0+dnJhbV9zaXplKTsKPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBEUk1fSU5G TygiZHJhbSBNQ0xLPSV1IE1oeiB0eXBlPSVkIGJ1c193aWR0aD0lZAo+ID4gc2l6ZT0lMDh4XG4i LAo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoGFz dC0+bWNsaywgYXN0LT5kcmFtX3R5cGUsCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgYXN0LT5kcmFtX2J1c193aWR0aCwgYXN0LT52cmFtX3NpemUp Owo+ID4gwqDCoMKgwqDCoMKgwqDCoH0KPiA+IAo+ID4gwqDCoMKgwqDCoMKgwqDCoGlmIChuZWVk X3Bvc3QpCj4gPiAtLQo+ID4gMi45LjMKPiA+IApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK