From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Simplify the way BC bifurcation state consistency is kept Date: Tue, 10 Mar 2015 20:10:25 +0100 Message-ID: <20150310191025.GU3800@phenom.ffwll.local> References: <20150309162110.GQ24485@phenom.ffwll.local> <1425990754-8723-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: Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by gabe.freedesktop.org (Postfix) with ESMTP id C0E826E737 for ; Tue, 10 Mar 2015 12:08:45 -0700 (PDT) Received: by wivr20 with SMTP id r20so32867478wiv.5 for ; Tue, 10 Mar 2015 12:08:45 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1425990754-8723-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" To: Ander Conselvan de Oliveira Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBNYXIgMTAsIDIwMTUgYXQgMDI6MzI6MzRQTSArMDIwMCwgQW5kZXIgQ29uc2VsdmFu IGRlIE9saXZlaXJhIHdyb3RlOgo+IFJlbW92ZSB0aGUgZ2xvYmFsIG1vZGVzZXQgcmVzb3VyY2Ug ZnVuY3Rpb24gdGhhdCB3b3VsZCBkaXNhYmxlIHRoZQo+IGJpZnVyY2F0aW9uIGJpdCwgYW5kIGlu c3RlYWQgZW5hYmxlL2Rpc2FibGUgaXQgd2hlbiBlbmFibGluZyBvcgo+IGRpc2FibGluZyB0aGUg cGNoIHRyYW5zY29kZXIuIFRoZSBjaGVja3MgYmVmb3JlIHRoZSBtb2RlIHNldCBzaG91bGQKPiBl bnN1cmUgdGhhdCB0aGUgY29uZmlndXJhdGlvbiBpcyB2YWxpZCwgc28gaXQgc2hvdWxkIGJlIHNh ZmUgdG8gZG8gaXQKPiBzby4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUg T2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+Cj4gLS0tCj4g Cj4gT24gTW9uLCAyMDE1LTAzLTA5IGF0IDE3OjIxICswMTAwLCBEYW5pZWwgVmV0dGVyIHdyb3Rl Ogo+ID4gV2l0aCBhdG9taWMgd2UgbmVlZCB0byBwcm9iYWJseSBsb29rIGF0IGNydGNfc3RhdGUt Pm1vZGVfY2hhbmdlZC4gQXMgYW4KPiA+IGludGVyaW0gc29sdXRpb24gd2UgaGF2ZSB0aGUgc2Ft ZSBpbmZvcm1hdGlvbiBhdmFpbGFibGUgaW4gdGhlCj4gPiBtb2Rlc2V0X3BpcGVzIGJpdG1hc2su IEkgdGhpbmsgcmVwbGFjaW5nIHRoZSBjaGVjayBmb3IgaW50ZWxfY3J0Yy0+YWN0aXZlCj4gPiB3 aXRoICEobW9kZXNldF9waXBlcyAmICgxPDxpbnRlbF9jcnRjLT5waXBlKSkgc2hvdWxkIHdvcmsu Cj4gCj4gSSBsb29rZWQgaW50byB0aGF0IHNvbHV0aW9uLCBidXQgaW52b2x2ZXMgcGFzc2luZyBt b2Rlc2V0X3BpcGVzIHdheSBkb3duCj4gaW50byB0aGUgY2FsbCBzdGFjaywgc28gSSBzdGFydGVk IGxvb2tpbmcgZm9yIGEgZGlmZmVyZW50IHNvbHV0aW9uLiBEbyB5b3UKPiBzZWUgYW55IGNhdmVh dCB3aXRoIHRoaXMgYXBwcm9hY2g/CgpNb3ZpbmcgdGhpbmdzIHRvIHRoZSBkaXNhYmxlIGhvb2sg d291bGQgYmUgZ3JlYXQgc2luY2UgdGhhdCdzIHlldCBhbm90aGVyCnNwZWNpYWwgY2FzZSByZW1v dmUuIEl0IHdhc250JyBwb3NzaWJsZSBiYWNrIHdoZW4gSSd2ZSBkb25lIHRoaXMsIGFuZCBJCnRo aW5rIHRoZSByZWFzb24gd2FzIHRoYXQgd2Ugc3RpbGwgaGFkIGEgLT5tb2RlX3NldCBjYWxsYmFj ayBiZWZvcmUgdGhlCmNydGNfZW5hYmxlIGhvb2suIEJ1dCB0aGF0J3MgYWxsIGdvbmUgbm93LCBz byBhcyBsb25nIGFzIHRoZSBiaWZ1cmNhdGUKdXBkYXRlIGlzIGRvbmUgZWFybHkgZW5vdWdoIEkg dGhpbmsgdGhpcydsbCB3b3JrLgoKTWF5YmUgZGlzY3VzcyB0aGlzIHdpdGggVmlsbGUgbG9jYWxs eSAtIGhlIHByb3ZpZGVkIGFsbCB0aGUgZmVlZGJhY2sgZm9yCm15IG9yaWdpbmFsIHBhdGNoIHRv bz8gUmFuZG9tIGJpa2VzaGVkcyBiZWxvdywgSSBkZWZpbml0ZWx5IG5lZWQgdG8gdGhpbmsKYWJv dXQgdGhpcyBtb3JlLgoKQ2hlZXJzLCBEYW5pZWwKCj4gCj4gVGhhbmtzLAo+IEFuZGVyCj4gCj4g LS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDYwICsrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0 aW9ucygrKSwgMzkgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwo+IGluZGV4IDQwMDhiZjQuLmVjYTVhNDEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCj4gQEAgLTEwMSw2ICsxMDEsOCBAQCBzdGF0aWMgdm9pZCBjaHZfcHJlcGFy ZV9wbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCj4gIAkJCSAgICBjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwo+ICBzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9j cnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwo+ICBzdGF0aWMgdm9pZCBpbnRlbF9m aW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKPiArc3RhdGljIHZvaWQg aXZ5YnJpZGdlX3VwZGF0ZV9mZGlfYmNfYmlmdXJjYXRpb24oc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMsCj4gKwkJCQkJCWJvb2wgcGlwZV9hY3RpdmUpOwoKSW1vIGp1c3QgbW92ZSB0aGUg ZnVuY3Rpb25zIGluc3RlYWQgb2YgZm9yd2FyZCBkZWNsYXJhdGlvbnMuCgo+ICAKPiAgc3RhdGlj IHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9maW5kX2VuY29kZXIoc3RydWN0IGludGVsX2Nv bm5lY3RvciAqY29ubmVjdG9yLCBpbnQgcGlwZSkKPiAgewo+IEBAIC0xOTU2LDYgKzE5NTgsOCBA QCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9kaXNhYmxlX3BjaF90cmFuc2NvZGVyKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgCQkJCQkgICAgZW51bSBwaXBlIHBpcGUpCj4gIHsK PiAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2Owo+ICsJc3RydWN0IGlu dGVsX2NydGMgKmNydGMgPQo+ICsJCXRvX2ludGVsX2NydGMoZGV2X3ByaXYtPnBpcGVfdG9fY3J0 Y19tYXBwaW5nW3BpcGVdKTsKPiAgCXVpbnQzMl90IHJlZywgdmFsOwo+ICAKPiAgCS8qIEZESSBy ZWxpZXMgb24gdGhlIHRyYW5zY29kZXIgKi8KPiBAQCAtMTk4MCw2ICsxOTg0LDkgQEAgc3RhdGlj IHZvaWQgaXJvbmxha2VfZGlzYWJsZV9wY2hfdHJhbnNjb2RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCj4gIAkJdmFsICY9IH5UUkFOU19DSElDS0VOMl9USU1JTkdfT1ZFUlJJ REU7Cj4gIAkJSTkxNV9XUklURShyZWcsIHZhbCk7Cj4gIAl9Cj4gKwo+ICsJaWYgKElTX0lWWUJS SURHRShkZXYpKQo+ICsJCWl2eWJyaWRnZV91cGRhdGVfZmRpX2JjX2JpZnVyY2F0aW9uKGNydGMs IGZhbHNlKTsKPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQgbHB0X2Rpc2FibGVfcGNoX3RyYW5zY29k ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+IEBAIC0zMTUzLDMyICszMTYw LDYgQEAgc3RhdGljIGJvb2wgcGlwZV9oYXNfZW5hYmxlZF9wY2goc3RydWN0IGludGVsX2NydGMg KmNydGMpCj4gIAlyZXR1cm4gY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlICYmIGNydGMtPmNvbmZp Zy0+aGFzX3BjaF9lbmNvZGVyOwo+ICB9Cj4gIAo+IC1zdGF0aWMgdm9pZCBpdmJfbW9kZXNldF9n bG9iYWxfcmVzb3VyY2VzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gLXsKPiAtCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gLQlzdHJ1Y3Qg aW50ZWxfY3J0YyAqcGlwZV9CX2NydGMgPQo+IC0JCXRvX2ludGVsX2NydGMoZGV2X3ByaXYtPnBp cGVfdG9fY3J0Y19tYXBwaW5nW1BJUEVfQl0pOwo+IC0Jc3RydWN0IGludGVsX2NydGMgKnBpcGVf Q19jcnRjID0KPiAtCQl0b19pbnRlbF9jcnRjKGRldl9wcml2LT5waXBlX3RvX2NydGNfbWFwcGlu Z1tQSVBFX0NdKTsKPiAtCXVpbnQzMl90IHRlbXA7Cj4gLQo+IC0JLyoKPiAtCSAqIFdoZW4gZXZl cnl0aGluZyBpcyBvZmYgZGlzYWJsZSBmZGkgQyBzbyB0aGF0IHdlIGNvdWxkIGVuYWJsZSBmZGkg Qgo+IC0JICogd2l0aCBhbGwgbGFuZXMuIE5vdGUgdGhhdCB3ZSBkb24ndCBjYXJlIGFib3V0IGVu YWJsZWQgcGlwZXMgd2l0aG91dAo+IC0JICogYW4gZW5hYmxlZCBwY2ggZW5jb2Rlci4KPiAtCSAq Lwo+IC0JaWYgKCFwaXBlX2hhc19lbmFibGVkX3BjaChwaXBlX0JfY3J0YykgJiYKPiAtCSAgICAh cGlwZV9oYXNfZW5hYmxlZF9wY2gocGlwZV9DX2NydGMpKSB7Cj4gLQkJV0FSTl9PTihJOTE1X1JF QUQoRkRJX1JYX0NUTChQSVBFX0IpKSAmIEZESV9SWF9FTkFCTEUpOwo+IC0JCVdBUk5fT04oSTkx NV9SRUFEKEZESV9SWF9DVEwoUElQRV9DKSkgJiBGRElfUlhfRU5BQkxFKTsKPiAtCj4gLQkJdGVt cCA9IEk5MTVfUkVBRChTT1VUSF9DSElDS0VOMSk7Cj4gLQkJdGVtcCAmPSB+RkRJX0JDX0JJRlVS Q0FUSU9OX1NFTEVDVDsKPiAtCQlEUk1fREVCVUdfS01TKCJkaXNhYmxpbmcgZmRpIEMgcnhcbiIp Owo+IC0JCUk5MTVfV1JJVEUoU09VVEhfQ0hJQ0tFTjEsIHRlbXApOwo+IC0JfQo+IC19Cj4gLQo+ ICAvKiBUaGUgRkRJIGxpbmsgdHJhaW5pbmcgZnVuY3Rpb25zIGZvciBJTEsvSWJleHBlYWsuICov Cj4gIHN0YXRpYyB2b2lkIGlyb25sYWtlX2ZkaV9saW5rX3RyYWluKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKPiAgewo+IEBAIC0zODM0LDQxICszODE1LDQ0IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtl X3BjaF90cmFuc2NvZGVyX3NldF90aW1pbmdzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAo+ICAJ CSAgIEk5MTVfUkVBRChWU1lOQ1NISUZUKGNwdV90cmFuc2NvZGVyKSkpOwo+ICB9Cj4gIAo+IC1z dGF0aWMgdm9pZCBjcHRfZW5hYmxlX2ZkaV9iY19iaWZ1cmNhdGlvbihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQo+ICtzdGF0aWMgdm9pZCBjcHRfZW5hYmxlX2ZkaV9iY19iaWZ1cmNhdGlvbihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIGVuYWJsZSkKCmVuYWJsZSBmZWVscyBtaXNuYW1lZCBu b3cuIE1heWJlIHMvZW5hYmxlL3NldC8gaW5zdGVhZD8KCj4gIHsKPiAgCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAl1aW50MzJfdCB0ZW1w Owo+ICAKPiAgCXRlbXAgPSBJOTE1X1JFQUQoU09VVEhfQ0hJQ0tFTjEpOwo+IC0JaWYgKHRlbXAg JiBGRElfQkNfQklGVVJDQVRJT05fU0VMRUNUKQo+ICsJaWYgKCEhKHRlbXAgJiBGRElfQkNfQklG VVJDQVRJT05fU0VMRUNUKSA9PSBlbmFibGUpCj4gIAkJcmV0dXJuOwo+ICAKPiAgCVdBUk5fT04o STkxNV9SRUFEKEZESV9SWF9DVEwoUElQRV9CKSkgJiBGRElfUlhfRU5BQkxFKTsKPiAgCVdBUk5f T04oSTkxNV9SRUFEKEZESV9SWF9DVEwoUElQRV9DKSkgJiBGRElfUlhfRU5BQkxFKTsKPiAgCj4g LQl0ZW1wIHw9IEZESV9CQ19CSUZVUkNBVElPTl9TRUxFQ1Q7Cj4gLQlEUk1fREVCVUdfS01TKCJl bmFibGluZyBmZGkgQyByeFxuIik7Cj4gKwl0ZW1wICY9IH5GRElfQkNfQklGVVJDQVRJT05fU0VM RUNUOwo+ICsJaWYgKGVuYWJsZSkKPiArCQl0ZW1wIHw9IEZESV9CQ19CSUZVUkNBVElPTl9TRUxF Q1Q7Cj4gKwo+ICsJRFJNX0RFQlVHX0tNUygiJXNhYmxpbmcgZmRpIEMgcnhcbiIsIGVuYWJsZSA/ ICJlbiIgOiAiZGlzIik7Cj4gIAlJOTE1X1dSSVRFKFNPVVRIX0NISUNLRU4xLCB0ZW1wKTsKPiAg CVBPU1RJTkdfUkVBRChTT1VUSF9DSElDS0VOMSk7Cj4gIH0KPiAgCj4gLXN0YXRpYyB2b2lkIGl2 eWJyaWRnZV91cGRhdGVfZmRpX2JjX2JpZnVyY2F0aW9uKHN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjKQo+ICtzdGF0aWMgdm9pZCBpdnlicmlkZ2VfdXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlv bihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKPiArCQkJCQkJYm9vbCBwaXBlX2FjdGl2 ZSkKPiAgewo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2NydGMtPmJhc2UuZGV2 Owo+IC0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKPiAgCj4gIAlzd2l0Y2ggKGludGVsX2NydGMtPnBpcGUpIHsKPiAgCWNhc2UgUElQRV9BOgo+ ICAJCWJyZWFrOwo+ICAJY2FzZSBQSVBFX0I6Cj4gLQkJaWYgKGludGVsX2NydGMtPmNvbmZpZy0+ ZmRpX2xhbmVzID4gMikKPiAtCQkJV0FSTl9PTihJOTE1X1JFQUQoU09VVEhfQ0hJQ0tFTjEpICYg RkRJX0JDX0JJRlVSQ0FUSU9OX1NFTEVDVCk7Cj4gKwkJaWYgKGludGVsX2NydGMtPmNvbmZpZy0+ ZmRpX2xhbmVzID4gMiAmJiBwaXBlX2FjdGl2ZSkKPiArCQkJY3B0X2VuYWJsZV9mZGlfYmNfYmlm dXJjYXRpb24oZGV2LCBmYWxzZSk7Cj4gIAkJZWxzZQo+IC0JCQljcHRfZW5hYmxlX2ZkaV9iY19i aWZ1cmNhdGlvbihkZXYpOwo+ICsJCQljcHRfZW5hYmxlX2ZkaV9iY19iaWZ1cmNhdGlvbihkZXYs IHRydWUpOwo+ICAKPiAgCQlicmVhazsKPiAgCWNhc2UgUElQRV9DOgo+IC0JCWNwdF9lbmFibGVf ZmRpX2JjX2JpZnVyY2F0aW9uKGRldik7Cj4gKwkJY3B0X2VuYWJsZV9mZGlfYmNfYmlmdXJjYXRp b24oZGV2LCBwaXBlX2FjdGl2ZSk7Cj4gIAo+ICAJCWJyZWFrOwo+ICAJZGVmYXVsdDoKPiBAQCAt Mzg5NSw3ICszODc5LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2VuYWJsZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCj4gIAlhc3NlcnRfcGNoX3RyYW5zY29kZXJfZGlzYWJsZWQoZGV2X3By aXYsIHBpcGUpOwo+ICAKPiAgCWlmIChJU19JVllCUklER0UoZGV2KSkKPiAtCQlpdnlicmlkZ2Vf dXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihpbnRlbF9jcnRjKTsKPiArCQlpdnlicmlkZ2VfdXBk YXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihpbnRlbF9jcnRjLCB0cnVlKTsKPiAgCj4gIAkvKiBXcml0 ZSB0aGUgVFUgc2l6ZSBiaXRzIGJlZm9yZSBmZGkgbGluayB0cmFpbmluZywgc28gdGhhdCBlcnJv cgo+ICAJICogZGV0ZWN0aW9uIHdvcmtzLiAqLwo+IEBAIC0xMzA1Niw4ICsxMzA0MCw2IEBAIHN0 YXRpYyB2b2lkIGludGVsX2luaXRfZGlzcGxheShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJ fSBlbHNlIGlmIChJU19JVllCUklER0UoZGV2KSkgewo+ICAJCS8qIEZJWE1FOiBkZXRlY3QgQjAr IHN0ZXBwaW5nIGFuZCB1c2UgYXV0byB0cmFpbmluZyAqLwo+ICAJCWRldl9wcml2LT5kaXNwbGF5 LmZkaV9saW5rX3RyYWluID0gaXZiX21hbnVhbF9mZGlfbGlua190cmFpbjsKPiAtCQlkZXZfcHJp di0+ZGlzcGxheS5tb2Rlc2V0X2dsb2JhbF9yZXNvdXJjZXMgPQo+IC0JCQlpdmJfbW9kZXNldF9n bG9iYWxfcmVzb3VyY2VzOwo+ICAJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJP QURXRUxMKGRldikpIHsKPiAgCQlkZXZfcHJpdi0+ZGlzcGxheS5mZGlfbGlua190cmFpbiA9IGhz d19mZGlfbGlua190cmFpbjsKPiAgCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7Cj4g LS0gCj4gMi4xLjAKPiAKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRl bCBDb3Jwb3JhdGlvbgorNDEgKDApIDc5IDM2NSA1NyA0OCAtIGh0dHA6Ly9ibG9nLmZmd2xsLmNo Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==