From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm: Fix broken VT switch with video=1366x768 option Date: Wed, 11 Jan 2017 19:05:12 +0200 Message-ID: <20170111170512.GO31595@intel.com> References: <20170109145614.29454-1-tiwai@suse.de> <20170110112836.GZ31595@intel.com> <20170110124142.yosrvqsln4q6dm4h@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 663166E85C for ; Wed, 11 Jan 2017 17:05:29 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170110124142.yosrvqsln4q6dm4h@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: Takashi Iwai , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBKYW4gMTAsIDIwMTcgYXQgMDE6NDE6NDJQTSArMDEwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBUdWUsIEphbiAxMCwgMjAxNyBhdCAxMjozNjo1MFBNICswMTAwLCBUYWthc2hp IEl3YWkgd3JvdGU6Cj4gPiBPbiBUdWUsIDEwIEphbiAyMDE3IDEyOjI4OjM2ICswMTAwLAo+ID4g VmlsbGUgU3lyasOkbMOkIHdyb3RlOgo+ID4gPiAKPiA+ID4gT24gTW9uLCBKYW4gMDksIDIwMTcg YXQgMDM6NTY6MTRQTSArMDEwMCwgVGFrYXNoaSBJd2FpIHdyb3RlOgo+ID4gPiA+IEkgbm90aWNl ZCB0aGF0IHRoZSBWVCBzd2l0Y2ggZG9lc24ndCB3b3JrIGFueSBsb25nZXIgd2l0aCBhIERlbGwK PiA+ID4gPiBsYXB0b3Agd2l0aCAxMzY2eDc2OCBlRFAgd2hlbiB0aGUgbWFjaGluZSBpcyBjb25u ZWN0ZWQgd2l0aCBhIERQCj4gPiA+ID4gbW9uaXRvci4gIEl0IGJlaGF2ZXMgYXMgaWYgVlQgd2Vy ZSBzd2l0Y2hlZCwgYnV0IHRoZSBncmFwaGljcyByZW1haW4KPiA+ID4gPiBmcm96ZW4uICBBY3R1 YWxseSB0aGUga2V5Ym9hcmQgd29ya3MsIHNvIEkgY291bGQgc3dpdGNoIGJhY2sgdG8gVlQ3Cj4g PiA+ID4gYWdhaW4uCj4gPiA+ID4gCj4gPiA+ID4gSSB0cmllZCB0byB0cmFjayBkb3duIHRoZSBw cm9ibGVtLCBhbmQgZW5jb3VudGVyZWQgYSBsb25nIHN0b3J5IHVudGlsCj4gPiA+ID4gd2UgcmVh Y2ggdG8gdGhpcyBlcnJvcjoKPiA+ID4gPiAKPiA+ID4gPiAtIFRoZSBtYWNoaW5lIGlzIGJvb3Rl ZCB3aXRoIHZpZGVvPTEzNjZ4NzY4IG9wdGlvbiAodGhlIGRpc3Rybwo+ID4gPiA+ICAgaW5zdGFs bGVyIHNlZW1zIHRvIGFkZCBpdCBhcyBkZWZhdWx0KS4KPiA+ID4gPiAtIFJlY2VudGx5LCBkcm1f aGVscGVyX3Byb2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMoKSBkZWFscyB3aXRoCj4gPiA+ID4g ICBjbWRsaW5lIG1vZGVzLCBhbmQgaXQgdHJpZXMgdG8gY3JlYXRlIGEgbmV3IG1vZGUgd2hlbiBu bwo+ID4gPiA+ICAgbWF0Y2hpbmcgbW9kZSBpcyBmb3VuZC4KPiA+ID4gPiAtIFRoZSBkcm1fbW9k ZV9jcmVhdGVfZnJvbV9jbWRsaW5lX21vZGUoKSBjcmVhdGVzIGEgbW9kZSBiYXNlZCBvbgo+ID4g PiA+ICAgZWl0aGVyIENWVCBvZiBHRlQgYWNjb3JkaW5nIHRvIHRoZSBnaXZlbiBjbWRsaW5lIG1v ZGU7IGluIG91ciBjYXNlLAo+ID4gPiA+ICAgaXQncyAxMzY2eDc2OC4KPiA+ID4gPiAtIFNpbmNl IGJvdGggQ1ZUIGFuZCBHRlQgY2FuJ3QgZXhwcmVzcyB0aGUgd2lkdGggMTM2NiBkdWUgdG8KPiA+ ID4gPiAgIGFsaWdubWVudCwgdGhlIHJlc3VsdGFudCBtb2RlIGJlY29tZXMgMTM2OHg3NjgsIHNs aWdodGx5IGxhcmdlciB0aGFuCj4gPiA+ID4gICB0aGUgZ2l2ZW4gc2l6ZS4KPiA+ID4gPiAtIExh dGVyIG9uLCB0aGUgYXRvbWljIGNvbW1pdCBpcyBwZXJmb3JtZWQsIGFuZCBpbgo+ID4gPiA+ICAg ZHJtX2F0b21pY19jaGVja19vbmx5KCksIHRoZSBzaXplIG9mIGVhY2ggcGxhbmUgaXMgY2hlY2tl ZC4KPiA+ID4gPiAtIFRoZSBzaXplIGNoZWNrIG9mIDEzNjZ4NzY4IGZhaWxzIGR1ZSB0byB0aGUg YWJvdmUsIGFuZCBldmVudHVhbGx5Cj4gPiA+ID4gICB0aGUgd2hvbGUgVlQgc3dpdGNoIGZhaWxz Lgo+ID4gPiA+IAo+ID4gPiA+IEJhY2sgaW4gdGhlIGhpc3RvcnksIHdlJ3ZlIGhhZCBhIG1hbnVh bCBmaXgtdXAgb2YgMTM2OHg3NjggaW4gdmFyaW91cwo+ID4gPiA+IHBsYWNlcyB2aWEgYzA5ZGVk YjdhNTBlICgiZHJtL2VkaWQ6IEFkZCBhIHdvcmthcm91bmQgZm9yIDEzNjZ4NzY4IEhECj4gPiA+ ID4gcGFuZWwiKSwgYnV0IHRoZXkgaGF2ZSBiZWVuIGFsbCBpbiBkcm1fZWRpZC5jIGF0IHByb2Jp bmcgdGhlIG1vZGVzCj4gPiA+ID4gZnJvbSBFRElELiAgRm9yIGFkZHJlc3NpbmcgdGhlIHByb2Js ZW0gYWJvdmUsIHdlIG5lZWQgYSBzaW1pbGFyIGhhY2sKPiA+ID4gPiB0byB0aGUgbW9kZSBuZXds eSBjcmVhdGVkIGZyb20gY21kbGluZSwgbWFudWFsbHkgYWRqdXN0aW5nIHRoZSB3aWR0aAo+ID4g PiA+IHdoZW4gdGhlIGV4cGVjdGVkIHNpemUgaXMgMTM2NiB3aGlsZSB3ZSBnZXQgMTM2OCBpbnN0 ZWFkLgo+ID4gPiA+IAo+ID4gPiA+IEZpeGVzOiBlYWY5OWM3NDlkNDMgKCJkcm06IFBlcmZvcm0g Y21kbGluZSBtb2RlIHBhcnNpbmcgZHVyaW5nLi4uIikKPiA+ID4gPiBDYzogPHN0YWJsZUB2Z2Vy Lmtlcm5lbC5vcmc+Cj4gPiA+ID4gU2lnbmVkLW9mZi1ieTogVGFrYXNoaSBJd2FpIDx0aXdhaUBz dXNlLmRlPgo+ID4gPiA+IC0tLQo+ID4gPiA+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMg fCA3ICsrKysrKysKPiA+ID4gPiAgMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKQo+ID4g PiA+IAo+ID4gPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKPiA+ID4gPiBpbmRleCBhYzZhMzUyMTI1MDEuLmU2 YjE5YmM5MDIxYSAxMDA2NDQKPiA+ID4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVz LmMKPiA+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKPiA+ID4gPiBAQCAt MTQ2MCw2ICsxNDYwLDEzIEBAIGRybV9tb2RlX2NyZWF0ZV9mcm9tX2NtZGxpbmVfbW9kZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gPiA+ICAJCXJldHVybiBOVUxMOwo+ID4gPiA+ICAKPiA+ ID4gPiAgCW1vZGUtPnR5cGUgfD0gRFJNX01PREVfVFlQRV9VU0VSREVGOwo+ID4gPiA+ICsJLyog Zml4IHVwIDEzNjh4NzY4OiBHRlQvQ1ZUIGNhbid0IGV4cHJlc3MgMTM2NiB3aWR0aCBkdWUgdG8g YWxpZ25tZW50ICovCj4gPiA+ID4gKwlpZiAoY21kLT54cmVzID09IDEzNjYgJiYgbW9kZS0+aGRp c3BsYXkgPT0gMTM2OCkgewo+ID4gPiA+ICsJCW1vZGUtPmhkaXNwbGF5ID0gMTM2NjsKPiA+ID4g PiArCQltb2RlLT5oc3luY19zdGFydC0tOwo+ID4gPiA+ICsJCW1vZGUtPmhzeW5jX2VuZC0tOwo+ ID4gPiA+ICsJCWRybV9tb2RlX3NldF9uYW1lKG1vZGUpOwo+ID4gPiA+ICsJfQo+ID4gPiAKPiA+ ID4gTWF5YmUgZ2l2ZSBmaXh1cF9tb2RlXzEzNjZ4NzY4KCkgYSBkcm1fIHByZWZpeCBhbmQgbWFr ZSBpbiBub24tc3RhdGljIHRvCj4gPiA+IGF2b2lkIGR1cGxpY2F0aW5nIHRoZSBjb2RlPyBBbmQg SSBndWVzcyBtb3ZlIGl0IHRvIGRybV9tb2Rlcy5jPwo+ID4gCj4gPiBZZXMsIHRoYXQnbGwgYmUg YSBnb29kIGNsZWFudXAuICBJIHdhcyBhZnJhaWQgb2Ygc3ltYm9sIGV4cG9ydCwgYnV0Cj4gPiBi b3RoIGFyZSBpbiB0aGUgc2FtZSBtb2R1bGUsIHNvIGZhci4gIEkgY2FuIHBvc3QgYSBmb2xsb3ct dXAgb25jZSB3aGVuCj4gPiB0aGlzIG9uZSBnZXRzIGFjY2VwdGVkLgo+IAo+IEZvciB0aGUgZm9s bG93IHVwLCBwbHMgcHV0IHRoZSBkZWNsIGludG8gZHJtX2NydGNfaW50ZXJuYWwuaCwgc28gdGhh dAo+IGRyaXZlcnMgYXJlbid0IHRlbXB0ZWQgdG8gdXNlIGl0LiBUaGF0IGhlYWRlciBpcyBmb3Ig bW9kdWxlLWludGVybmFsCj4gc2hhcmVkIGNvZGUgb25seS4KPiAKPiA+ID4gT3RoZXJ3aXNlIGxn dG06Cj4gPiA+IFJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgo+ID4gCj4gPiBUaGFua3MhCj4gCj4gVmlsbGUsIGNhbiB5b3UgcGxzIGFs c28gYXBwbHkgdGhpcyBvbmUgdG8gZHJtLW1pc2MtZml4ZXM/CgpQdXNoZWQuIFRoYW5rcyBmb3Ig dGhlIHBhdGNoLgoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938740AbdAKRFV (ORCPT ); Wed, 11 Jan 2017 12:05:21 -0500 Received: from mga11.intel.com ([192.55.52.93]:51678 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759025AbdAKRFQ (ORCPT ); Wed, 11 Jan 2017 12:05:16 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,346,1477983600"; d="scan'208";a="1111164311" Date: Wed, 11 Jan 2017 19:05:12 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Takashi Iwai , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm: Fix broken VT switch with video=1366x768 option Message-ID: <20170111170512.GO31595@intel.com> References: <20170109145614.29454-1-tiwai@suse.de> <20170110112836.GZ31595@intel.com> <20170110124142.yosrvqsln4q6dm4h@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170110124142.yosrvqsln4q6dm4h@phenom.ffwll.local> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 10, 2017 at 01:41:42PM +0100, Daniel Vetter wrote: > On Tue, Jan 10, 2017 at 12:36:50PM +0100, Takashi Iwai wrote: > > On Tue, 10 Jan 2017 12:28:36 +0100, > > Ville Syrjälä wrote: > > > > > > On Mon, Jan 09, 2017 at 03:56:14PM +0100, Takashi Iwai wrote: > > > > I noticed that the VT switch doesn't work any longer with a Dell > > > > laptop with 1366x768 eDP when the machine is connected with a DP > > > > monitor. It behaves as if VT were switched, but the graphics remain > > > > frozen. Actually the keyboard works, so I could switch back to VT7 > > > > again. > > > > > > > > I tried to track down the problem, and encountered a long story until > > > > we reach to this error: > > > > > > > > - The machine is booted with video=1366x768 option (the distro > > > > installer seems to add it as default). > > > > - Recently, drm_helper_probe_single_connector_modes() deals with > > > > cmdline modes, and it tries to create a new mode when no > > > > matching mode is found. > > > > - The drm_mode_create_from_cmdline_mode() creates a mode based on > > > > either CVT of GFT according to the given cmdline mode; in our case, > > > > it's 1366x768. > > > > - Since both CVT and GFT can't express the width 1366 due to > > > > alignment, the resultant mode becomes 1368x768, slightly larger than > > > > the given size. > > > > - Later on, the atomic commit is performed, and in > > > > drm_atomic_check_only(), the size of each plane is checked. > > > > - The size check of 1366x768 fails due to the above, and eventually > > > > the whole VT switch fails. > > > > > > > > Back in the history, we've had a manual fix-up of 1368x768 in various > > > > places via c09dedb7a50e ("drm/edid: Add a workaround for 1366x768 HD > > > > panel"), but they have been all in drm_edid.c at probing the modes > > > > from EDID. For addressing the problem above, we need a similar hack > > > > to the mode newly created from cmdline, manually adjusting the width > > > > when the expected size is 1366 while we get 1368 instead. > > > > > > > > Fixes: eaf99c749d43 ("drm: Perform cmdline mode parsing during...") > > > > Cc: > > > > Signed-off-by: Takashi Iwai > > > > --- > > > > drivers/gpu/drm/drm_modes.c | 7 +++++++ > > > > 1 file changed, 7 insertions(+) > > > > > > > > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > > > > index ac6a35212501..e6b19bc9021a 100644 > > > > --- a/drivers/gpu/drm/drm_modes.c > > > > +++ b/drivers/gpu/drm/drm_modes.c > > > > @@ -1460,6 +1460,13 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev, > > > > return NULL; > > > > > > > > mode->type |= DRM_MODE_TYPE_USERDEF; > > > > + /* fix up 1368x768: GFT/CVT can't express 1366 width due to alignment */ > > > > + if (cmd->xres == 1366 && mode->hdisplay == 1368) { > > > > + mode->hdisplay = 1366; > > > > + mode->hsync_start--; > > > > + mode->hsync_end--; > > > > + drm_mode_set_name(mode); > > > > + } > > > > > > Maybe give fixup_mode_1366x768() a drm_ prefix and make in non-static to > > > avoid duplicating the code? And I guess move it to drm_modes.c? > > > > Yes, that'll be a good cleanup. I was afraid of symbol export, but > > both are in the same module, so far. I can post a follow-up once when > > this one gets accepted. > > For the follow up, pls put the decl into drm_crtc_internal.h, so that > drivers aren't tempted to use it. That header is for module-internal > shared code only. > > > > Otherwise lgtm: > > > Reviewed-by: Ville Syrjälä > > > > Thanks! > > Ville, can you pls also apply this one to drm-misc-fixes? Pushed. Thanks for the patch. -- Ville Syrjälä Intel OTC