From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Clear pipe's pll hw state in hsw_dp_set_ddi_pll_sel() Date: Tue, 30 Jun 2015 16:47:06 +0300 Message-ID: <876165wbol.fsf@intel.com> References: <878ub1wdur.fsf@intel.com> <1435669838-24747-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1435669838-24747-1-git-send-email-ander.conselvan.de.oliveira@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Cc: Ander Conselvan de Oliveira , Dave Airlie , intel-gfx , Linux Kernel Mailing List , DRI mailing list , Daniel Vetter , Linus Torvalds List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAzMCBKdW4gMjAxNSwgQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5j b25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPiB3cm90ZToKPiBTaW1pbGFybHkgdG8gd2hh dCBpcyBkb25lIGZvciBTS0wsIGNsZWFyIHRoZSBkcGxsX2h3X3N0YXRlIG9mIHRoZSBwaXBlCj4g Y29uZmlnIGluIGhzd19kcF9zZXRfZGRpX3BsbF9zZWwoKSwgc2luY2UgaXQgbWFpbiBjb250YWlu IHN0YWxlIHZhbHVlcy4KPiBUaGF0IGNhbiBoYXBwZW4gaWYgYSBjcnRjIHRoYXQgd2FzIHByZXZp b3VzbHkgZHJpdmluZyBhbiBIRE1JIGNvbm5lY3Rvcgo+IHN3aXRjaGVzIHRvIGEgRFAgY29ubmVj dG9yLiBJbiB0aGF0IGNhc2UsIHRoZSB3cnBsbCBmaWVsZCB3YXMgbGVmdCB3aXRoCj4gaXRzIG9s ZCB2YWx1ZSwgbGVhZGluZyB0byB3YXJuaW5ncyBsaWtlIHRoZSBvbmUgYmVsb3c6Cj4KPiBbZHJt OmNoZWNrX2NydGNfc3RhdGUgW2k5MTVdXSAqRVJST1IqIG1pc21hdGNoIGluIGRwbGxfaHdfc3Rh dGUud3JwbGwgKGV4cGVjdGVkIDB4YjAzNTA2MWYsIGZvdW5kIDB4MDAwMDAwMDApCj4gLS0tLS0t LS0tLS0tWyBjdXQgaGVyZSBdLS0tLS0tLS0tLS0tCj4gV0FSTklORzogQ1BVOiAxIFBJRDogNzY3 IGF0IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYzoxMjMyNCBjaGVja19jcnRj X3N0YXRlKzB4OTc1LzB4MTBiMCBbaTkxNV0oKQo+IHBpcGUgc3RhdGUgZG9lc24ndCBtYXRjaCEK Pgo+IFRoaXMgcmVncmVzc2lvbiB3YXMgaW5kcm9kdWNlZCBpbgo+Cj4gY29tbWl0IGRkM2NkNzRh Y2YxMjcyMzA0NWE2NGYxZjJjNjI5OGFjN2IzNGE1ZDUKPiBBdXRob3I6IEFuZGVyIENvbnNlbHZh biBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KPiBE YXRlOiAgIEZyaSBNYXkgMTUgMTM6MzQ6MjkgMjAxNSArMDMwMAo+Cj4gICAgIGRybS9pOTE1OiBE b24ndCBvdmVyd3JpdGUgKGUpRFAgUExMIHNlbGVjdGlvbiBvbiBTS0wKPgo+IFNpZ25lZC1vZmYt Ynk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZl aXJhQGludGVsLmNvbT4KClJlcG9ydGVkLWJ5OiBMaW51cyBUb3J2YWxkcyA8dG9ydmFsZHNAbGlu dXgtZm91bmRhdGlvbi5vcmc+ClRlc3RlZC1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGlu dGVsLmNvbT4KCj4gLS0tCj4KPiBPbmx5IGNvbXBpbGUgdGVzdGVkLCBmb3IgdGhlIHdycGxsIHdh cm5pbmcuCj4KPiBUaGFua3MsCj4gQW5kZXIKPgo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jIHwgMyArKysKPiAgMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQo+Cj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcC5jCj4gaW5kZXggNGViZmMzYS4uZmJkOWFjMyAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYwo+IEBAIC0xMTQ3LDYgKzExNDcsOSBAQCBza2xfZWRwX3NldF9wbGxf Y29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywgaW50IGxpbmtfY2xv Y2spCj4gIHN0YXRpYyB2b2lkCj4gIGhzd19kcF9zZXRfZGRpX3BsbF9zZWwoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLCBpbnQgbGlua19idykKPiAgewo+ICsJbWVtc2V0KCZw aXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZSwgMCwKPiArCSAgICAgICBzaXplb2YocGlwZV9jb25m aWctPmRwbGxfaHdfc3RhdGUpKTsKPiArCj4gIAlzd2l0Y2ggKGxpbmtfYncpIHsKPiAgCWNhc2Ug RFBfTElOS19CV18xXzYyOgo+ICAJCXBpcGVfY29uZmlnLT5kZGlfcGxsX3NlbCA9IFBPUlRfQ0xL X1NFTF9MQ1BMTF84MTA7Cj4gLS0gCj4gMi4xLjAKPgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBP cGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753595AbbF3NpC (ORCPT ); Tue, 30 Jun 2015 09:45:02 -0400 Received: from mga02.intel.com ([134.134.136.20]:24727 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752956AbbF3Nox (ORCPT ); Tue, 30 Jun 2015 09:44:53 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,378,1432623600"; d="scan'208";a="753274264" From: Jani Nikula To: Ander Conselvan de Oliveira Cc: Linus Torvalds , Dave Airlie , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , DRI mailing list , Ander Conselvan de Oliveira Subject: Re: [PATCH] drm/i915: Clear pipe's pll hw state in hsw_dp_set_ddi_pll_sel() In-Reply-To: <1435669838-24747-1-git-send-email-ander.conselvan.de.oliveira@intel.com> 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> User-Agent: Notmuch/0.19+112~g77230b0 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Tue, 30 Jun 2015 16:47:06 +0300 Message-ID: <876165wbol.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, 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 > --- > > 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