From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from galahad.ideasonboard.com ([185.26.127.97]:59788 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753517AbeALADR (ORCPT ); Thu, 11 Jan 2018 19:03:17 -0500 From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: Sergei Shtylyov , David Airlie , linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH] drm: rcar-du: lvds: fix LVDCR1 for R-Car gen3 Date: Fri, 12 Jan 2018 02:03:14 +0200 Message-ID: <2155302.O1SrlQomor@avalon> In-Reply-To: <20171221202343.596842084@cogentembedded.com> References: <20171221202343.596842084@cogentembedded.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: Hi Sergei, On Thursday, 21 December 2017 22:23:30 EET Sergei Shtylyov wrote: > The LVDCR1 register for the R-Car gen3 SoCs was documented as having the > layout different from the gen2 SoCs in the early R-Car gen3 manuals but > since v0.52 the LVDCR1 layout is described as being the same as on the gen2 > SoCs; the old CHn control values are said to be prohibited now (and there > seems to be no valid output signal when they are used). > > Fixes: 6bc2e15cf21c ("drm: rcar-du: lvds: Add R-Car Gen3 support") > Signed-off-by: Sergei Shtylyov I've tested this on Salvator-X H3 ES1.1, Salvator-XS H3 ES2.0 and Salvator-X M3-W, and the LVDS output works correctly. I assume both settings work on these SoCs, while only the new settings work on V3M. Thus, Reviewed-by: Laurent Pinchart Tested-by: Laurent Pinchart and applied to my tree. > --- > drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 10 ++++------ > drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 6 ++---- > 2 files changed, 6 insertions(+), 10 deletions(-) > > Index: linux/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c > =================================================================== > --- linux.orig/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c > +++ linux/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c > @@ -70,9 +70,8 @@ static void rcar_du_lvdsenc_start_gen2(s > > /* Turn all the channels on. */ > rcar_lvds_write(lvds, LVDCR1, > - LVDCR1_CHSTBY_GEN2(3) | LVDCR1_CHSTBY_GEN2(2) | > - LVDCR1_CHSTBY_GEN2(1) | LVDCR1_CHSTBY_GEN2(0) | > - LVDCR1_CLKSTBY_GEN2); > + LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) | > + LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY); > > /* > * Turn the PLL on, wait for the startup delay, and turn the output > @@ -109,9 +108,8 @@ static void rcar_du_lvdsenc_start_gen3(s > > /* Turn all the channels on. */ > rcar_lvds_write(lvds, LVDCR1, > - LVDCR1_CHSTBY_GEN3(3) | LVDCR1_CHSTBY_GEN3(2) | > - LVDCR1_CHSTBY_GEN3(1) | LVDCR1_CHSTBY_GEN3(0) | > - LVDCR1_CLKSTBY_GEN3); > + LVDCR1_CHSTBY(3) | LVDCR1_CHSTBY(2) | > + LVDCR1_CHSTBY(1) | LVDCR1_CHSTBY(0) | LVDCR1_CLKSTBY); > > /* > * Turn the PLL on, set it to LVDS normal mode, wait for the startup > Index: linux/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h > =================================================================== > --- linux.orig/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h > +++ linux/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h > @@ -26,10 +26,8 @@ > > #define LVDCR1 0x0004 > #define LVDCR1_CKSEL (1 << 15) /* Gen2 only */ > -#define LVDCR1_CHSTBY_GEN2(n) (3 << (2 + (n) * 2)) /* Gen2 only */ > -#define LVDCR1_CHSTBY_GEN3(n) (1 << (2 + (n) * 2)) /* Gen3 only */ > -#define LVDCR1_CLKSTBY_GEN2 (3 << 0) /* Gen2 only */ > -#define LVDCR1_CLKSTBY_GEN3 (1 << 0) /* Gen3 only */ > +#define LVDCR1_CHSTBY(n) (3 << (2 + (n) * 2)) > +#define LVDCR1_CLKSTBY (3 << 0) > > #define LVDPLLCR 0x0008 > #define LVDPLLCR_CEEN (1 << 14) > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH] drm: rcar-du: lvds: fix LVDCR1 for R-Car gen3 Date: Fri, 12 Jan 2018 02:03:14 +0200 Message-ID: <2155302.O1SrlQomor@avalon> References: <20171221202343.596842084@cogentembedded.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32A286E3CE for ; Fri, 12 Jan 2018 00:03:16 +0000 (UTC) In-Reply-To: <20171221202343.596842084@cogentembedded.com> 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: David Airlie , linux-renesas-soc@vger.kernel.org, Sergei Shtylyov List-Id: dri-devel@lists.freedesktop.org SGkgU2VyZ2VpLAoKT24gVGh1cnNkYXksIDIxIERlY2VtYmVyIDIwMTcgMjI6MjM6MzAgRUVUIFNl cmdlaSBTaHR5bHlvdiB3cm90ZToKPiBUaGUgTFZEQ1IxIHJlZ2lzdGVyIGZvciB0aGUgUi1DYXIg Z2VuMyBTb0NzIHdhcyBkb2N1bWVudGVkIGFzIGhhdmluZyB0aGUKPiBsYXlvdXQgZGlmZmVyZW50 IGZyb20gdGhlIGdlbjIgU29DcyBpbiAgdGhlIGVhcmx5IFItQ2FyIGdlbjMgbWFudWFscyBidXQK PiBzaW5jZSB2MC41MiB0aGUgTFZEQ1IxIGxheW91dCBpcyBkZXNjcmliZWQgYXMgYmVpbmcgdGhl IHNhbWUgYXMgb24gdGhlIGdlbjIKPiBTb0NzOyB0aGUgb2xkIENIbiBjb250cm9sIHZhbHVlcyBh cmUgc2FpZCB0byBiZSBwcm9oaWJpdGVkIG5vdyAoYW5kIHRoZXJlCj4gc2VlbXMgdG8gYmUgbm8g dmFsaWQgb3V0cHV0IHNpZ25hbCB3aGVuIHRoZXkgYXJlIHVzZWQpLgo+IAo+IEZpeGVzOiA2YmMy ZTE1Y2YyMWMgKCJkcm06IHJjYXItZHU6IGx2ZHM6IEFkZCBSLUNhciBHZW4zIHN1cHBvcnQiKQo+ IFNpZ25lZC1vZmYtYnk6IFNlcmdlaSBTaHR5bHlvdiA8c2VyZ2VpLnNodHlseW92QGNvZ2VudGVt YmVkZGVkLmNvbT4KCkkndmUgdGVzdGVkIHRoaXMgb24gU2FsdmF0b3ItWCBIMyBFUzEuMSwgU2Fs dmF0b3ItWFMgSDMgRVMyLjAgYW5kIFNhbHZhdG9yLVggCk0zLVcsIGFuZCB0aGUgTFZEUyBvdXRw dXQgd29ya3MgY29ycmVjdGx5LiBJIGFzc3VtZSBib3RoIHNldHRpbmdzIHdvcmsgb24gCnRoZXNl IFNvQ3MsIHdoaWxlIG9ubHkgdGhlIG5ldyBzZXR0aW5ncyB3b3JrIG9uIFYzTS4gVGh1cywKClJl dmlld2VkLWJ5OiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50LnBpbmNoYXJ0QGlkZWFzb25ib2Fy ZC5jb20+ClRlc3RlZC1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydEBpZGVh c29uYm9hcmQuY29tPgoKYW5kIGFwcGxpZWQgdG8gbXkgdHJlZS4KCj4gLS0tCj4gIGRyaXZlcnMv Z3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfbHZkc2VuYy5jIHwgICAxMCArKysrLS0tLS0tCj4gIGRy aXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfbHZkc19yZWdzLmggIHwgICAgNiArKy0tLS0KPiAg MiBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQo+IAo+IElu ZGV4OiBsaW51eC9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2x2ZHNlbmMuYwo+ID09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KPiAtLS0gbGludXgub3JpZy9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1 X2x2ZHNlbmMuYwo+ICsrKyBsaW51eC9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2x2 ZHNlbmMuYwo+IEBAIC03MCw5ICs3MCw4IEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfbHZkc2VuY19z dGFydF9nZW4yKHMKPiAKPiAgCS8qIFR1cm4gYWxsIHRoZSBjaGFubmVscyBvbi4gKi8KPiAgCXJj YXJfbHZkc193cml0ZShsdmRzLCBMVkRDUjEsCj4gLQkJCUxWRENSMV9DSFNUQllfR0VOMigzKSB8 IExWRENSMV9DSFNUQllfR0VOMigyKSB8Cj4gLQkJCUxWRENSMV9DSFNUQllfR0VOMigxKSB8IExW RENSMV9DSFNUQllfR0VOMigwKSB8Cj4gLQkJCUxWRENSMV9DTEtTVEJZX0dFTjIpOwo+ICsJCQlM VkRDUjFfQ0hTVEJZKDMpIHwgTFZEQ1IxX0NIU1RCWSgyKSB8Cj4gKwkJCUxWRENSMV9DSFNUQlko MSkgfCBMVkRDUjFfQ0hTVEJZKDApIHwgTFZEQ1IxX0NMS1NUQlkpOwo+IAo+ICAJLyoKPiAgCSAq IFR1cm4gdGhlIFBMTCBvbiwgd2FpdCBmb3IgdGhlIHN0YXJ0dXAgZGVsYXksIGFuZCB0dXJuIHRo ZSBvdXRwdXQKPiBAQCAtMTA5LDkgKzEwOCw4IEBAIHN0YXRpYyB2b2lkIHJjYXJfZHVfbHZkc2Vu Y19zdGFydF9nZW4zKHMKPiAKPiAgCS8qIFR1cm4gYWxsIHRoZSBjaGFubmVscyBvbi4gKi8KPiAg CXJjYXJfbHZkc193cml0ZShsdmRzLCBMVkRDUjEsCj4gLQkJCUxWRENSMV9DSFNUQllfR0VOMygz KSB8IExWRENSMV9DSFNUQllfR0VOMygyKSB8Cj4gLQkJCUxWRENSMV9DSFNUQllfR0VOMygxKSB8 IExWRENSMV9DSFNUQllfR0VOMygwKSB8Cj4gLQkJCUxWRENSMV9DTEtTVEJZX0dFTjMpOwo+ICsJ CQlMVkRDUjFfQ0hTVEJZKDMpIHwgTFZEQ1IxX0NIU1RCWSgyKSB8Cj4gKwkJCUxWRENSMV9DSFNU QlkoMSkgfCBMVkRDUjFfQ0hTVEJZKDApIHwgTFZEQ1IxX0NMS1NUQlkpOwo+IAo+ICAJLyoKPiAg CSAqIFR1cm4gdGhlIFBMTCBvbiwgc2V0IGl0IHRvIExWRFMgbm9ybWFsIG1vZGUsIHdhaXQgZm9y IHRoZSBzdGFydHVwCj4gSW5kZXg6IGxpbnV4L2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJf bHZkc19yZWdzLmgKPiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Cj4gLS0tIGxpbnV4Lm9yaWcvZHJpdmVycy9ncHUvZHJt L3JjYXItZHUvcmNhcl9sdmRzX3JlZ3MuaAo+ICsrKyBsaW51eC9kcml2ZXJzL2dwdS9kcm0vcmNh ci1kdS9yY2FyX2x2ZHNfcmVncy5oCj4gQEAgLTI2LDEwICsyNiw4IEBACj4gCj4gICNkZWZpbmUg TFZEQ1IxCQkJCTB4MDAwNAo+ICAjZGVmaW5lIExWRENSMV9DS1NFTAkJCSgxIDw8IDE1KQkJLyog R2VuMiBvbmx5ICovCj4gLSNkZWZpbmUgTFZEQ1IxX0NIU1RCWV9HRU4yKG4pCQkoMyA8PCAoMiAr IChuKSAqIDIpKQkvKiBHZW4yIG9ubHkgKi8KPiAtI2RlZmluZSBMVkRDUjFfQ0hTVEJZX0dFTjMo bikJCSgxIDw8ICgyICsgKG4pICogMikpCS8qIEdlbjMgb25seSAqLwo+IC0jZGVmaW5lIExWRENS MV9DTEtTVEJZX0dFTjIJCSgzIDw8IDApCQkvKiBHZW4yIG9ubHkgKi8KPiAtI2RlZmluZSBMVkRD UjFfQ0xLU1RCWV9HRU4zCQkoMSA8PCAwKQkJLyogR2VuMyBvbmx5ICovCj4gKyNkZWZpbmUgTFZE Q1IxX0NIU1RCWShuKQkJKDMgPDwgKDIgKyAobikgKiAyKSkKPiArI2RlZmluZSBMVkRDUjFfQ0xL U1RCWQkJCSgzIDw8IDApCj4gCj4gICNkZWZpbmUgTFZEUExMQ1IJCQkweDAwMDgKPiAgI2RlZmlu ZSBMVkRQTExDUl9DRUVOCQkJKDEgPDwgMTQpCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgoKLS0gClJlZ2FyZHMsCgpMYXVyZW50IFBpbmNo YXJ0CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK