From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [Intel-gfx] [PATCH] drm/i915: Clear pipe's pll hw state in hsw_dp_set_ddi_pll_sel() Date: Tue, 30 Jun 2015 18:41:33 +0300 Message-ID: <87pp4d2ogi.fsf@intel.com> References: <878ub1wdur.fsf@intel.com> <1435669838-24747-1-git-send-email-ander.conselvan.de.oliveira@intel.com> <876165wbol.fsf@intel.com> <20150630142256.GZ30960@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20150630142256.GZ30960@phenom.ffwll.local> 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: Ander Conselvan de Oliveira , intel-gfx , Linux Kernel Mailing List , DRI mailing list , Daniel Vetter , Linus Torvalds List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAzMCBKdW4gMjAxNSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBUdWUsIEp1biAzMCwgMjAxNSBhdCAwNDo0NzowNlBNICswMzAwLCBKYW5pIE5pa3Vs YSB3cm90ZToKPj4gT24gVHVlLCAzMCBKdW4gMjAxNSwgQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZl aXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPiB3cm90ZToKPj4gPiBT aW1pbGFybHkgdG8gd2hhdCBpcyBkb25lIGZvciBTS0wsIGNsZWFyIHRoZSBkcGxsX2h3X3N0YXRl IG9mIHRoZSBwaXBlCj4+ID4gY29uZmlnIGluIGhzd19kcF9zZXRfZGRpX3BsbF9zZWwoKSwgc2lu Y2UgaXQgbWFpbiBjb250YWluIHN0YWxlIHZhbHVlcy4KPj4gPiBUaGF0IGNhbiBoYXBwZW4gaWYg YSBjcnRjIHRoYXQgd2FzIHByZXZpb3VzbHkgZHJpdmluZyBhbiBIRE1JIGNvbm5lY3Rvcgo+PiA+ IHN3aXRjaGVzIHRvIGEgRFAgY29ubmVjdG9yLiBJbiB0aGF0IGNhc2UsIHRoZSB3cnBsbCBmaWVs ZCB3YXMgbGVmdCB3aXRoCj4+ID4gaXRzIG9sZCB2YWx1ZSwgbGVhZGluZyB0byB3YXJuaW5ncyBs aWtlIHRoZSBvbmUgYmVsb3c6Cj4+ID4KPj4gPiBbZHJtOmNoZWNrX2NydGNfc3RhdGUgW2k5MTVd XSAqRVJST1IqIG1pc21hdGNoIGluIGRwbGxfaHdfc3RhdGUud3JwbGwgKGV4cGVjdGVkIDB4YjAz NTA2MWYsIGZvdW5kIDB4MDAwMDAwMDApCj4+ID4gLS0tLS0tLS0tLS0tWyBjdXQgaGVyZSBdLS0t LS0tLS0tLS0tCj4+ID4gV0FSTklORzogQ1BVOiAxIFBJRDogNzY3IGF0IGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYzoxMjMyNCBjaGVja19jcnRjX3N0YXRlKzB4OTc1LzB4MTBi MCBbaTkxNV0oKQo+PiA+IHBpcGUgc3RhdGUgZG9lc24ndCBtYXRjaCEKPj4gPgo+PiA+IFRoaXMg cmVncmVzc2lvbiB3YXMgaW5kcm9kdWNlZCBpbgo+PiA+Cj4+ID4gY29tbWl0IGRkM2NkNzRhY2Yx MjcyMzA0NWE2NGYxZjJjNjI5OGFjN2IzNGE1ZDUKPj4gPiBBdXRob3I6IEFuZGVyIENvbnNlbHZh biBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KPj4g PiBEYXRlOiAgIEZyaSBNYXkgMTUgMTM6MzQ6MjkgMjAxNSArMDMwMAo+PiA+Cj4+ID4gICAgIGRy bS9pOTE1OiBEb24ndCBvdmVyd3JpdGUgKGUpRFAgUExMIHNlbGVjdGlvbiBvbiBTS0wKPj4gPgo+ PiA+IFNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29u c2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KPj4gCj4+IFJlcG9ydGVkLWJ5OiBMaW51cyBU b3J2YWxkcyA8dG9ydmFsZHNAbGludXgtZm91bmRhdGlvbi5vcmc+Cj4+IFRlc3RlZC1ieTogSmFu aSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KPgo+IFllYWggbWFrZXMgc2Vuc2UgYXMg YSBmaXggZm9yIDQuMi4gQnV0IGZvciA0LjMgSSB3b25kZXIgd2hldGhlciB0aGUKPiBvcmlnaW5h bCBjb21taXQgdGhhdCBzdGFydGVkIHRoaXMgY2hhaW4gbmVlZHMgdG8gYmUgY2hhbmdlZCBhIGJp dDoKPgo+IGNvbW1pdCA0OTc4Y2M5M2Q5YWMyNDBiNDM1Y2U2MDQzMWFlZjI0MjM5YjRjMjcwCj4g QXV0aG9yOiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5v bGl2ZWlyYUBpbnRlbC5jb20+Cj4gRGF0ZTogICBUdWUgQXByIDIxIDE3OjEzOjIxIDIwMTUgKzAz MDAKPgo+ICAgICBkcm0vaTkxNTogUHJlc2VydmUgc2hhcmVkIERQTEwgaW5mb3JtYXRpb24gaW4g bmV3IHBpcGVfY29uZmlnCj4KPiBBbGwgdGhlIHRyb3VibGUgdGhpcyBjYXVzZWQgaXMgYmVjYXVz ZSBpdCBub3Qgb25seSBwcmVzZXJ2ZXMgdGhlIHNoYXJpbmcKPiBjb25maWcgKGluIGNydGNfc3Rh dGUtPnNoYXJlZF9kcGxsKSBidXQgYWxzbyB0aGUgLT5kcGxsX2h3X3N0YXRlLiBBbmQgSQo+IHRo aW5rIHdpdGggTWFhcnRlbidzIGxhdGVzdCBjb2RlIChmb3IgNC4zKSB3ZSdkIGp1c3QgZG8gYW4g dW5jb25kaXRpb25hbAo+IGNvbXB1dGVfY29uZmlnIChuZWVkIGl0IGZvciBmYXN0IHBmaXQgdXBk YXRlcyBhbmQgZmFzdGJvb3QpLCB3aGljaCBtZWFucwo+IHRoZSBib2d1cyB2YWx1ZXMgaW4gLT5k cGxsX2h3X3N0YXRlIGFyZW4ndCBhIHByb2JsZW0gYW55IG1vcmUgc2luY2Ugd2UnbGwKPiBvdmVy d3JpdGUgdGhlbSBhZ2Fpbi4gQW5kIHRoZW4gd2UgY291bGQgcmVtb3ZlIHRoYXQgc3ByaW5rbGUg b2YgbWVtc2V0cyB3ZQo+IGhhdmUgYWxsIG92ZXIsIHdoaWNoIHdvdWxkIGJlIGdvb2QgKHNpbmNl IHRoZSBjdXJyZW50IGFwcHJvYWNoIGlzCj4gb2J2aW91c2x5IGEgYml0IGZyYWdpbGUpLiBBbnl3 YXk6Cj4KPiBSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5j aD4KClB1c2hlZCB0byBkcm0taW50ZWwtbmV4dC1maXhlcywgdGhhbmtzIGZvciB0aGUgcGF0Y2gg YW5kIHJldmlldy4gT25lCmRvd24sIGFub3RoZXIgb25lIGxlZnQgdG8gZml4LgoKQlIsCkphbmku CgoKPgo+IFRoYW5rcywgRGFuaWVsCj4KPj4gCj4+ID4gLS0tCj4+ID4KPj4gPiBPbmx5IGNvbXBp bGUgdGVzdGVkLCBmb3IgdGhlIHdycGxsIHdhcm5pbmcuCj4+ID4KPj4gPiBUaGFua3MsCj4+ID4g QW5kZXIKPj4gPgo+PiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgMyArKysK Pj4gPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQo+PiA+Cj4+ID4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jCj4+ID4gaW5kZXggNGViZmMzYS4uZmJkOWFjMyAxMDA2NDQKPj4gPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4+ID4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYwo+PiA+IEBAIC0xMTQ3LDYgKzExNDcsOSBAQCBza2xfZWRwX3Nl dF9wbGxfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywgaW50IGxp bmtfY2xvY2spCj4+ID4gIHN0YXRpYyB2b2lkCj4+ID4gIGhzd19kcF9zZXRfZGRpX3BsbF9zZWwo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLCBpbnQgbGlua19idykKPj4gPiAg ewo+PiA+ICsJbWVtc2V0KCZwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZSwgMCwKPj4gPiArCSAg ICAgICBzaXplb2YocGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUpKTsKPj4gPiArCj4+ID4gIAlz d2l0Y2ggKGxpbmtfYncpIHsKPj4gPiAgCWNhc2UgRFBfTElOS19CV18xXzYyOgo+PiA+ICAJCXBp cGVfY29uZmlnLT5kZGlfcGxsX3NlbCA9IFBPUlRfQ0xLX1NFTF9MQ1BMTF84MTA7Cj4+ID4gLS0g Cj4+ID4gMi4xLjAKPj4gPgo+PiAKPj4gLS0gCj4+IEphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNv dXJjZSBUZWNobm9sb2d5IENlbnRlcgo+PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwo+PiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4+IEludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKPj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo+Cj4gLS0gCj4gRGFuaWVsIFZldHRlcgo+IFNvZnR3YXJl IEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgo+IGh0dHA6Ly9ibG9nLmZmd2xsLmNoCgotLSAK SmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752980AbbF3Pnx (ORCPT ); Tue, 30 Jun 2015 11:43:53 -0400 Received: from mga09.intel.com ([134.134.136.24]:25995 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751950AbbF3Pnp (ORCPT ); Tue, 30 Jun 2015 11:43:45 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,378,1432623600"; d="scan'208";a="753354674" From: Jani Nikula To: Daniel Vetter Cc: Ander Conselvan de Oliveira , Dave Airlie , intel-gfx , Linux Kernel Mailing List , DRI mailing list , Daniel Vetter , Linus Torvalds Subject: Re: [Intel-gfx] [PATCH] drm/i915: Clear pipe's pll hw state in hsw_dp_set_ddi_pll_sel() In-Reply-To: <20150630142256.GZ30960@phenom.ffwll.local> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <878ub1wdur.fsf@intel.com> <1435669838-24747-1-git-send-email-ander.conselvan.de.oliveira@intel.com> <876165wbol.fsf@intel.com> <20150630142256.GZ30960@phenom.ffwll.local> User-Agent: Notmuch/0.19+112~g77230b0 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Tue, 30 Jun 2015 18:41:33 +0300 Message-ID: <87pp4d2ogi.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 30 Jun 2015, Daniel Vetter wrote: > On Tue, Jun 30, 2015 at 04:47:06PM +0300, Jani Nikula wrote: >> On Tue, 30 Jun 2015, Ander Conselvan de Oliveira wrote: >> > Similarly to what is done for SKL, clear the dpll_hw_state of the pipe >> > config in hsw_dp_set_ddi_pll_sel(), since it main contain stale values. >> > That can happen if a crtc that was previously driving an HDMI connector >> > switches to a DP connector. In that case, the wrpll field was left with >> > its old value, leading to warnings like the one below: >> > >> > [drm:check_crtc_state [i915]] *ERROR* mismatch in dpll_hw_state.wrpll (expected 0xb035061f, found 0x00000000) >> > ------------[ cut here ]------------ >> > WARNING: CPU: 1 PID: 767 at drivers/gpu/drm/i915/intel_display.c:12324 check_crtc_state+0x975/0x10b0 [i915]() >> > pipe state doesn't match! >> > >> > This regression was indroduced in >> > >> > commit dd3cd74acf12723045a64f1f2c6298ac7b34a5d5 >> > Author: Ander Conselvan de Oliveira >> > Date: Fri May 15 13:34:29 2015 +0300 >> > >> > drm/i915: Don't overwrite (e)DP PLL selection on SKL >> > >> > Signed-off-by: Ander Conselvan de Oliveira >> >> Reported-by: Linus Torvalds >> Tested-by: Jani Nikula > > Yeah makes sense as a fix for 4.2. But for 4.3 I wonder whether the > original commit that started this chain needs to be changed a bit: > > commit 4978cc93d9ac240b435ce60431aef24239b4c270 > Author: Ander Conselvan de Oliveira > Date: Tue Apr 21 17:13:21 2015 +0300 > > drm/i915: Preserve shared DPLL information in new pipe_config > > All the trouble this caused is because it not only preserves the sharing > config (in crtc_state->shared_dpll) but also the ->dpll_hw_state. And I > think with Maarten's latest code (for 4.3) we'd just do an unconditional > compute_config (need it for fast pfit updates and fastboot), which means > the bogus values in ->dpll_hw_state aren't a problem any more since we'll > overwrite them again. And then we could remove that sprinkle of memsets we > have all over, which would be good (since the current approach is > obviously a bit fragile). Anyway: > > Reviewed-by: Daniel Vetter Pushed to drm-intel-next-fixes, thanks for the patch and review. One down, another one left to fix. BR, Jani. > > Thanks, Daniel > >> >> > --- >> > >> > Only compile tested, for the wrpll warning. >> > >> > Thanks, >> > Ander >> > >> > drivers/gpu/drm/i915/intel_dp.c | 3 +++ >> > 1 file changed, 3 insertions(+) >> > >> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> > index 4ebfc3a..fbd9ac3 100644 >> > --- a/drivers/gpu/drm/i915/intel_dp.c >> > +++ b/drivers/gpu/drm/i915/intel_dp.c >> > @@ -1147,6 +1147,9 @@ skl_edp_set_pll_config(struct intel_crtc_state *pipe_config, int link_clock) >> > static void >> > hsw_dp_set_ddi_pll_sel(struct intel_crtc_state *pipe_config, int link_bw) >> > { >> > + memset(&pipe_config->dpll_hw_state, 0, >> > + sizeof(pipe_config->dpll_hw_state)); >> > + >> > switch (link_bw) { >> > case DP_LINK_BW_1_62: >> > pipe_config->ddi_pll_sel = PORT_CLK_SEL_LCPLL_810; >> > -- >> > 2.1.0 >> > >> >> -- >> Jani Nikula, Intel Open Source Technology Center >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Jani Nikula, Intel Open Source Technology Center