From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 5/7] drm: Only merge mode type bits between new probed modes Date: Fri, 4 Dec 2015 09:29:10 +0100 Message-ID: <20151204082910.GB10243@phenom.ffwll.local> References: <1449177255-9515-1-git-send-email-ville.syrjala@linux.intel.com> <1449177255-9515-6-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F0F76EDDB for ; Fri, 4 Dec 2015 00:29:15 -0800 (PST) Received: by wmec201 with SMTP id c201so55089549wme.1 for ; Fri, 04 Dec 2015 00:29:14 -0800 (PST) Content-Disposition: inline In-Reply-To: <1449177255-9515-6-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: ville.syrjala@linux.intel.com Cc: Daniel Vetter , Dave Airlie , dri-devel@lists.freedesktop.org, =?iso-8859-1?Q?Marc-Andr=E9?= Lureau List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBEZWMgMDMsIDIwMTUgYXQgMTE6MTQ6MTNQTSArMDIwMCwgdmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KPiAKPiBDdXJyZW50bHkgbW9zdCBkcml2ZXJzIHJlcXVlc3Qg dGhhdCBhbnkgbW9kZSBhcHBlYXJpbmcgb24gYm90aCB0aGUKPiBvbGQgbW9kZSBsaXN0IGFuZCB0 aGUgbmV3IHByb2JlZF9tb2RlcyBsaXN0IGdldCB0aGVpciB0eXBlIGJpdHMgT1JlZAo+IHRvZ2V0 aGVyIGlmIHRoZSBtb2RlcyBhcmUgZGVlbWVkIHRvIG90aGVyd2lzZSBtYXRjaCBlYWNoIG90aGVy Lgo+IAo+IEkgZG9uJ3Qga25vdyB3aHkgYW55b25lIHdvdWxkIHdhbnQgdG8gbWVyZ2UgaW4gdGhl IG1vZGUgdHlwZSBiaXRzCj4gZnJvbSBhbnkgbW9kZSBsZWZ0IG92ZXIgZnJvbSBhIHByZXZpb3Vz IHByb2JlLiBGb3IgaW5zdGFuY2UsIHlvdQo+IGNvdWxkIG5ldmVyIGdldCByaWQgb2YgdGhlciBw cmVmZXJyZWQgYml0IGlmIGEgbWF0Y2hpbmcgbm9uLXByZWZlcnJlZAo+IG1vZGUgaXMgcmV0dXJu ZWQgYnkgdGhlIG5ldyBwcm9iZS4gU28gbGV0J3Mgbm90IG1lcmdlIGFueXRoaW5nIGZyb20KPiB0 aGUgc3RhbGUgb2xkIG1vZGVzLCBhbmQganVzdCByZXBsYWNlIHRoZW0gb3V0cmlnaHQgd2l0aCBt YXRjaGluZyBuZXcKPiBtb2Rlcy4KPiAKPiBJZiBtdWx0aXBsZSBtYXRjaGluZyBtb2RlcyBhcmUg cHJvZHVjZWQgYnkgdGhlIHNhbWUgcHJvYmUsIG1lcmdpbmcKPiB0aGUgdHlwZSBiaXRzIGJldHdl ZW4gdGhlbSB3b3VsZCBzZWVtIGxpa2UgYSBzZW5zaWJsZSB0aGluZyB0byBkby4KPiBGb3IgYSBi aXQgb2YgZXh0cmEgZmluZXNzZSBpZiB0d28gbW9kZXMgYXJlIGNvbnNpZGVyZWQgZXF1YWwgd2Ug Y2FuCj4gcGljayB0aGUgYWN0dWFsIHRpbWluZ3MgZnJvbSB0aGUgb25lIG1hcmtlZCBhcyBwcmVm ZXJycmVkLiBBbmQgaWYKPiBtdWx0aXBsZSBwcmVmZXJyZWQgbW9kZXMgYXJlIHByb2R1Y2VkIGJ5 IHRoZSBzYW1lIHByb2JlIHNvbWVob3csIHdlCj4gY2FuIGp1c3QgZmF2b3IgdGhlIGZpcnN0IG9u ZSBhZGRlZCB0byB0aGUgcHJvYmVkX21vZGVzIGxpc3QuCj4gCj4gWW91IG1heSBiZSBhc2tpbmcg eW91cnNlbGYgd2h5IHdlIGJvdGggd2l0aCB0aGUgbWVyZ2luZyBhdCBhbGwgaWYKcy9ib3RoL2Jv dGhlci8KCj4gbm90aGluZyBmcm9tIHRoZSBvbGQgbGlzdCBzdXJ2aXZlcyBpbiBwcmFjdGljZS4g VGhlIG9ubHkgYXNud2VyIEkgaGF2ZQoKcy9hc253ZXIvYW5zd2VyLwoKPiBpcyAiZGVidWcgb3V0 cHV0Ii4gVGhhdCBpcyB3ZSB3YW50IHRvIHByaW50IG91dCBhIGxpc3Qgb2YgcHJ1bmVkIG1vZGVz LAo+IHdoaWNoIGlzIHdoeSB3ZSBzdGlsbCB3YW50IHRvIGxvb2sgZm9yIGR1cGxpY2F0ZXMgd2l0 aCB0aGUgb2xkIG1vZGVzLgoKWXVwLCBpdCdzIGFsbCBhbiBlbGFib3JhdGUgc2NoZW1lIHRvIGZp bGwgdXAgZG1lc2cgOy0pCgo+IFRoZXJlIHdhcyBhIHByZXZpb3VzIGF0dGVtcHQgdG8gZ2V0IHJp ZCBvZiB0aGUgbW9kZSB0eXBlIG1lcmdpbmcKPiBlbnRpcmVseSwgYnV0IGl0IGNhdXNlZCBzb21l IGtpbmQgb2YgcmVncmVzc2lvbiBvbiBEYW5pZWxzJ3MgRzMzCj4gbWFjaGluZS4gQXBwYXJlbnRs eSB0aGUgaGFyZHdhcmUgaGFzIHNpbmNlIHJvdHRlZCBhd2F5LCBzbyB3ZSBkb24ndAo+IGhhdmUg dG8gd29ycnkgYWJvdXQgaXQgYW55bW9yZS4gVGhlIHJlbGV2YW50IGNvbW1pdHMgYXJlOgo+IGNv bW1pdCAzZmJkNjQzOWU0NjMgKCJkcm06IGNvcHkgbW9kZSB0eXBlIGluIGRybV9tb2RlX2Nvbm5l Y3Rvcl9saXN0X3VwZGF0ZSgpIikKPiBjb21taXQgYWJjZTFlYzliMDhhICgiUmV2ZXJ0ICJkcm06 IGNvcHkgbW9kZSB0eXBlIGluIGRybV9tb2RlX2Nvbm5lY3Rvcl9saXN0X3VwZGF0ZSgpIiIpCgpT bGlnaHQgY29ycmVjdGlvbjogSXQncyBvbmx5IHRoZSBzZHZvIHRyYW5zY29kZXIgdGhhdCByb3R0 ZWQsIGFuZCB3aGVuIEkKcmVwb3J0ZWQgdGhpcyByZWdyZXNzaW9uIHdoYXRldmVyIHRpbnkgY2hh bmdlIHRoaXMgY2F1c2VzIHNlZW1zIHRvIGhhdmUKYmVlbiBlbm91Z2ggdG8ga2lsbCB0aGUgbWFj aGluZS4gQSBmZXcgbW9udGhzIGxhdGVyIGl0IGRpZWQgYWx3YXlzLiBTbwpyZWFsbHkgdW5sdWNr eSBjb25pbmNpZGVuY2UgdGhhdCBteSBodyB3YXMgZXhhY3RseSBiZXR3ZWVuIGRlYWQgYW5kIGFs aXZlCndoZW4gRGF2ZSBwdXNoZWQgdGhpcyBvcmlnaW5hbGx5LgoKPiBJdCB3YXMgdGhlbiBkZWNp ZGVkIGluCj4gY29tbWl0IGI4NzU3N2I3Yzc2OCAoImRybTogdHJ5IGhhcmRlciB0byBhdm9pZCBy ZWdyZXNzaW9uIHdoZW4gbWVyZ2luZyBtb2RlIGJpdHMiKQo+IHRoYXQganVzdCBxeGwgdmlydGlv IGFyZSBleGNsdWRlZCBmcm9tIHRoZSBtZXJnaW5nLCB3aGlsZSBldmVyeW9uZQo+IGVsc2UgZG9l cyBpdC4gVGhhdCBpcyBub3QgY2hhbmdlZCwgYWx0aG91Z2ggbm93IGV2ZW4gcXhsIGFuZCB2aXJ0 aW8KPiB3aWxsIGJlIHN1YmplY3QgdG8gdGhlIHByZXZpb3VzbHkgbWVudGlvbmVkIGxvZ2ljIHRv IGNob29zZSB3aGljaAo+IGFjdHVhbCB0aW1pbmdzIGFyZSBwaWNrZWQgZm9yIHRoZSBuZXcgbW9k ZS4KPiAKPiBDYzogTWFyYy1BbmRyw6kgTHVyZWF1IDxtYXJjYW5kcmUubHVyZWF1QHJlZGhhdC5j b20+Cj4gQ2M6IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Cj4gQ2M6IERhbmllbCBW ZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4gQ2M6IEFkYW0gSmFja3NvbiA8YWpheEBy ZWRoYXQuY29tPgo+IFNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+CgpXaXRoIHRoZSBjb21taXQgbWVzc2FnZSBjb3JyZWN0ZWQ6CgpS ZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KCj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYyB8IDM0ICsrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDcgZGVs ZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYwo+IGluZGV4IDJiOTRhNWM2NjFiMC4uOGM4MDNl M2FmMWRhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYwo+IEBAIC0xMTk3LDEzICsxMTk3LDMzIEBAIHZv aWQgZHJtX21vZGVfY29ubmVjdG9yX2xpc3RfdXBkYXRlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IsCj4gIAkJCQljb250aW51ZTsKPiAgCj4gIAkJCWZvdW5kX2l0ID0gdHJ1ZTsKPiAt CQkJLyogaWYgZXF1YWwgZGVsZXRlIHRoZSBwcm9iZWQgbW9kZSAqLwo+IC0JCQltb2RlLT5zdGF0 dXMgPSBwbW9kZS0+c3RhdHVzOwo+IC0JCQkvKiBNZXJnZSB0eXBlIGJpdHMgdG9nZXRoZXIgKi8K PiAtCQkJaWYgKG1lcmdlX3R5cGVfYml0cykKPiAtCQkJCW1vZGUtPnR5cGUgfD0gcG1vZGUtPnR5 cGU7Cj4gLQkJCWVsc2UKPiAtCQkJCW1vZGUtPnR5cGUgPSBwbW9kZS0+dHlwZTsKPiArCj4gKwkJ CS8qCj4gKwkJCSAqIElmIHRoZSBvbGQgbWF0Y2hpbmcgbW9kZSBpcyBzdGFsZSAoaWUuIGxlZnQg b3Zlcgo+ICsJCQkgKiBmcm9tIGEgcHJldmlvdXMgcHJvYmUpIGp1c3QgcmVwbGFjZSBpdCBvdXRy aWdodC4KPiArCQkJICogT3RoZXJ3aXNlIGp1c3QgbWVyZ2UgdGhlIHR5cGUgYml0cyBiZXR3ZWVu IGFsbAo+ICsJCQkgKiBlcXVhbCBwcm9iZWQgbW9kZXMuCj4gKwkJCSAqCj4gKwkJCSAqIElmIHR3 byBwcm9iZWQgbW9kZXMgYXJlIGNvbnNpZGVyZWQgZXF1YWwsIHBpY2sgdGhlCj4gKwkJCSAqIGFj dHVhbCB0aW1pbmdzIGZyb20gdGhlIG9uZSB0aGF0J3MgbWFya2VkIGFzCj4gKwkJCSAqIHByZWZl cnJlZCAoaW4gY2FzZSB0aGUgbWF0Y2ggaXNuJ3QgMTAwJSkuIElmCj4gKwkJCSAqIG11bHRpcGxl IG9yIHplcm8gcHJlZmVycmVkIG1vZGVzIGFyZSBwcmVzZW50LCBmYXZvcgo+ICsJCQkgKiB0aGUg bW9kZSBhZGRlZCB0byB0aGUgcHJvYmVkX21vZGVzIGxpc3QgZmlyc3QuCj4gKwkJCSAqLwo+ICsJ CQlpZiAobW9kZS0+c3RhdHVzID09IE1PREVfU1RBTEUpIHsKPiArCQkJCWRybV9tb2RlX2NvcHko bW9kZSwgcG1vZGUpOwo+ICsJCQl9IGVsc2UgaWYgKChtb2RlLT50eXBlICYgRFJNX01PREVfVFlQ RV9QUkVGRVJSRUQpID09IDAgJiYKPiArCQkJCSAgIChwbW9kZS0+dHlwZSAmIERSTV9NT0RFX1RZ UEVfUFJFRkVSUkVEKSAhPSAwKSB7Cj4gKwkJCQlpZiAobWVyZ2VfdHlwZV9iaXRzKQo+ICsJCQkJ CXBtb2RlLT50eXBlIHw9IG1vZGUtPnR5cGU7Cj4gKwkJCQlkcm1fbW9kZV9jb3B5KG1vZGUsIHBt b2RlKTsKPiArCQkJfSBlbHNlIHsKPiArCQkJCWlmIChtZXJnZV90eXBlX2JpdHMpCj4gKwkJCQkJ bW9kZS0+dHlwZSB8PSBwbW9kZS0+dHlwZTsKPiArCQkJCWVsc2UKPiArCQkJCQltb2RlLT50eXBl ID0gcG1vZGUtPnR5cGU7Cj4gKwkJCX0KPiArCj4gIAkJCWxpc3RfZGVsKCZwbW9kZS0+aGVhZCk7 Cj4gIAkJCWRybV9tb2RlX2Rlc3Ryb3koY29ubmVjdG9yLT5kZXYsIHBtb2RlKTsKPiAgCQkJYnJl YWs7Cj4gLS0gCj4gMi40LjEwCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJ bnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=