From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 01/19] drm: Wire up proper acquire ctx for plane functions Date: Wed, 22 Mar 2017 22:50:40 +0100 Message-ID: <20170322215058.8671-2-daniel.vetter@ffwll.ch> References: <20170322215058.8671-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4550897E7 for ; Wed, 22 Mar 2017 21:51:07 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id l37so28605988wrc.3 for ; Wed, 22 Mar 2017 14:51:07 -0700 (PDT) In-Reply-To: <20170322215058.8671-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI Development Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VGhpcyBpcyBqdXN0IHByZXAgd29yayB0byBnZXQgYW4gYWNxdWlyZSBjdHggaW50byBldmVyeSBw bGFjZSB3aGVyZSB3ZQpjYWxsIC0+dXBkYXRlX3BsYW5lIG9yIC0+ZGlzYWJsZV9wbGFuZS4KCnYy OiBLZWVwIHRoZSBoaWRkZW4gYWNxdWlyZV9jdHggcG9pbnRlcnMgdmFsaWQgd2hpbGUgdHJhbnNp dGlvbmluZy4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYyB8IDUyICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQyIGlu c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwppbmRleCBhMjJlNzY4 MzcwNjUuLjBkMDQ4ODgxNzJhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFu ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwpAQCAtNDU3LDcgKzQ1Nyw4IEBA IHN0YXRpYyBpbnQgX19zZXRwbGFuZV9pbnRlcm5hbChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAkJCSAgICAgICB1aW50MzJfdCBjcnRjX3csIHVpbnQzMl90IGNydGNfaCwKIAkJCSAgICAgICAv KiBzcmNfe3gseSx3LGh9IHZhbHVlcyBhcmUgMTYuMTYgZml4ZWQgcG9pbnQgKi8KIAkJCSAgICAg ICB1aW50MzJfdCBzcmNfeCwgdWludDMyX3Qgc3JjX3ksCi0JCQkgICAgICAgdWludDMyX3Qgc3Jj X3csIHVpbnQzMl90IHNyY19oKQorCQkJICAgICAgIHVpbnQzMl90IHNyY193LCB1aW50MzJfdCBz cmNfaCwKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCkKIHsK IAlpbnQgcmV0ID0gMDsKIApAQCAtNTM3LDEzICs1MzgsMjYgQEAgc3RhdGljIGludCBzZXRwbGFu ZV9pbnRlcm5hbChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgdWludDMyX3Qgc3Jj X3gsIHVpbnQzMl90IHNyY195LAogCQkJICAgICB1aW50MzJfdCBzcmNfdywgdWludDMyX3Qgc3Jj X2gpCiB7CisJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4IGN0eDsKIAlpbnQgcmV0Owog Ci0JZHJtX21vZGVzZXRfbG9ja19hbGwocGxhbmUtPmRldik7CisJZHJtX21vZGVzZXRfYWNxdWly ZV9pbml0KCZjdHgsIDApOworcmV0cnk6CisJcmV0ID0gZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4 KHBsYW5lLT5kZXYsICZjdHgpOworCWlmIChyZXQpCisJCWdvdG8gZmFpbDsKKwlwbGFuZS0+ZGV2 LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eCA9ICZjdHg7CiAJcmV0ID0gX19zZXRwbGFuZV9pbnRl cm5hbChwbGFuZSwgY3J0YywgZmIsCiAJCQkJICBjcnRjX3gsIGNydGNfeSwgY3J0Y193LCBjcnRj X2gsCi0JCQkJICBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNfaCk7Ci0JZHJtX21vZGVzZXRfdW5s b2NrX2FsbChwbGFuZS0+ZGV2KTsKKwkJCQkgIHNyY194LCBzcmNfeSwgc3JjX3csIHNyY19oLCAm Y3R4KTsKKworZmFpbDoKKwlpZiAocmV0ID09IC1FREVBRExLKSB7CisJCWRybV9tb2Rlc2V0X2Jh Y2tvZmYoJmN0eCk7CisJCWdvdG8gcmV0cnk7CisJfQorCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3Mo JmN0eCk7CisJZHJtX21vZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOwogCiAJcmV0dXJuIHJldDsK IH0KQEAgLTYxMywxMSArNjI3LDIyIEBAIHN0YXRpYyBpbnQgZHJtX21vZGVfY3Vyc29yX3VuaXZl cnNhbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaW50MzJfdCBjcnRjX3gsIGNydGNfeTsKIAl1 aW50MzJfdCBjcnRjX3cgPSAwLCBjcnRjX2ggPSAwOwogCXVpbnQzMl90IHNyY193ID0gMCwgc3Jj X2ggPSAwOworCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7CiAJaW50IHJldCA9 IDA7CiAKIAlCVUdfT04oIWNydGMtPmN1cnNvcik7CiAJV0FSTl9PTihjcnRjLT5jdXJzb3ItPmNy dGMgIT0gY3J0YyAmJiBjcnRjLT5jdXJzb3ItPmNydGMgIT0gTlVMTCk7CiAKKwlkcm1fbW9kZXNl dF9hY3F1aXJlX2luaXQoJmN0eCwgMCk7CityZXRyeToKKwlyZXQgPSBkcm1fbW9kZXNldF9sb2Nr KCZjcnRjLT5tdXRleCwgJmN0eCk7CisJaWYgKHJldCkKKwkJZ290byBmYWlsOworCXJldCA9IGRy bV9tb2Rlc2V0X2xvY2soJmNydGMtPmN1cnNvci0+bXV0ZXgsICZjdHgpOworCWlmIChyZXQpCisJ CWdvdG8gZmFpbDsKKwljcnRjLT5hY3F1aXJlX2N0eCA9ICZjdHg7CisKIAkvKgogCSAqIE9idGFp biBmYiB3ZSdsbCBiZSB1c2luZyAoZWl0aGVyIG5ldyBvciBleGlzdGluZykgYW5kIHRha2UgYW4g ZXh0cmEKIAkgKiByZWZlcmVuY2UgdG8gaXQgaWYgZmIgIT0gbnVsbC4gIHNldHBsYW5lIHdpbGwg dGFrZSBjYXJlIG9mIGRyb3BwaW5nCkBAIC02NjIsNyArNjg3LDcgQEAgc3RhdGljIGludCBkcm1f bW9kZV9jdXJzb3JfdW5pdmVyc2FsKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKi8KIAlyZXQg PSBfX3NldHBsYW5lX2ludGVybmFsKGNydGMtPmN1cnNvciwgY3J0YywgZmIsCiAJCQkJY3J0Y194 LCBjcnRjX3ksIGNydGNfdywgY3J0Y19oLAotCQkJCTAsIDAsIHNyY193LCBzcmNfaCk7CisJCQkJ MCwgMCwgc3JjX3csIHNyY19oLCAmY3R4KTsKIAogCS8qIFVwZGF0ZSBzdWNjZXNzZnVsOyBzYXZl IG5ldyBjdXJzb3IgcG9zaXRpb24sIGlmIG5lY2Vzc2FyeSAqLwogCWlmIChyZXQgPT0gMCAmJiBy ZXEtPmZsYWdzICYgRFJNX01PREVfQ1VSU09SX01PVkUpIHsKQEAgLTY3MCw2ICs2OTUsMTUgQEAg c3RhdGljIGludCBkcm1fbW9kZV9jdXJzb3JfdW5pdmVyc2FsKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKIAkJY3J0Yy0+Y3Vyc29yX3kgPSByZXEtPnk7CiAJfQogCitmYWlsOgorCWlmIChyZXQgPT0g LUVERUFETEspIHsKKwkJZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKKwkJZ290byByZXRyeTsK Kwl9CisKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOworCWRybV9tb2Rlc2V0X2FjcXVp cmVfZmluaSgmY3R4KTsKKwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTY5NiwxMiArNzMwLDEwIEBA IHN0YXRpYyBpbnQgZHJtX21vZGVfY3Vyc29yX2NvbW1vbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCSAqIElmIHRoaXMgY3J0YyBoYXMgYSB1bml2ZXJzYWwgY3Vyc29yIHBsYW5lLCBjYWxsIHRo YXQgcGxhbmUncyB1cGRhdGUKIAkgKiBoYW5kbGVyIHJhdGhlciB0aGFuIHVzaW5nIGxlZ2FjeSBj dXJzb3IgaGFuZGxlcnMuCiAJICovCi0JZHJtX21vZGVzZXRfbG9ja19jcnRjKGNydGMsIGNydGMt PmN1cnNvcik7Ci0JaWYgKGNydGMtPmN1cnNvcikgewotCQlyZXQgPSBkcm1fbW9kZV9jdXJzb3Jf dW5pdmVyc2FsKGNydGMsIHJlcSwgZmlsZV9wcml2KTsKLQkJZ290byBvdXQ7Ci0JfQorCWlmIChj cnRjLT5jdXJzb3IpCisJCXJldHVybiBkcm1fbW9kZV9jdXJzb3JfdW5pdmVyc2FsKGNydGMsIHJl cSwgZmlsZV9wcml2KTsKIAorCWRybV9tb2Rlc2V0X2xvY2tfY3J0YyhjcnRjLCBjcnRjLT5jdXJz b3IpOwogCWlmIChyZXEtPmZsYWdzICYgRFJNX01PREVfQ1VSU09SX0JPKSB7CiAJCWlmICghY3J0 Yy0+ZnVuY3MtPmN1cnNvcl9zZXQgJiYgIWNydGMtPmZ1bmNzLT5jdXJzb3Jfc2V0MikgewogCQkJ cmV0ID0gLUVOWElPOwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK