From: Matt Roper Subject: [PATCH 3/3] drm/i915: Update sprite watermarks outside vblank evasion Date: Wed, 6 May 2015 18:39:28 -0700 Message-ID: <1430962768-18644-3-git-send-email-matthew.d.roper@intel.com> References: <1430962768-18644-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B9276E02E for ; Wed, 6 May 2015 18:40:04 -0700 (PDT) In-Reply-To: <1430962768-18644-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 cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGE2YTExYWEuLjNmZWIzZDYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzMTI2LDEwICsxMzEyNiwxNyBAQCBz 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 cml0ZS5jCmluZGV4IDZlMjdmYmIuLjUxYTlkMDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCkBAIC0yMDksOCArMjA5LDYgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlyb3RhdGlvbiA9IGRybV9w bGFuZS0+c3RhdGUtPnJvdGF0aW9uOwogCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3JvdGF0 aW9uKHJvdGF0aW9uKTsKIAotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcm1fcGxh bmUsIGNydGMpOwotCiAJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2 LCBmYi0+bW9kaWZpZXJbMF0sCiAJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsKIApAQCAt MjkzLDggKzI5MSw2IEBAIHNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9w bGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCS8qIEFjdGl2YXRlIGRvdWJsZSBidWZmZXJl ZCByZWdpc3RlciB1cGRhdGUgKi8KIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgcGxhbmUp LCAwKTsKIAlQT1NUSU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCBwbGFuZSkpOwotCi0JaW50ZWxf dXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRybV9wbGFuZSwgY3J0Yyk7CiB9CiAKIHN0YXRpYyB2 b2lkCkBAIC00MTAsOCArNDA2LDYgQEAgdmx2X3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l ICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpZiAob2JqLT50aWxpbmdfbW9kZSAh PSBJOTE1X1RJTElOR19OT05FKQogCQlzcHJjdGwgfD0gU1BfVElMRUQ7CiAKLQlpbnRlbF91cGRh dGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjKTsKLQogCS8qIFNpemVzIGFyZSAwIGJh c2VkICovCiAJc3JjX3ctLTsKIAlzcmNfaC0tOwpAQCAtNDgzLDggKzQ3Nyw2IEBAIHZsdl9kaXNh YmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRj KQogCUk5MTVfV1JJVEUoU1BTVVJGKHBpcGUsIHBsYW5lKSwgMCk7CiAKIAlpbnRlbF9mbHVzaF9w cmltYXJ5X3BsYW5lKGRldl9wcml2LCBpbnRlbF9jcnRjLT5wbGFuZSk7Ci0KLQlpbnRlbF91cGRh dGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjKTsKIH0KIAogCkBAIC01NDksOCArNTQx LDYgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikp CiAJCXNwcmN0bCB8PSBTUFJJVEVfUElQRV9DU0NfRU5BQkxFOwogCi0JaW50ZWxfdXBkYXRlX3Nw cml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjKTsKLQogCS8qIFNpemVzIGFyZSAwIGJhc2VkICov CiAJc3JjX3ctLTsKIAlzcmNfaC0tOwpAQCAtNjkwLDggKzY4MCw2IEBAIGlsa191cGRhdGVfcGxh bmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpZiAo SVNfR0VONihkZXYpKQogCQlkdnNjbnRyIHw9IERWU19UUklDS0xFX0ZFRURfRElTQUJMRTsgLyog bXVzdCBkaXNhYmxlICovCiAKLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MocGxhbmUs IGNydGMpOwotCiAJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KIAlzcmNfdy0tOwogCXNyY19oLS07 CkBAIC0xMDMwLDE4ICsxMDE4LDE2IEBAIGZpbmlzaDoKIAkJaWYgKCFpbnRlbF9jcnRjLT5wcmlt YXJ5X2VuYWJsZWQgJiYgIXN0YXRlLT5oaWRlc19wcmltYXJ5KQogCQkJaW50ZWxfY3J0Yy0+YXRv bWljLnBvc3RfZW5hYmxlX3ByaW1hcnkgPSB0cnVlOwogCi0JCWlmIChpbnRlbF93bV9uZWVkX3Vw ZGF0ZShwbGFuZSwgJnN0YXRlLT5iYXNlKSkKLQkJCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVf d20gPSB0cnVlOworCQlpZiAoaW50ZWxfd21fbmVlZF91cGRhdGUocGxhbmUsICZzdGF0ZS0+YmFz ZSkgfHwgIXN0YXRlLT52aXNpYmxlKQorCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV9zcHJp dGVfd2F0ZXJtYXJrcyB8PQorCQkJCSgxIDw8IGRybV9wbGFuZV9pbmRleChwbGFuZSkpOwogCi0J CWlmICghc3RhdGUtPnZpc2libGUpIHsKKwkJaWYgKCFzdGF0ZS0+dmlzaWJsZSkKIAkJCS8qCiAJ CQkgKiBBdm9pZCB1bmRlcnJ1bnMgd2hlbiBkaXNhYmxpbmcgdGhlIHNwcml0ZS4KIAkJCSAqIEZJ WE1FIHJlbW92ZSBvbmNlIHdhdGVybWFyayB1cGRhdGVzIGFyZSBkb25lIHByb3Blcmx5LgogCQkJ ICovCiAJCQlpbnRlbF9jcnRjLT5hdG9taWMud2FpdF92YmxhbmsgPSB0cnVlOwotCQkJaW50ZWxf Y3J0Yy0+YXRvbWljLnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyB8PQotCQkJCSgxIDw8IGRybV9w bGFuZV9pbmRleChwbGFuZSkpOwotCQl9CiAJfQogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDkpIHsKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==