From: Matt Roper Subject: [PATCH i-g-t] kms_universal_plane.c: Update sanity checks for gen9 Date: Thu, 2 Jul 2015 16:01:14 -0700 Message-ID: <1435878074-11013-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id EA06B6E093 for ; Thu, 2 Jul 2015 16:01:40 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org U0tMIGFuZCBCWFQgaGF2ZSBzb21lIG5ldyBwbGFuZSBjYXBhYmlsaXRpZXMgdGhhdCBwcmV2aW91 cyBnZW5lcmF0aW9ucwpkaWRuJ3QgaGF2ZTsgd2UgbmVlZCB0byB1cGRhdGUgc29tZSBvZiBvdXIg dW5pdmVyc2FsIHBsYW5lIHRlc3RzIHRvCmV4cGVjdCBzdWNjZXNzIHJhdGhlciB0aGFuIGZhaWx1 cmUgd2hlbiBydW5uaW5nIG9uIHRoZXNlIHBsYXRmb3Jtcy4KClNpZ25lZC1vZmYtYnk6IE1hdHQg Um9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogdGVzdHMva21zX3VuaXZlcnNh bF9wbGFuZS5jIHwgMjEgKysrKysrKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTQg aW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfdW5p dmVyc2FsX3BsYW5lLmMgYi90ZXN0cy9rbXNfdW5pdmVyc2FsX3BsYW5lLmMKaW5kZXggZTY5Mjcx Ny4uNjM1Y2M3OSAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3VuaXZlcnNhbF9wbGFuZS5jCisrKyBi L3Rlc3RzL2ttc191bml2ZXJzYWxfcGxhbmUuYwpAQCAtMjksMTAgKzI5LDEyIEBACiAjaW5jbHVk ZSAiZHJtdGVzdC5oIgogI2luY2x1ZGUgImlndF9kZWJ1Z2ZzLmgiCiAjaW5jbHVkZSAiaWd0X2tt cy5oIgorI2luY2x1ZGUgImludGVsX2NoaXBzZXQuaCIKIAogdHlwZWRlZiBzdHJ1Y3QgewogCWlu dCBkcm1fZmQ7CiAJaWd0X2Rpc3BsYXlfdCBkaXNwbGF5OworCWludCBnZW47CiB9IGRhdGFfdDsK IAogdHlwZWRlZiBzdHJ1Y3QgewpAQCAtMzU1LDYgKzM1Nyw3IEBAIHNhbml0eV90ZXN0X3BpcGUo ZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgaWd0X291dHB1dF90ICpvdXRwdXQpCiAJaWd0 X3BsYW5lX3QgKnByaW1hcnk7CiAJZHJtTW9kZU1vZGVJbmZvICptb2RlOwogCWludCBpOworCWlu dCBleHBlY3Q7CiAKIAlpZ3Rfc2tpcF9vbihwaXBlID49IGRhdGEtPmRpc3BsYXkubl9waXBlcyk7 CiAKQEAgLTM3MSwxOCArMzc0LDIxIEBAIHNhbml0eV90ZXN0X3BpcGUoZGF0YV90ICpkYXRhLCBl bnVtIHBpcGUgcGlwZSwgaWd0X291dHB1dF90ICpvdXRwdXQpCiAKIAkvKgogCSAqIFRyeSB0byB1 c2UgdW5pdmVyc2FsIHBsYW5lIEFQSSB0byBzZXQgcHJpbWFyeSBwbGFuZSB0aGF0Ci0JICogZG9l c24ndCBjb3ZlciBDUlRDIChzaG91bGQgZmFpbCkuCisJICogZG9lc24ndCBjb3ZlciBDUlRDIChz aG91bGQgZmFpbCBvbiBwcmUtZ2VuOSBhbmQgc3VjY2VlZCBvbgorCSAqIGdlbjkrKS4KIAkgKi8K IAlpZ3RfcGxhbmVfc2V0X2ZiKHByaW1hcnksICZ0ZXN0LnVuZGVyc2l6ZWRfZmIpOwotCWlndF9h c3NlcnQoaWd0X2Rpc3BsYXlfdHJ5X2NvbW1pdDIoJmRhdGEtPmRpc3BsYXksIENPTU1JVF9VTklW RVJTQUwpID09IC1FSU5WQUwpOworCWV4cGVjdCA9IChkYXRhLT5nZW4gPCA5KSA/IC1FSU5WQUwg OiAwOworCWlndF9hc3NlcnQoaWd0X2Rpc3BsYXlfdHJ5X2NvbW1pdDIoJmRhdGEtPmRpc3BsYXks IENPTU1JVF9VTklWRVJTQUwpID09IGV4cGVjdCk7CiAKIAkvKiBTYW1lIGFzIGFib3ZlLCBidXQg ZGlmZmVyZW50IHBsYW5lIHBvc2l0aW9uaW5nLiAqLwogCWlndF9wbGFuZV9zZXRfcG9zaXRpb24o cHJpbWFyeSwgMTAwLCAxMDApOwotCWlndF9hc3NlcnQoaWd0X2Rpc3BsYXlfdHJ5X2NvbW1pdDIo JmRhdGEtPmRpc3BsYXksIENPTU1JVF9VTklWRVJTQUwpID09IC1FSU5WQUwpOworCWlndF9hc3Nl cnQoaWd0X2Rpc3BsYXlfdHJ5X2NvbW1pdDIoJmRhdGEtPmRpc3BsYXksIENPTU1JVF9VTklWRVJT QUwpID09IGV4cGVjdCk7CiAKIAlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKHByaW1hcnksIDAsIDAp OwogCi0JLyogVHJ5IHRvIHVzZSB1bml2ZXJzYWwgcGxhbmUgQVBJIHRvIHNjYWxlIGRvd24gKHNo b3VsZCBmYWlsKSAqLworCS8qIFRyeSB0byB1c2UgdW5pdmVyc2FsIHBsYW5lIEFQSSB0byBzY2Fs ZSBkb3duIChzaG91bGQgZmFpbCBvbiBwcmUtZ2VuOSkgKi8KKwlleHBlY3QgPSAoZGF0YS0+Z2Vu IDwgOSkgPyAtRVJBTkdFIDogMDsKIAlpZ3RfYXNzZXJ0KGRybU1vZGVTZXRQbGFuZShkYXRhLT5k cm1fZmQsIHByaW1hcnktPmRybV9wbGFuZS0+cGxhbmVfaWQsCiAJCQkJICAgb3V0cHV0LT5jb25m aWcuY3J0Yy0+Y3J0Y19pZCwKIAkJCQkgICB0ZXN0Lm92ZXJzaXplZF9mYi5mYl9pZCwgMCwKQEAg LTM5MSw5ICszOTcsOSBAQCBzYW5pdHlfdGVzdF9waXBlKGRhdGFfdCAqZGF0YSwgZW51bSBwaXBl IHBpcGUsIGlndF9vdXRwdXRfdCAqb3V0cHV0KQogCQkJCSAgIG1vZGUtPnZkaXNwbGF5ICsgMTAw LAogCQkJCSAgIElHVF9GSVhFRCgwLDApLCBJR1RfRklYRUQoMCwwKSwKIAkJCQkgICBJR1RfRklY RUQobW9kZS0+aGRpc3BsYXksMCksCi0JCQkJICAgSUdUX0ZJWEVEKG1vZGUtPnZkaXNwbGF5LDAp KSA9PSAtRVJBTkdFKTsKKwkJCQkgICBJR1RfRklYRUQobW9kZS0+dmRpc3BsYXksMCkpID09IGV4 cGVjdCk7CiAKLQkvKiBUcnkgdG8gdXNlIHVuaXZlcnNhbCBwbGFuZSBBUEkgdG8gc2NhbGUgdXAg KHNob3VsZCBmYWlsKSAqLworCS8qIFRyeSB0byB1c2UgdW5pdmVyc2FsIHBsYW5lIEFQSSB0byBz Y2FsZSB1cCAoc2hvdWxkIGZhaWwgb24gcHJlLWdlbjkpICovCiAJaWd0X2Fzc2VydChkcm1Nb2Rl U2V0UGxhbmUoZGF0YS0+ZHJtX2ZkLCBwcmltYXJ5LT5kcm1fcGxhbmUtPnBsYW5lX2lkLAogCQkJ CSAgIG91dHB1dC0+Y29uZmlnLmNydGMtPmNydGNfaWQsCiAJCQkJICAgdGVzdC5vdmVyc2l6ZWRf ZmIuZmJfaWQsIDAsCkBAIC00MDIsNyArNDA4LDcgQEAgc2FuaXR5X3Rlc3RfcGlwZShkYXRhX3Qg KmRhdGEsIGVudW0gcGlwZSBwaXBlLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCkKIAkJCQkgICBtb2Rl LT52ZGlzcGxheSwKIAkJCQkgICBJR1RfRklYRUQoMCwwKSwgSUdUX0ZJWEVEKDAsMCksCiAJCQkJ ICAgSUdUX0ZJWEVEKG1vZGUtPmhkaXNwbGF5IC0gMTAwLDApLAotCQkJCSAgIElHVF9GSVhFRCht b2RlLT52ZGlzcGxheSAtIDEwMCwwKSkgPT0gLUVSQU5HRSk7CisJCQkJICAgSUdUX0ZJWEVEKG1v ZGUtPnZkaXNwbGF5IC0gMTAwLDApKSA9PSBleHBlY3QpOwogCiAJLyogRmluZCBvdGhlciBjcnRj cyBhbmQgdHJ5IHRvIHByb2dyYW0gb3VyIHByaW1hcnkgcGxhbmUgb24gdGhlbSAqLwogCWZvciAo aSA9IDA7IGkgPCB0ZXN0Lm1vZGVyZXMtPmNvdW50X2NydGNzOyBpKyspCkBAIC02NjcsNiArNjcz LDcgQEAgaWd0X21haW4KIAogCWlndF9maXh0dXJlIHsKIAkJZGF0YS5kcm1fZmQgPSBkcm1fb3Bl bl9hbnlfbWFzdGVyKCk7CisJCWRhdGEuZ2VuID0gaW50ZWxfZ2VuKGludGVsX2dldF9kcm1fZGV2 aWQoZGF0YS5kcm1fZmQpKTsKIAogCQlrbXN0ZXN0X3NldF92dF9ncmFwaGljc19tb2RlKCk7CiAK LS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=