From: Ander Conselvan de Oliveira Subject: [PATCH] drm/i915: Simplify the way BC bifurcation state consistency is kept Date: Tue, 10 Mar 2015 14:32:34 +0200 Message-ID: <1425990754-8723-1-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <20150309162110.GQ24485@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 08C306E6B4 for ; Tue, 10 Mar 2015 05:32:40 -0700 (PDT) In-Reply-To: <20150309162110.GQ24485@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: daniel@ffwll.ch Cc: Ander Conselvan de Oliveira , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org UmVtb3ZlIHRoZSBnbG9iYWwgbW9kZXNldCByZXNvdXJjZSBmdW5jdGlvbiB0aGF0IHdvdWxkIGRp c2FibGUgdGhlCmJpZnVyY2F0aW9uIGJpdCwgYW5kIGluc3RlYWQgZW5hYmxlL2Rpc2FibGUgaXQg d2hlbiBlbmFibGluZyBvcgpkaXNhYmxpbmcgdGhlIHBjaCB0cmFuc2NvZGVyLiBUaGUgY2hlY2tz IGJlZm9yZSB0aGUgbW9kZSBzZXQgc2hvdWxkCmVuc3VyZSB0aGF0IHRoZSBjb25maWd1cmF0aW9u IGlzIHZhbGlkLCBzbyBpdCBzaG91bGQgYmUgc2FmZSB0byBkbyBpdApzby4KClNpZ25lZC1vZmYt Ynk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZl aXJhQGludGVsLmNvbT4KLS0tCgpPbiBNb24sIDIwMTUtMDMtMDkgYXQgMTc6MjEgKzAxMDAsIERh bmllbCBWZXR0ZXIgd3JvdGU6Cj4gV2l0aCBhdG9taWMgd2UgbmVlZCB0byBwcm9iYWJseSBsb29r IGF0IGNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZC4gQXMgYW4KPiBpbnRlcmltIHNvbHV0aW9uIHdl IGhhdmUgdGhlIHNhbWUgaW5mb3JtYXRpb24gYXZhaWxhYmxlIGluIHRoZQo+IG1vZGVzZXRfcGlw ZXMgYml0bWFzay4gSSB0aGluayByZXBsYWNpbmcgdGhlIGNoZWNrIGZvciBpbnRlbF9jcnRjLT5h Y3RpdmUKPiB3aXRoICEobW9kZXNldF9waXBlcyAmICgxPDxpbnRlbF9jcnRjLT5waXBlKSkgc2hv dWxkIHdvcmsuCgpJIGxvb2tlZCBpbnRvIHRoYXQgc29sdXRpb24sIGJ1dCBpbnZvbHZlcyBwYXNz aW5nIG1vZGVzZXRfcGlwZXMgd2F5IGRvd24KaW50byB0aGUgY2FsbCBzdGFjaywgc28gSSBzdGFy dGVkIGxvb2tpbmcgZm9yIGEgZGlmZmVyZW50IHNvbHV0aW9uLiBEbyB5b3UKc2VlIGFueSBjYXZl YXQgd2l0aCB0aGlzIGFwcHJvYWNoPwoKVGhhbmtzLApBbmRlcgoKLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2MCArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNDAwOGJmNC4uZWNhNWE0 MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTAxLDYgKzEwMSw4IEBA IHN0YXRpYyB2b2lkIGNodl9wcmVwYXJlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJ CSAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogc3RhdGlj IHZvaWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHN0 YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMp Oworc3RhdGljIHZvaWQgaXZ5YnJpZGdlX3VwZGF0ZV9mZGlfYmNfYmlmdXJjYXRpb24oc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMsCisJCQkJCQlib29sIHBpcGVfYWN0aXZlKTsKIAogc3Rh dGljIHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9maW5kX2VuY29kZXIoc3RydWN0IGludGVs X2Nvbm5lY3RvciAqY29ubmVjdG9yLCBpbnQgcGlwZSkKIHsKQEAgLTE5NTYsNiArMTk1OCw4IEBA IHN0YXRpYyB2b2lkIGlyb25sYWtlX2Rpc2FibGVfcGNoX3RyYW5zY29kZXIoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQkgICAgZW51bSBwaXBlIHBpcGUpCiB7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CisJc3RydWN0IGludGVsX2NydGMg KmNydGMgPQorCQl0b19pbnRlbF9jcnRjKGRldl9wcml2LT5waXBlX3RvX2NydGNfbWFwcGluZ1tw aXBlXSk7CiAJdWludDMyX3QgcmVnLCB2YWw7CiAKIAkvKiBGREkgcmVsaWVzIG9uIHRoZSB0cmFu c2NvZGVyICovCkBAIC0xOTgwLDYgKzE5ODQsOSBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9kaXNh YmxlX3BjaF90cmFuc2NvZGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ dmFsICY9IH5UUkFOU19DSElDS0VOMl9USU1JTkdfT1ZFUlJJREU7CiAJCUk5MTVfV1JJVEUocmVn LCB2YWwpOwogCX0KKworCWlmIChJU19JVllCUklER0UoZGV2KSkKKwkJaXZ5YnJpZGdlX3VwZGF0 ZV9mZGlfYmNfYmlmdXJjYXRpb24oY3J0YywgZmFsc2UpOwogfQogCiBzdGF0aWMgdm9pZCBscHRf ZGlzYWJsZV9wY2hfdHJhbnNjb2RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CkBAIC0zMTUzLDMyICszMTYwLDYgQEAgc3RhdGljIGJvb2wgcGlwZV9oYXNfZW5hYmxlZF9wY2go c3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJcmV0dXJuIGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJs ZSAmJiBjcnRjLT5jb25maWctPmhhc19wY2hfZW5jb2RlcjsKIH0KIAotc3RhdGljIHZvaWQgaXZi X21vZGVzZXRfZ2xvYmFsX3Jlc291cmNlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQotewotCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3Ry dWN0IGludGVsX2NydGMgKnBpcGVfQl9jcnRjID0KLQkJdG9faW50ZWxfY3J0YyhkZXZfcHJpdi0+ cGlwZV90b19jcnRjX21hcHBpbmdbUElQRV9CXSk7Ci0Jc3RydWN0IGludGVsX2NydGMgKnBpcGVf Q19jcnRjID0KLQkJdG9faW50ZWxfY3J0YyhkZXZfcHJpdi0+cGlwZV90b19jcnRjX21hcHBpbmdb UElQRV9DXSk7Ci0JdWludDMyX3QgdGVtcDsKLQotCS8qCi0JICogV2hlbiBldmVyeXRoaW5nIGlz IG9mZiBkaXNhYmxlIGZkaSBDIHNvIHRoYXQgd2UgY291bGQgZW5hYmxlIGZkaSBCCi0JICogd2l0 aCBhbGwgbGFuZXMuIE5vdGUgdGhhdCB3ZSBkb24ndCBjYXJlIGFib3V0IGVuYWJsZWQgcGlwZXMg d2l0aG91dAotCSAqIGFuIGVuYWJsZWQgcGNoIGVuY29kZXIuCi0JICovCi0JaWYgKCFwaXBlX2hh c19lbmFibGVkX3BjaChwaXBlX0JfY3J0YykgJiYKLQkgICAgIXBpcGVfaGFzX2VuYWJsZWRfcGNo KHBpcGVfQ19jcnRjKSkgewotCQlXQVJOX09OKEk5MTVfUkVBRChGRElfUlhfQ1RMKFBJUEVfQikp ICYgRkRJX1JYX0VOQUJMRSk7Ci0JCVdBUk5fT04oSTkxNV9SRUFEKEZESV9SWF9DVEwoUElQRV9D KSkgJiBGRElfUlhfRU5BQkxFKTsKLQotCQl0ZW1wID0gSTkxNV9SRUFEKFNPVVRIX0NISUNLRU4x KTsKLQkJdGVtcCAmPSB+RkRJX0JDX0JJRlVSQ0FUSU9OX1NFTEVDVDsKLQkJRFJNX0RFQlVHX0tN UygiZGlzYWJsaW5nIGZkaSBDIHJ4XG4iKTsKLQkJSTkxNV9XUklURShTT1VUSF9DSElDS0VOMSwg dGVtcCk7Ci0JfQotfQotCiAvKiBUaGUgRkRJIGxpbmsgdHJhaW5pbmcgZnVuY3Rpb25zIGZvciBJ TEsvSWJleHBlYWsuICovCiBzdGF0aWMgdm9pZCBpcm9ubGFrZV9mZGlfbGlua190cmFpbihzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiB7CkBAIC0zODM0LDQxICszODE1LDQ0IEBAIHN0YXRpYyB2b2lk IGlyb25sYWtlX3BjaF90cmFuc2NvZGVyX3NldF90aW1pbmdzKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjLAogCQkgICBJOTE1X1JFQUQoVlNZTkNTSElGVChjcHVfdHJhbnNjb2RlcikpKTsKIH0KIAot c3RhdGljIHZvaWQgY3B0X2VuYWJsZV9mZGlfYmNfYmlmdXJjYXRpb24oc3RydWN0IGRybV9kZXZp Y2UgKmRldikKK3N0YXRpYyB2b2lkIGNwdF9lbmFibGVfZmRpX2JjX2JpZnVyY2F0aW9uKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgZW5hYmxlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJdWludDMyX3QgdGVtcDsKIAogCXRl bXAgPSBJOTE1X1JFQUQoU09VVEhfQ0hJQ0tFTjEpOwotCWlmICh0ZW1wICYgRkRJX0JDX0JJRlVS Q0FUSU9OX1NFTEVDVCkKKwlpZiAoISEodGVtcCAmIEZESV9CQ19CSUZVUkNBVElPTl9TRUxFQ1Qp ID09IGVuYWJsZSkKIAkJcmV0dXJuOwogCiAJV0FSTl9PTihJOTE1X1JFQUQoRkRJX1JYX0NUTChQ SVBFX0IpKSAmIEZESV9SWF9FTkFCTEUpOwogCVdBUk5fT04oSTkxNV9SRUFEKEZESV9SWF9DVEwo UElQRV9DKSkgJiBGRElfUlhfRU5BQkxFKTsKIAotCXRlbXAgfD0gRkRJX0JDX0JJRlVSQ0FUSU9O X1NFTEVDVDsKLQlEUk1fREVCVUdfS01TKCJlbmFibGluZyBmZGkgQyByeFxuIik7CisJdGVtcCAm PSB+RkRJX0JDX0JJRlVSQ0FUSU9OX1NFTEVDVDsKKwlpZiAoZW5hYmxlKQorCQl0ZW1wIHw9IEZE SV9CQ19CSUZVUkNBVElPTl9TRUxFQ1Q7CisKKwlEUk1fREVCVUdfS01TKCIlc2FibGluZyBmZGkg QyByeFxuIiwgZW5hYmxlID8gImVuIiA6ICJkaXMiKTsKIAlJOTE1X1dSSVRFKFNPVVRIX0NISUNL RU4xLCB0ZW1wKTsKIAlQT1NUSU5HX1JFQUQoU09VVEhfQ0hJQ0tFTjEpOwogfQogCi1zdGF0aWMg dm9pZCBpdnlicmlkZ2VfdXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihzdHJ1Y3QgaW50ZWxfY3J0 YyAqaW50ZWxfY3J0YykKK3N0YXRpYyB2b2lkIGl2eWJyaWRnZV91cGRhdGVfZmRpX2JjX2JpZnVy Y2F0aW9uKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAorCQkJCQkJYm9vbCBwaXBlX2Fj dGl2ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFzZS5kZXY7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsK IAogCXN3aXRjaCAoaW50ZWxfY3J0Yy0+cGlwZSkgewogCWNhc2UgUElQRV9BOgogCQlicmVhazsK IAljYXNlIFBJUEVfQjoKLQkJaWYgKGludGVsX2NydGMtPmNvbmZpZy0+ZmRpX2xhbmVzID4gMikK LQkJCVdBUk5fT04oSTkxNV9SRUFEKFNPVVRIX0NISUNLRU4xKSAmIEZESV9CQ19CSUZVUkNBVElP Tl9TRUxFQ1QpOworCQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5mZGlfbGFuZXMgPiAyICYmIHBp cGVfYWN0aXZlKQorCQkJY3B0X2VuYWJsZV9mZGlfYmNfYmlmdXJjYXRpb24oZGV2LCBmYWxzZSk7 CiAJCWVsc2UKLQkJCWNwdF9lbmFibGVfZmRpX2JjX2JpZnVyY2F0aW9uKGRldik7CisJCQljcHRf ZW5hYmxlX2ZkaV9iY19iaWZ1cmNhdGlvbihkZXYsIHRydWUpOwogCiAJCWJyZWFrOwogCWNhc2Ug UElQRV9DOgotCQljcHRfZW5hYmxlX2ZkaV9iY19iaWZ1cmNhdGlvbihkZXYpOworCQljcHRfZW5h YmxlX2ZkaV9iY19iaWZ1cmNhdGlvbihkZXYsIHBpcGVfYWN0aXZlKTsKIAogCQlicmVhazsKIAlk ZWZhdWx0OgpAQCAtMzg5NSw3ICszODc5LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2Vu YWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJYXNzZXJ0X3BjaF90cmFuc2NvZGVyX2Rpc2Fi bGVkKGRldl9wcml2LCBwaXBlKTsKIAogCWlmIChJU19JVllCUklER0UoZGV2KSkKLQkJaXZ5YnJp ZGdlX3VwZGF0ZV9mZGlfYmNfYmlmdXJjYXRpb24oaW50ZWxfY3J0Yyk7CisJCWl2eWJyaWRnZV91 cGRhdGVfZmRpX2JjX2JpZnVyY2F0aW9uKGludGVsX2NydGMsIHRydWUpOwogCiAJLyogV3JpdGUg dGhlIFRVIHNpemUgYml0cyBiZWZvcmUgZmRpIGxpbmsgdHJhaW5pbmcsIHNvIHRoYXQgZXJyb3IK IAkgKiBkZXRlY3Rpb24gd29ya3MuICovCkBAIC0xMzA1Niw4ICsxMzA0MCw2IEBAIHN0YXRpYyB2 b2lkIGludGVsX2luaXRfZGlzcGxheShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0gZWxzZSBp ZiAoSVNfSVZZQlJJREdFKGRldikpIHsKIAkJLyogRklYTUU6IGRldGVjdCBCMCsgc3RlcHBpbmcg YW5kIHVzZSBhdXRvIHRyYWluaW5nICovCiAJCWRldl9wcml2LT5kaXNwbGF5LmZkaV9saW5rX3Ry YWluID0gaXZiX21hbnVhbF9mZGlfbGlua190cmFpbjsKLQkJZGV2X3ByaXYtPmRpc3BsYXkubW9k ZXNldF9nbG9iYWxfcmVzb3VyY2VzID0KLQkJCWl2Yl9tb2Rlc2V0X2dsb2JhbF9yZXNvdXJjZXM7 CiAJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsKIAkJ ZGV2X3ByaXYtPmRpc3BsYXkuZmRpX2xpbmtfdHJhaW4gPSBoc3dfZmRpX2xpbmtfdHJhaW47CiAJ fSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKLS0gCjIuMS4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=