From: Matt Roper Subject: [RFC 03/15] drm/i915: Update sprite watermarks outside vblank evasion Date: Wed, 20 May 2015 19:12:15 -0700 Message-ID: <1432174347-19138-4-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id CA6C66E804 for ; Wed, 20 May 2015 19:12:28 -0700 (PDT) In-Reply-To: <1432174347-19138-1-git-send-email-matthew.d.roper@intel.com> 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 V2UgbmV2ZXIgcmVtb3ZlZCB0aGUgc3ByaXRlIHdhdGVybWFyayB1cGRhdGVzIGZyb20gb3VyIGxv dy1sZXZlbApmb29fdXBkYXRlX3BsYW5lKCkgZnVuY3Rpb25zOyBzaW5jZSBvdXIgaGFyZHdhcmUg dXBkYXRlcyBoYXBwZW4gdW5kZXIKdmJsYW5rIGV2YXNpb24sIHdlJ3JlIG5vdCBzdXBwb3NlZCB0 byBiZSBjYWxsaW5nIHBvdGVudGlhbGx5IHNsZWVwaW5nCmZ1bmN0aW9ucyB0aGVyZSAoc2luY2Ug aW50ZXJydXB0cyBhcmUgZGlzYWJsZWQpLiAgRW5zdXJlIHRoYXQgd2UKcHJvcGVybHkgc2V0IHRo ZSBhdG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzIGZsYWcgc28gdGhhdCB0aGVzZQp1cGRh dGVzIHdpbGwgaGFwcGVuIG91dHNpZGUgdmJsYW5rIGV2YXNpb24gYW5kIHdlIGNhbiBkcm9wIHRo ZSBkaXJlY3QKY2FsbHMgZnJvbSB0aGUgcGxhbmUgcHJvZ3JhbW1pbmcgY29kZS4KClNpZ25lZC1v ZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTEgKysrKysrKysrLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDIyICsrKystLS0tLS0tLS0tLS0tLS0tLS0K IDIgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDA3MTMyNTguLmUxMmI1YTQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyOTAyLDEwICsxMjkwMiwxNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiBib29sIGludGVsX3dtX25lZWRfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJ ICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKLQkvKiBVcGRhdGUgd2F0ZXJtYXJr cyBvbiB0aWxpbmcgY2hhbmdlcy4gKi8KKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ldyA9 IHRvX2ludGVsX3BsYW5lX3N0YXRlKHN0YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KmN1ciA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7CisKKwkvKiBVcGRhdGUg d2F0ZXJtYXJrcyBvbiB0aWxpbmcgY2hhbmdlcyBvciBzaXplIGNoYW5nZXMuICovCiAJaWYgKCFw bGFuZS0+c3RhdGUtPmZiIHx8ICFzdGF0ZS0+ZmIgfHwKIAkgICAgcGxhbmUtPnN0YXRlLT5mYi0+ bW9kaWZpZXJbMF0gIT0gc3RhdGUtPmZiLT5tb2RpZmllclswXSB8fAotCSAgICBwbGFuZS0+c3Rh dGUtPnJvdGF0aW9uICE9IHN0YXRlLT5yb3RhdGlvbikKKwkgICAgcGxhbmUtPnN0YXRlLT5yb3Rh dGlvbiAhPSBzdGF0ZS0+cm90YXRpb24gfHwKKwkgICAgZHJtX3JlY3Rfd2lkdGgoJm5ldy0+c3Jj KSAhPSBkcm1fcmVjdF93aWR0aCgmY3VyLT5zcmMpIHx8CisJICAgIGRybV9yZWN0X2hlaWdodCgm bmV3LT5zcmMpICE9IGRybV9yZWN0X2hlaWdodCgmY3VyLT5zcmMpIHx8CisJICAgIGRybV9yZWN0 X3dpZHRoKCZuZXctPmRzdCkgIT0gZHJtX3JlY3Rfd2lkdGgoJmN1ci0+ZHN0KSB8fAorCSAgICBk cm1fcmVjdF9oZWlnaHQoJm5ldy0+ZHN0KSAhPSBkcm1fcmVjdF9oZWlnaHQoJmN1ci0+ZHN0KSkK IAkJcmV0dXJuIHRydWU7CiAKIAlyZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCmluZGV4IDNhOTY5NTYuLjM5NGNmMzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCkBAIC0xOTgsOCArMTk4LDYgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlyb3RhdGlvbiA9IGRybV9w bGFuZS0+c3RhdGUtPnJvdGF0aW9uOwogCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3JvdGF0 aW9uKHJvdGF0aW9uKTsKIAotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcm1fcGxh bmUsIGNydGMpOwotCiAJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2 LCBmYi0+bW9kaWZpZXJbMF0sCiAJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsKIApAQCAt MjgyLDggKzI4MCw2IEBAIHNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFu ZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGZvcmNlKQogCS8qIEFjdGl2YXRlIGRvdWJs ZSBidWZmZXJlZCByZWdpc3RlciB1cGRhdGUgKi8KIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlw ZSwgcGxhbmUpLCAwKTsKIAlQT1NUSU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCBwbGFuZSkpOwot Ci0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRwbGFuZSwgY3J0Yyk7CiB9CiAKIHN0 YXRpYyB2b2lkCkBAIC0zOTksOCArMzk1LDYgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJt X3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpZiAob2JqLT50aWxpbmdf bW9kZSAhPSBJOTE1X1RJTElOR19OT05FKQogCQlzcHJjdGwgfD0gU1BfVElMRUQ7CiAKLQlpbnRl bF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjKTsKLQogCS8qIFNpemVzIGFy ZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKIAlzcmNfaC0tOwpAQCAtNDY4LDggKzQ2Miw2IEBAIHZs dl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRj ICpjcnRjLCBib29sIGZvcmNlKQogCUk5MTVfV1JJVEUoU1BTVVJGKHBpcGUsIHBsYW5lKSwgMCk7 CiAKIAlpbnRlbF9mbHVzaF9wcmltYXJ5X3BsYW5lKGRldl9wcml2LCBpbnRlbF9jcnRjLT5wbGFu ZSk7Ci0KLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjKTsKIH0K IAogCkBAIC01MzQsOCArNTI2LDYgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChJU19IQVNXRUxMKGRldikgfHwg SVNfQlJPQURXRUxMKGRldikpCiAJCXNwcmN0bCB8PSBTUFJJVEVfUElQRV9DU0NfRU5BQkxFOwog Ci0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjKTsKLQogCS8qIFNp emVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKIAlzcmNfaC0tOwpAQCAtNjcxLDggKzY2MSw2 IEBAIGlsa191cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKIAlpZiAoSVNfR0VONihkZXYpKQogCQlkdnNjbnRyIHw9IERWU19UUklDS0xF X0ZFRURfRElTQUJMRTsgLyogbXVzdCBkaXNhYmxlICovCiAKLQlpbnRlbF91cGRhdGVfc3ByaXRl X3dhdGVybWFya3MocGxhbmUsIGNydGMpOwotCiAJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KIAlz cmNfdy0tOwogCXNyY19oLS07CkBAIC05MjEsMTggKzkwOSwxNiBAQCBmaW5pc2g6CiAJCWludGVs X2NydGMtPmF0b21pYy5mYl9iaXRzIHw9CiAJCQlJTlRFTF9GUk9OVEJVRkZFUl9TUFJJVEUoaW50 ZWxfY3J0Yy0+cGlwZSk7CiAKLQkJaWYgKGludGVsX3dtX25lZWRfdXBkYXRlKHBsYW5lLCAmc3Rh dGUtPmJhc2UpKQotCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9IHRydWU7CisJCWlm IChpbnRlbF93bV9uZWVkX3VwZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSB8fCAhc3RhdGUtPnZp c2libGUpCisJCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzIHw9 CisJCQkJKDEgPDwgZHJtX3BsYW5lX2luZGV4KHBsYW5lKSk7CiAKLQkJaWYgKCFzdGF0ZS0+dmlz aWJsZSkgeworCQlpZiAoIXN0YXRlLT52aXNpYmxlKQogCQkJLyoKIAkJCSAqIEF2b2lkIHVuZGVy cnVucyB3aGVuIGRpc2FibGluZyB0aGUgc3ByaXRlLgogCQkJICogRklYTUUgcmVtb3ZlIG9uY2Ug d2F0ZXJtYXJrIHVwZGF0ZXMgYXJlIGRvbmUgcHJvcGVybHkuCiAJCQkgKi8KIAkJCWludGVsX2Ny dGMtPmF0b21pYy53YWl0X3ZibGFuayA9IHRydWU7Ci0JCQlpbnRlbF9jcnRjLT5hdG9taWMudXBk YXRlX3Nwcml0ZV93YXRlcm1hcmtzIHw9Ci0JCQkJKDEgPDwgZHJtX3BsYW5lX2luZGV4KHBsYW5l KSk7Ci0JCX0KIAl9CiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgewotLSAKMS44 LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK