From: Matt Roper Subject: [PATCH] drm: Check fb against plane size rather than CRTC mode for pageflip Date: Tue, 6 Oct 2015 17:02:47 -0700 Message-ID: <1444176167-28319-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 28FA96E17F for ; Tue, 6 Oct 2015 17:03:29 -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 VGhlIGxlZ2FjeSBwYWdlZmxpcCBpb2N0bCBjYWxscyBkcm1fY3J0Y19jaGVja192aWV3cG9ydCgp IHRvIGRldGVybWluZQp3aGV0aGVyIHRoZSBmcmFtZWJ1ZmZlciBiZWluZyBmbGlwcGVkIGlzIGJp ZyBlbm91Z2ggdG8gZmlsbCB0aGUgZGlzcGxheQppdCBpcyBiZWluZyBmbGlwcGVkIHRvLiAgSG93 ZXZlciBzb21lIGRyaXZlcnMgc3VwcG9ydCAid2luZG93aW5nIiBvZgp0aGVpciBwcmltYXJ5IHBs YW5lcyAoaS5lLiwgYSBwcmltYXJ5IHBsYW5lIHRoYXQgZG9lcyBub3QgY292ZXIgdGhlCmVudGly ZSBDUlRDIGRpbWVuc2lvbnMpOyBpbiBzdWNoIHNpdHVhdGlvbnMgd2UgY2FuIHdpbmQgdXAgcmVq ZWN0aW5nCnZhbGlkIHBhZ2VmbGlwcyBvZiBidWZmZXJzIHRoYXQgYXJlIHNtYWxsZXIgdGhhbiB0 aGUgZGlzcGxheSBtb2RlLCBidXQKc3RpbGwgbGFyZ2UgZW5vdWdoIHRvIGZpbGwgdGhlIGVudGly ZSBwcmltYXJ5IHBsYW5lLgoKV2hhdCB3ZSByZWFsbHkgd2FudCB0byBiZSBjb21wYXJpbmcgYWdh aW5zdCBmb3IgcGFnZWZsaXBzIGlzIHRoZSBzaXplIG9mCnRoZSBwcmltYXJ5IHBsYW5lLCB3aGlj aCBjYW4gYmUgZm91bmQgaW4gY3J0Yy0+cHJpbWFyeS0+c3RhdGUgZm9yIGF0b21pYwpkcml2ZXJz IChhbmQgZHJpdmVycyBpbiB0aGUgcHJvY2VzcyBvZiB0cmFuc2l0aW9uaW5nIHRvIGF0b21pYyku ICBUaGVyZQphcmUgbm8gbm9uLWF0b21pYyBkcml2ZXJzIHRoYXQgc3VwcG9ydCBwcmltYXJ5IHBs YW5lIHdpbmRvd2luZyBhdCB0aGUKbW9tZW50LCBzbyB3ZSdsbCBjb250aW51ZSB0byB1c2UgdGhl IGN1cnJlbnQgYmVoYXZpb3Igb2YgbG9va2luZyBhdCB0aGUKQ1JUQyBtb2RlIHNpemUgb24gZHJp dmVycyB0aGF0IGRvbid0IGhhdmUgYSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS4gIFdlJ2xsCmFsc28g Y29udGludWUgdG8gdXNlIHRoZSBleGlzdGluZyBsb2dpYyBmb3IgU2V0Q3J0Yywgd2hpY2ggaXMg dGhlIG90aGVyCmNhbGxzaXRlIGZvciBkcm1fY3J0Y19jaGVja192aWV3cG9ydCgpLCBzaW5jZSBs ZWdhY3kgbW9kZXNldHMgcmVwcm9ncmFtCnRoZSBwcmltYXJ5IHBsYW5lIGFuZCByZW1vdmUgd2lu ZG93aW5nLgoKTm90ZSB0aGF0IHRoZSBleGlzdGluZyBjb2RlIHdhcyBjaGVja2luZyBhIGNydGMt PmludmVydF9kaW1lbnNpb25zIGZpZWxkCnRvIGRldGVybWluZSB3aGV0aGVyIHRoZSB3aWR0aC9o ZWlnaHQgb2YgdGhlIG1vZGUgbmVlZGVkIHRvIGJlIHN3YXBwZWQuCkEgYm9udXMgb2YgY2hlY2tp bmcgcGxhbmUgc2l6ZSBpcyB0aGF0IHRoZSBzb3VyY2Ugd2lkdGgvaGVpZ2h0IHdlIGdldAphbHJl YWR5IHRha2Ugcm90YXRpb24gaW50byBhY2NvdW50IHNvIHRoYXQgY2hlY2sgaXMgbm8gbG9uZ2Vy IG5lY2Vzc2FyeQp3aGVuIHVzaW5nIHRoZSBwbGFuZSBzaXplLgoKVGVzdGNhc2U6IGlndC91bml2 ZXJzYWwtcGxhbmUtZ2VuOS1mZWF0dXJlcy1waXBlLSMKUmVwb3J0ZWQtYnk6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBsaW51eC5pbnRlbC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AbGludXguaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxs ZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0 dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyB8 IDg3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA3MSBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5j CmluZGV4IGU2MDBhNWYuLjM1Y2Q0ZGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f Y3J0Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY3J0Yy5jCkBAIC0yNTM0LDkgKzI1MzQs NzYgQEAgdm9pZCBkcm1fY3J0Y19nZXRfaHZfdGltaW5nKGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxh eV9tb2RlICptb2RlLAogfQogRVhQT1JUX1NZTUJPTChkcm1fY3J0Y19nZXRfaHZfdGltaW5nKTsK IAorc3RhdGljIGludCBjaGVja192aWV3cG9ydChpbnQgaGRpc3BsYXksCisJCQkgIGludCB2ZGlz cGxheSwKKwkJCSAgaW50IHgsCisJCQkgIGludCB5LAorCQkJICBib29sIGludmVydF9kaW1lbnNp b25zLAorCQkJICBjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKK3sKKwlpZiAoaW52 ZXJ0X2RpbWVuc2lvbnMpCisJCXN3YXAoaGRpc3BsYXksIHZkaXNwbGF5KTsKKworCWlmIChoZGlz cGxheSA+IGZiLT53aWR0aCB8fAorCSAgICB2ZGlzcGxheSA+IGZiLT5oZWlnaHQgfHwKKwkgICAg eCA+IGZiLT53aWR0aCAtIGhkaXNwbGF5IHx8CisJICAgIHkgPiBmYi0+aGVpZ2h0IC0gdmRpc3Bs YXkpIHsKKwkJRFJNX0RFQlVHX0tNUygiSW52YWxpZCBmYiBzaXplICV1eCV1IGZvciBDUlRDIHZp ZXdwb3J0ICV1eCV1KyVkKyVkJXMuXG4iLAorCQkJICAgICAgZmItPndpZHRoLCBmYi0+aGVpZ2h0 LCBoZGlzcGxheSwgdmRpc3BsYXksIHgsIHksCisJCQkgICAgICBpbnZlcnRfZGltZW5zaW9ucyA/ ICIgKGludmVydGVkKSIgOiAiIik7CisJCXJldHVybiAtRU5PU1BDOworCX0KKworCXJldHVybiAw OworfQorCisvKioKKyAqIGRybV9wbGFuZV9jaGVja192aWV3cG9ydCAtIENoZWNrcyB0aGF0IGEg ZnJhbWVidWZmZXIgaXMgYmlnIGVub3VnaCBmb3IgdGhlCisgKiAgICAgcGxhbmUncyB2aWV3cG9y dAorICogQHBsYW5lOiBQbGFuZSB0aGF0IGZyYW1lYnVmZmVyIHdpbGwgYmUgZGlzcGxheWVkIG9u CisgKiBAeDogeCBwYW5uaW5nCisgKiBAeTogeSBwYW5uaW5nCisgKiBAZmI6IGZyYW1lYnVmZmVy IHRvIGNoZWNrIHNpemUgb2YKKyAqCisgKiBBdG9taWMgZHJpdmVycyAob3IgdHJhbnNpdGlvbmlu ZyBkcml2ZXJzIHRoYXQgc3VwcG9ydCBwcm9wZXIgcGxhbmUgc3RhdGUpCisgKiBtYXkgY2FsbCB0 aGlzIGZ1bmN0aW9uIG9uIGFueSBwbGFuZS4gIE5vbi1hdG9taWMgZHJpdmVycyBtYXkgb25seSBj YWxsIHRoaXMKKyAqIGZvciB0aGUgcHJpbWFyeSBwbGFuZSB3aGlsZSB0aGUgQ1JUQyBpcyBhY3Rp dmUgKHdlJ2xsIGFzc3VtZSB0aGF0IHRoZQorICogcHJpbWFyeSBwbGFuZSBjb3ZlcnMgdGhlIGVu dGlyZSBDUlRDIGluIHRoYXQgY2FzZSkuCisgKi8KK2ludCBkcm1fcGxhbmVfY2hlY2tfdmlld3Bv cnQoY29uc3Qgc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICAgIGludCB4LAorCQkJICAg ICBpbnQgeSwKKwkJCSAgICAgY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIpCisKK3sK KwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBwbGFuZS0+Y3J0YzsKKwlpbnQgaGRpc3BsYXksIHZk aXNwbGF5OworCisJaWYgKFdBUk5fT04ocGxhbmUtPnN0YXRlID09IE5VTEwgJiYKKwkJICAgIHBs YW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpKQorCQlyZXR1cm4gLUVJTlZBTDsK KworCS8qCisJICogTm9uLWF0b21pYyBkcml2ZXJzIG1heSBub3QgaGF2ZSB2YWxpZCBwbGFuZSBz dGF0ZSB0byBsb29rIGF0LiAgQnV0CisJICogdGhvc2UgZHJpdmVycyBhbHNvIGRvbid0IHN1cHBv cnQgd2luZG93aW5nIG9mIHRoZSBwcmltYXJ5IHBsYW5lLCBzbworCSAqIHdlIGNhbiBmYWxsIGJh Y2sgdG8gbG9va2luZyBhdCB0aGUgbW9kZSBvZiB0aGUgb3duaW5nIENSVEMuCisJICovCisJaWYg KHBsYW5lLT5zdGF0ZSkgeworCQloZGlzcGxheSA9IHBsYW5lLT5zdGF0ZS0+c3JjX3cgPj4gMTY7 CisJCXZkaXNwbGF5ID0gcGxhbmUtPnN0YXRlLT5zcmNfaCA+PiAxNjsKKwl9IGVsc2UgaWYgKFdB Uk5fT04oIWNydGMpKSB7CisJCWhkaXNwbGF5ID0gdmRpc3BsYXkgPSAwOworCX0gZWxzZSB7CisJ CWRybV9jcnRjX2dldF9odl90aW1pbmcoJmNydGMtPm1vZGUsICZoZGlzcGxheSwgJnZkaXNwbGF5 KTsKKwl9CisKKwlyZXR1cm4gY2hlY2tfdmlld3BvcnQoaGRpc3BsYXksIHZkaXNwbGF5LCB4LCB5 LCBmYWxzZSwgZmIpOworfQorRVhQT1JUX1NZTUJPTChkcm1fcGxhbmVfY2hlY2tfdmlld3BvcnQp OworCiAvKioKICAqIGRybV9jcnRjX2NoZWNrX3ZpZXdwb3J0IC0gQ2hlY2tzIHRoYXQgYSBmcmFt ZWJ1ZmZlciBpcyBiaWcgZW5vdWdoIGZvciB0aGUKLSAqICAgICBDUlRDIHZpZXdwb3J0CisgKiAg ICAgQ1JUQyB2aWV3cG9ydCB3aGVuIHJ1bm5pbmcgaW4gdGhlIHNwZWNpZmllZCBtb2RlCiAgKiBA Y3J0YzogQ1JUQyB0aGF0IGZyYW1lYnVmZmVyIHdpbGwgYmUgZGlzcGxheWVkIG9uCiAgKiBAeDog eCBwYW5uaW5nCiAgKiBAeTogeSBwYW5uaW5nCkBAIC0yNTUzLDIwICsyNjIwLDggQEAgaW50IGRy bV9jcnRjX2NoZWNrX3ZpZXdwb3J0KGNvbnN0IHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogCWRy bV9jcnRjX2dldF9odl90aW1pbmcobW9kZSwgJmhkaXNwbGF5LCAmdmRpc3BsYXkpOwogCi0JaWYg KGNydGMtPmludmVydF9kaW1lbnNpb25zKQotCQlzd2FwKGhkaXNwbGF5LCB2ZGlzcGxheSk7Ci0K LQlpZiAoaGRpc3BsYXkgPiBmYi0+d2lkdGggfHwKLQkgICAgdmRpc3BsYXkgPiBmYi0+aGVpZ2h0 IHx8Ci0JICAgIHggPiBmYi0+d2lkdGggLSBoZGlzcGxheSB8fAotCSAgICB5ID4gZmItPmhlaWdo dCAtIHZkaXNwbGF5KSB7Ci0JCURSTV9ERUJVR19LTVMoIkludmFsaWQgZmIgc2l6ZSAldXgldSBm b3IgQ1JUQyB2aWV3cG9ydCAldXgldSslZCslZCVzLlxuIiwKLQkJCSAgICAgIGZiLT53aWR0aCwg ZmItPmhlaWdodCwgaGRpc3BsYXksIHZkaXNwbGF5LCB4LCB5LAotCQkJICAgICAgY3J0Yy0+aW52 ZXJ0X2RpbWVuc2lvbnMgPyAiIChpbnZlcnRlZCkiIDogIiIpOwotCQlyZXR1cm4gLUVOT1NQQzsK LQl9Ci0KLQlyZXR1cm4gMDsKKwlyZXR1cm4gY2hlY2tfdmlld3BvcnQoaGRpc3BsYXksIHZkaXNw bGF5LCB4LCB5LAorCQkJICAgICAgY3J0Yy0+aW52ZXJ0X2RpbWVuc2lvbnMsIGZiKTsKIH0KIEVY UE9SVF9TWU1CT0woZHJtX2NydGNfY2hlY2tfdmlld3BvcnQpOwogCkBAIC01MTgxLDcgKzUyMzYs NyBAQCBpbnQgZHJtX21vZGVfcGFnZV9mbGlwX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CiAJCWdvdG8gb3V0OwogCX0KIAotCXJldCA9IGRybV9jcnRjX2NoZWNrX3ZpZXdwb3J0KGNydGMs IGNydGMtPngsIGNydGMtPnksICZjcnRjLT5tb2RlLCBmYik7CisJcmV0ID0gZHJtX3BsYW5lX2No ZWNrX3ZpZXdwb3J0KGNydGMtPnByaW1hcnksIGNydGMtPngsIGNydGMtPnksIGZiKTsKIAlpZiAo cmV0KQogCQlnb3RvIG91dDsKIAotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==