From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2] drm: Only create a cmdline mode if no probed modes match Date: Fri, 22 May 2015 09:22:13 +0300 Message-ID: <87vbflku7e.fsf@intel.com> References: <5534F9D6.4080908@radekdostal.com> <1429536536-4107-1-git-send-email-chris@chris-wilson.co.uk> 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 ESMTP id 4550188DA9 for ; Thu, 21 May 2015 23:23:57 -0700 (PDT) In-Reply-To: <1429536536-4107-1-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Chris Wilson , dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Dave Airlie , stable@vger.kernel.org, Radek =?utf-8?Q?Dost=C3=A1l?= List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCAyMCBBcHIgMjAxNSwgQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+IHdyb3RlOgo+IFRoZSBpbnRlbnRpb24gb2YgdXNpbmcgdmlkZW89PGNvbm5lY3Rvcj46PG1v ZGU+IGlzIHByaW1hcmlseSB0byBzZWxlY3QKPiB0aGUgdXNlcidzIHByZWZlcnJlZCByZXNvbHV0 aW9uIGF0IHN0YXJ0dXAuIEN1cnJlbnRseSB3ZSBhbHdheXMgY3JlYXRlIGEKPiBuZXcgbW9kZSBp cnJlc3BlY3RpdmUgb2Ygd2hldGhlciB0aGUgbW9uaXRvciBoYXMgYSBuYXRpdmUgbW9kZSBhdCB0 aGUKPiBkZXNpcmVkIHJlc29sdXRpb24uIFRoaXMgaGFzIHRoZSBpc3N1ZSB0aGF0IHdlIG1heSB0 aGVuIHNlbGVjdCB0aGUgZmFrZQo+IG1vZGUgcmF0aGVyIHRoZSBuYXRpdmUgbW9kZSBkdXJpbmcg ZmJfaGVscGVyLT5pbml0YWxfY29uZmlnKCkgYW5kIHNvCj4gaWYgdGhlIGZha2UgbW9kZSBpcyBp bnZhbGlkIHdlIHRoZW4gZW5kIHVwIHdpdGggYSBsb3NzIG9mIHNpZ25hbC4gT29wcy4KPiBUaGlz IGludmFsaWQgZmFrZSBtb2RlIHdvdWxkIGFsc28gYmUgZXhwb3J0ZWQgdG8gdXNlcnNwYWNlLCB3 aG8KPiBwb3RlbnRpYWxseSBtYXkgbWFrZSB0aGUgc2FtZSBtaXN0YWtlLgo+Cj4gVG8gYXZvaWQg dGhpcyBpc3N1ZSwgd2UgZmlsdGVyIG91dCB0aGUgYWRkZWQgY29tbWFuZCBsaW5lIG1vZGUgaWYg d2UKPiBkZXRlY3QgdGhlIGRlc2lyZWQgcmVzb2x1dGlvbiAoYW5kIGNsb2NrIGlmIHNwZWNpZmll ZCkgYW1vbmdzdCB0aGUKPiBwcm9iZWQgbW9kZXMuIFRoaXMgZml4ZXMgdGhlIGltbWVkaWF0ZSBw cm9ibGVtIG9mIGFkZGluZyBhIGR1cGxpY2F0ZQo+IG1vZGUsIGJ1dCBwZXJoYXBzIG1vcmUgZ2Vu ZXJpY2FsbHkgd2Ugc2hvdWxkIGF2b2lkIGFkZGluZyBhIEdURiBtb2RlIGlmCj4gdGhlIG1vbml0 b3IgaGFzIGFuIEVESUQgdGhhdCBpcyBub3QgR1RGLWNvbXBhdGlibGUsIG9yIHNpbWlsYXJseSBm b3IKPiBDVlQuCj4KPiBBIHNlY29uZCBpc3N1ZSBzbmVha2VkIGludG8gdGhpcyBwYXRjaCBpcyB0 byBhZGQgdGhlIGNtZGxpbmUgbW9kZSBtb2RlCj4gYWhlYWQgb2YgdGhlIGFic29sdXRlIGZhbGxi YWNrIDEwMjR4NzY4IG1vZGUuIFRoYXQgaXMgaWYgdGhlIHVzZXIgaGFzCj4gc3BlY2lmaWVkIGEg bW9kZSB0aGF0IHdlIGNyZWF0ZSBhcyBhIGZhbGxiYWNrLCB3ZSBkbyBub3QgbmVlZCB0byBhZGQg YQo+IHNlY29uZCB1bnVzZWQgZmFsbGJhY2sgbW9kZS4KPgo+IEZpeGVzIHJlZ3Jlc3Npb24gZnJv bQo+Cj4gY29tbWl0IGVhZjk5Yzc0OWQ0M2FlNzRhYzdmZmVjZTU1MTJmM2M3M2YwMWRmZDIKPiBB dXRob3I6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IERhdGU6ICAg V2VkIEF1ZyA2IDEwOjA4OjMyIDIwMTQgKzAyMDAKPgo+ICAgICBkcm06IFBlcmZvcm0gY21kbGlu ZSBtb2RlIHBhcnNpbmcgZHVyaW5nIGNvbm5lY3RvciBpbml0aWFsaXNhdGlvbgo+Cj4gdGhhdCBi cmVha3MgSERNSSBvdXRwdXQgb24gQmVhZ2xlQm9uZSBCbGFjayB3aXRoIExHIFRWIChtb2RlbCAx OUxTNFItWkEpLgo+Cj4gdjI6IEV4cGxpY2l0bHkgZGVsZXRlIG91ciBlYXJsaWVyIGNtZGxpbmUg bW9kZQo+Cj4gUmVwb3J0ZWQtYnk6IFJhZGVrIERvc3TDoWwgPHJkQHJhZGVrZG9zdGFsLmNvbT4K PiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K PiBDYzogUmFkZWsgRG9zdMOhbCA8cmRAcmFkZWtkb3N0YWwuY29tPgo+IENjOiBKZXNzZSBCYXJu ZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9yZz4KPiBDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiBDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZl dHRlckBmZndsbC5jaD4KPiBDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IENj OiBKdWxpYSBMZW1pcmUgPGpsZW1pcmVAbWF0cm94LmNvbT4KPiBDYzogRGF2ZSBBaXJsaWUgPGFp cmxpZWRAcmVkaGF0LmNvbT4KPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwo+IC0tLQo+ICBk cml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMgICAgICAgIHwgIDIgKy0KPiAgZHJpdmVycy9ncHUv ZHJtL2RybV9wcm9iZV9oZWxwZXIuYyB8IDM5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlv bnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKPiBpbmRleCAyMTNiMTFlYTY5YjUuLjEzMjkzZTAwOTk5 MCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX21vZGVzLmMKPiBAQCAtMTQwMCw3ICsxNDAwLDcgQEAgZHJtX21vZGVf Y3JlYXRlX2Zyb21fY21kbGluZV9tb2RlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAlpZiAo IW1vZGUpCj4gIAkJcmV0dXJuIE5VTEw7Cj4gIAo+IC0JbW9kZS0+dHlwZSB8PSBEUk1fTU9ERV9U WVBFX1VTRVJERUY7Cj4gKwltb2RlLT50eXBlIHw9IERSTV9NT0RFX1RZUEVfVVNFUkRFRiB8IERS TV9NT0RFX1RZUEVfRFJJVkVSOwo+ICAJZHJtX21vZGVfc2V0X2NydGNpbmZvKG1vZGUsIENSVENf SU5URVJMQUNFX0hBTFZFX1YpOwo+ICAJcmV0dXJuIG1vZGU7Cj4gIH0KPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9wcm9iZV9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1f cHJvYmVfaGVscGVyLmMKPiBpbmRleCA2MzUwMzg3OWE2NzYuLjJhZDhhYWY0NjMxOCAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3Byb2JlX2hlbHBlci5jCj4gKysrIGIvZHJpdmVy cy9ncHUvZHJtL2RybV9wcm9iZV9oZWxwZXIuYwo+IEBAIC03OSwxMyArNzksNDYgQEAgZHJtX21v ZGVfdmFsaWRhdGVfZmxhZyhjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKPiAg Cj4gIHN0YXRpYyBpbnQgZHJtX2hlbHBlcl9wcm9iZV9hZGRfY21kbGluZV9tb2RlKHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IpCj4gIHsKPiArCXN0cnVjdCBkcm1fY21kbGluZV9tb2Rl ICpjbWRsaW5lX21vZGU7Cj4gIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZTsKPiAgCj4g LQlpZiAoIWNvbm5lY3Rvci0+Y21kbGluZV9tb2RlLnNwZWNpZmllZCkKPiArCWNtZGxpbmVfbW9k ZSA9ICZjb25uZWN0b3ItPmNtZGxpbmVfbW9kZTsKPiArCWlmICghY21kbGluZV9tb2RlLT5zcGVj aWZpZWQpCj4gIAkJcmV0dXJuIDA7Cj4gIAo+ICsJLyogT25seSBhZGQgYSBHVEYgbW9kZSBpZiB3 ZSBmaW5kIG5vIG1hdGNoaW5nIHByb2JlZCBtb2RlcyAqLwo+ICsJbGlzdF9mb3JfZWFjaF9lbnRy eShtb2RlLCAmY29ubmVjdG9yLT5wcm9iZWRfbW9kZXMsIGhlYWQpIHsKPiArCQlpZiAobW9kZS0+ aGRpc3BsYXkgIT0gY21kbGluZV9tb2RlLT54cmVzIHx8Cj4gKwkJICAgIG1vZGUtPnZkaXNwbGF5 ICE9IGNtZGxpbmVfbW9kZS0+eXJlcykKPiArCQkJY29udGludWU7Cj4gKwo+ICsJCWlmIChjbWRs aW5lX21vZGUtPnJlZnJlc2hfc3BlY2lmaWVkICYmCj4gKwkJICAgIG1vZGUtPnZyZWZyZXNoICE9 IGNtZGxpbmVfbW9kZS0+cmVmcmVzaCkKPiArCQkJY29udGludWU7CgpXb3VsZCBhIGRybV9jbWRs aW5lX21vZGVfZXF1YWwoKSBvciBzb21lc3VjaCBiZSBoZWxwZnVsPyBUaGVyZSdzIHR3bwpjb3Bp ZXMgaGVyZSwgYW5kIGFub3RoZXIgdmFyaWFudCBpbiBkcm1fcGlja19jbWRsaW5lX21vZGUgLSB3 aGljaCBhbHNvCmNoZWNrcyBpbnRlcmxhY2Ugd2hpbGUgdGhpcyBvbmUgZG9lc24ndCAtIHdoeT8K Cj4gKwo+ICsJCS8qIFJlbW92ZSB0aGUgZXhpc3RpbmcgZmFrZSBtb2RlICovCj4gKwkJbGlzdF9m b3JfZWFjaF9lbnRyeShtb2RlLCAmY29ubmVjdG9yLT5tb2RlcywgaGVhZCkgewo+ICsJCQlpZiAo KG1vZGUtPnR5cGUgJiAoRFJNX01PREVfVFlQRV9EUklWRVIgfCBEUk1fTU9ERV9UWVBFX1VTRVJE RUYpKSAhPSAoRFJNX01PREVfVFlQRV9EUklWRVIgfCBEUk1fTU9ERV9UWVBFX1VTRVJERUYpKQo+ ICsJCQkJY29udGludWU7Cj4gKwo+ICsJCQlpZiAobW9kZS0+aGRpc3BsYXkgIT0gY21kbGluZV9t b2RlLT54cmVzIHx8Cj4gKwkJCSAgICBtb2RlLT52ZGlzcGxheSAhPSBjbWRsaW5lX21vZGUtPnly ZXMpCj4gKwkJCQljb250aW51ZTsKPiArCj4gKwkJCWlmIChjbWRsaW5lX21vZGUtPnJlZnJlc2hf c3BlY2lmaWVkICYmCj4gKwkJCSAgICBtb2RlLT52cmVmcmVzaCAhPSBjbWRsaW5lX21vZGUtPnJl ZnJlc2gpCj4gKwkJCQljb250aW51ZTsKPiArCj4gKwkJCWxpc3RfZGVsKCZtb2RlLT5oZWFkKTsK PiArCQkJZHJtX21vZGVfZGVzdHJveShjb25uZWN0b3ItPmRldiwgbW9kZSk7Cgpkcm1fbW9kZV9y ZW1vdmUoKQoKPiArCQkJYnJlYWs7Cj4gKwkJfQo+ICsKPiArCQlyZXR1cm4gMDsKPiArCX0KPiAr Cj4gIAltb2RlID0gZHJtX21vZGVfY3JlYXRlX2Zyb21fY21kbGluZV9tb2RlKGNvbm5lY3Rvci0+ ZGV2LAo+IC0JCQkJCQkgJmNvbm5lY3Rvci0+Y21kbGluZV9tb2RlKTsKPiArCQkJCQkJIGNtZGxp bmVfbW9kZSk7Cj4gIAlpZiAobW9kZSA9PSBOVUxMKQo+ICAJCXJldHVybiAwOwo+ICAKPiBAQCAt MTc5LDkgKzIxMiw5IEBAIHN0YXRpYyBpbnQgZHJtX2hlbHBlcl9wcm9iZV9zaW5nbGVfY29ubmVj dG9yX21vZGVzX21lcmdlX2JpdHMoc3RydWN0IGRybV9jb25uZWN0Cj4gIAkJCWNvdW50ID0gKCpj b25uZWN0b3JfZnVuY3MtPmdldF9tb2RlcykoY29ubmVjdG9yKTsKPiAgCX0KPiAgCj4gKwljb3Vu dCArPSBkcm1faGVscGVyX3Byb2JlX2FkZF9jbWRsaW5lX21vZGUoY29ubmVjdG9yKTsKPiAgCWlm IChjb3VudCA9PSAwICYmIGNvbm5lY3Rvci0+c3RhdHVzID09IGNvbm5lY3Rvcl9zdGF0dXNfY29u bmVjdGVkKQo+ICAJCWNvdW50ID0gZHJtX2FkZF9tb2Rlc19ub2VkaWQoY29ubmVjdG9yLCAxMDI0 LCA3NjgpOwo+IC0JY291bnQgKz0gZHJtX2hlbHBlcl9wcm9iZV9hZGRfY21kbGluZV9tb2RlKGNv bm5lY3Rvcik7CgpTaG91bGRuJ3QgdGhpcyBodW5rIGJlIGEgc2VwYXJhdGUgcGF0Y2g/CgpCUiwK SmFuaS4KCj4gIAlpZiAoY291bnQgPT0gMCkKPiAgCQlnb3RvIHBydW5lOwo+ICAKPiAtLSAKPiAy LjEuNAo+Cj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K PiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y Zwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com ([134.134.136.20]:57482 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756566AbbEVGX6 convert rfc822-to-8bit (ORCPT ); Fri, 22 May 2015 02:23:58 -0400 From: Jani Nikula To: Chris Wilson , dri-devel@lists.freedesktop.org Cc: Daniel Vetter , stable@vger.kernel.org, Radek =?utf-8?Q?Dost=C3=A1l?= , Dave Airlie Subject: Re: [PATCH v2] drm: Only create a cmdline mode if no probed modes match In-Reply-To: <1429536536-4107-1-git-send-email-chris@chris-wilson.co.uk> References: <5534F9D6.4080908@radekdostal.com> <1429536536-4107-1-git-send-email-chris@chris-wilson.co.uk> Date: Fri, 22 May 2015 09:22:13 +0300 Message-ID: <87vbflku7e.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Mon, 20 Apr 2015, Chris Wilson wrote: > The intention of using video=: is primarily to select > the user's preferred resolution at startup. Currently we always create a > new mode irrespective of whether the monitor has a native mode at the > desired resolution. This has the issue that we may then select the fake > mode rather the native mode during fb_helper->inital_config() and so > if the fake mode is invalid we then end up with a loss of signal. Oops. > This invalid fake mode would also be exported to userspace, who > potentially may make the same mistake. > > To avoid this issue, we filter out the added command line mode if we > detect the desired resolution (and clock if specified) amongst the > probed modes. This fixes the immediate problem of adding a duplicate > mode, but perhaps more generically we should avoid adding a GTF mode if > the monitor has an EDID that is not GTF-compatible, or similarly for > CVT. > > A second issue sneaked into this patch is to add the cmdline mode mode > ahead of the absolute fallback 1024x768 mode. That is if the user has > specified a mode that we create as a fallback, we do not need to add a > second unused fallback mode. > > Fixes regression from > > commit eaf99c749d43ae74ac7ffece5512f3c73f01dfd2 > Author: Chris Wilson > Date: Wed Aug 6 10:08:32 2014 +0200 > > drm: Perform cmdline mode parsing during connector initialisation > > that breaks HDMI output on BeagleBone Black with LG TV (model 19LS4R-ZA). > > v2: Explicitly delete our earlier cmdline mode > > Reported-by: Radek Dostál > Signed-off-by: Chris Wilson > Cc: Radek Dostál > Cc: Jesse Barnes > Cc: Ville Syrjälä > Cc: Daniel Vetter > Cc: dri-devel@lists.freedesktop.org > Cc: Julia Lemire > Cc: Dave Airlie > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/drm_modes.c | 2 +- > drivers/gpu/drm/drm_probe_helper.c | 39 +++++++++++++++++++++++++++++++++++--- > 2 files changed, 37 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index 213b11ea69b5..13293e009990 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -1400,7 +1400,7 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev, > if (!mode) > return NULL; > > - mode->type |= DRM_MODE_TYPE_USERDEF; > + mode->type |= DRM_MODE_TYPE_USERDEF | DRM_MODE_TYPE_DRIVER; > drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); > return mode; > } > diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c > index 63503879a676..2ad8aaf46318 100644 > --- a/drivers/gpu/drm/drm_probe_helper.c > +++ b/drivers/gpu/drm/drm_probe_helper.c > @@ -79,13 +79,46 @@ drm_mode_validate_flag(const struct drm_display_mode *mode, > > static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector) > { > + struct drm_cmdline_mode *cmdline_mode; > struct drm_display_mode *mode; > > - if (!connector->cmdline_mode.specified) > + cmdline_mode = &connector->cmdline_mode; > + if (!cmdline_mode->specified) > return 0; > > + /* Only add a GTF mode if we find no matching probed modes */ > + list_for_each_entry(mode, &connector->probed_modes, head) { > + if (mode->hdisplay != cmdline_mode->xres || > + mode->vdisplay != cmdline_mode->yres) > + continue; > + > + if (cmdline_mode->refresh_specified && > + mode->vrefresh != cmdline_mode->refresh) > + continue; Would a drm_cmdline_mode_equal() or somesuch be helpful? There's two copies here, and another variant in drm_pick_cmdline_mode - which also checks interlace while this one doesn't - why? > + > + /* Remove the existing fake mode */ > + list_for_each_entry(mode, &connector->modes, head) { > + if ((mode->type & (DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_USERDEF)) != (DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_USERDEF)) > + continue; > + > + if (mode->hdisplay != cmdline_mode->xres || > + mode->vdisplay != cmdline_mode->yres) > + continue; > + > + if (cmdline_mode->refresh_specified && > + mode->vrefresh != cmdline_mode->refresh) > + continue; > + > + list_del(&mode->head); > + drm_mode_destroy(connector->dev, mode); drm_mode_remove() > + break; > + } > + > + return 0; > + } > + > mode = drm_mode_create_from_cmdline_mode(connector->dev, > - &connector->cmdline_mode); > + cmdline_mode); > if (mode == NULL) > return 0; > > @@ -179,9 +212,9 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect > count = (*connector_funcs->get_modes)(connector); > } > > + count += drm_helper_probe_add_cmdline_mode(connector); > if (count == 0 && connector->status == connector_status_connected) > count = drm_add_modes_noedid(connector, 1024, 768); > - count += drm_helper_probe_add_cmdline_mode(connector); Shouldn't this hunk be a separate patch? BR, Jani. > if (count == 0) > goto prune; > > -- > 2.1.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Jani Nikula, Intel Open Source Technology Center