From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 2/2] drm/i915: Update sprite watermarks outside
	vblank evasion
Date: Mon, 22 Jun 2015 18:30:33 -0700
Message-ID: <1435023033-18043-3-git-send-email-matthew.d.roper@intel.com>
References: <1435023033-18043-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2FEF46E5ED
 for <intel-gfx@lists.freedesktop.org>; Mon, 22 Jun 2015 18:31:11 -0700 (PDT)
In-Reply-To: <1435023033-18043-1-git-send-email-matthew.d.roper@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

V2UgbmV2ZXIgcmVtb3ZlZCB0aGUgc3ByaXRlIHdhdGVybWFyayB1cGRhdGVzIGZyb20gb3VyIGxv
dy1sZXZlbApmb29fdXBkYXRlX3BsYW5lKCkgZnVuY3Rpb25zOyBzaW5jZSBvdXIgaGFyZHdhcmUg
dXBkYXRlcyBoYXBwZW4gdW5kZXIKdmJsYW5rIGV2YXNpb24sIHdlJ3JlIG5vdCBzdXBwb3NlZCB0
byBiZSBjYWxsaW5nIHBvdGVudGlhbGx5IHNsZWVwaW5nCmZ1bmN0aW9ucyB0aGVyZSAoc2luY2Ug
aW50ZXJydXB0cyBhcmUgZGlzYWJsZWQpLiAgV2UgZG8gYWxyZWFkeSBoYXZlIGEKbWVjaGFuaXNt
IHRoYXQncyBzdXBwb3NlZCB0byBiZSB1c2VkIHRvIHVwZGF0ZSBzcHJpdGUgd2F0ZXJtYXJrcyBp
biB0aGUKcG9zdC1ldmFzaW9uIGZ1bmN0aW9uIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKCksIGJ1
dCBhdCB0aGUgbW9tZW50IGl0J3MKb25seSBiZWluZyB1c2VkIGZvciB1cGRhdGVzIGNhdXNlZCBi
eSBwbGFuZSBkaXNhYmxlcy4KClRvIGZpeCB0aGlzIG92ZXJzaWdodCB3ZSBuZWVkIHRvIG1ha2Ug
YSBmZXcgY2hhbmdlczoKCiAqIFdoZW4gaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcygp
IGNhbGxzIGludGVsX3dtX25lZWRfdXBkYXRlKCkKICAgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgd2F0
ZXJtYXJrcyBuZWVkIGFuIHVwZGF0ZSwgd2UgbmVlZCB0byBzZXQgdGhlCiAgICdhdG9taWMudXBk
YXRlX3Nwcml0ZV93YXRlcm1hcmtzJyBmbGFnIHJhdGhlciB0aGFuIHRoZQogICAnYXRvbWljLnVw
ZGF0ZV93bScgZmxhZyB3aGVuIHRoZSBwbGFuZSBpbiBxdWVzdGlvbiBpcyBhIHNwcml0ZS4gIFNv
bWUKICAgcGxhdGZvcm1zIGRvbid0IGNhcmUgYWJvdXQgdGhpcyBjaGFuZ2Ugc2luY2UgdGhlIHR3
byB0eXBlcyBvZiB1cGRhdGUKICAgZG8gdGhlIHNhbWUgdGhpbmcsIGJ1dCBzb21lIHBsYXRmb3Jt
cyAoZS5nLiwgSUxLLXN0eWxlIHdhdGVybWFya3MpCiAgIG5lZWQgdG8gc3BlY2lmaWNhbGx5IHVz
ZSB0aGUgc3ByaXRlIHVwZGF0ZSBmdW5jdGlvbiB0byB1cGRhdGUgY2FjaGVkCiAgIHdhdGVybWFy
ayBwYXJhbWV0ZXJzLgoKICogaW50ZWxfd21fbmVlZF91cGRhdGUoKSBuZWVkcyB0byBhbHNvIGxv
b2sgZm9yIHBsYW5lIHNpemUgY2hhbmdlcwogICAocHJldmlvdXNseSBpdCBvbmx5IGNoZWNrZWQg
dGlsaW5nICYgcm90YXRpb24pLgoKV2l0aCB0aGUgYWJvdmUgY2hhbmdlcywgdGhlIG5lZWQgZm9y
IHNwcml0ZSB3YXRlcm1hcmsgdXBkYXRlcyBzaG91bGQgYmUKcHJvcGVybHkgZmxhZ2dlZCBhdCBh
dG9taWMgJ2NoZWNrJyB0aW1lIGFuZCBoYW5kbGVkIGF0ICdjb21taXQnIHRpbWUgaW4KcG9zdC1l
dmFzaW9uLCBzbyB3ZSBjYW4gZHJvcCB0aGUgZGlyZWN0IGNhbGxzIHRvCmludGVsX3VwZGF0ZV9z
cHJpdGVfd2F0ZXJtYXJrcygpIGZyb20gYWxsIG9mIHRoZQppbnRlbF9wbGFuZS0+dXBkYXRlX3Bs
YW5lKCkgaGFuZGxlcnMuICBXZSdsbCBhbHNvIHRvc3MgYQpXQVJOX09OKGlycXNfZGlzYWJsZWQo
KSkgaW50byB0aGUgd2F0ZXJtYXJrIHVwZGF0ZSBmdW5jdGlvbnMgdG8gYXZvaWQKc3VjaCBtaXN0
YWtlcyBpbiB0aGUgZnV0dXJlLgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5k
LnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5
LmMgfCAyMyArKysrKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcG0uYyAgICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j
ICB8IDEyIC0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAx
OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNWU4
ZTAxYy4uMTgxYWVkZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz
cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTE1
NzUsMTMgKzExNTc1LDE3IEBAIHJldHJ5Ogogc3RhdGljIGJvb2wgaW50ZWxfd21fbmVlZF91cGRh
dGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkJIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUg
KnN0YXRlKQogewotCS8qIFVwZGF0ZSB3YXRlcm1hcmtzIG9uIHRpbGluZyBjaGFuZ2VzLiAqLwor
CXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqbmV3ID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoc3Rh
dGUpOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqY3VyID0gdG9faW50ZWxfcGxhbmVfc3Rh
dGUocGxhbmUtPnN0YXRlKTsKKworCS8qIFVwZGF0ZSB3YXRlcm1hcmtzIG9uIHRpbGluZyBjaGFu
Z2VzIG9yIHNpemUgY2hhbmdlcy4gKi8KIAlpZiAoIXBsYW5lLT5zdGF0ZS0+ZmIgfHwgIXN0YXRl
LT5mYiB8fAogCSAgICBwbGFuZS0+c3RhdGUtPmZiLT5tb2RpZmllclswXSAhPSBzdGF0ZS0+ZmIt
Pm1vZGlmaWVyWzBdIHx8Ci0JICAgIHBsYW5lLT5zdGF0ZS0+cm90YXRpb24gIT0gc3RhdGUtPnJv
dGF0aW9uKQotCQlyZXR1cm4gdHJ1ZTsKLQotCWlmIChwbGFuZS0+c3RhdGUtPmNydGNfdyAhPSBz
dGF0ZS0+Y3J0Y193KQorCSAgICBwbGFuZS0+c3RhdGUtPnJvdGF0aW9uICE9IHN0YXRlLT5yb3Rh
dGlvbiB8fAorCSAgICBkcm1fcmVjdF93aWR0aCgmbmV3LT5zcmMpICE9IGRybV9yZWN0X3dpZHRo
KCZjdXItPnNyYykgfHwKKwkgICAgZHJtX3JlY3RfaGVpZ2h0KCZuZXctPnNyYykgIT0gZHJtX3Jl
Y3RfaGVpZ2h0KCZjdXItPnNyYykgfHwKKwkgICAgZHJtX3JlY3Rfd2lkdGgoJm5ldy0+ZHN0KSAh
PSBkcm1fcmVjdF93aWR0aCgmY3VyLT5kc3QpIHx8CisJICAgIGRybV9yZWN0X2hlaWdodCgmbmV3
LT5kc3QpICE9IGRybV9yZWN0X2hlaWdodCgmY3VyLT5kc3QpKQogCQlyZXR1cm4gdHJ1ZTsKIAog
CXJldHVybiBmYWxzZTsKQEAgLTExNjQ1LDggKzExNjQ5LDEzIEBAIGludCBpbnRlbF9wbGFuZV9h
dG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJ
CSBwbGFuZS0+YmFzZS5pZCwgd2FzX3Zpc2libGUsIHZpc2libGUsCiAJCQkgdHVybl9vZmYsIHR1
cm5fb24sIG1vZGVfY2hhbmdlZCk7CiAKLQlpZiAoaW50ZWxfd21fbmVlZF91cGRhdGUocGxhbmUs
IHBsYW5lX3N0YXRlKSkKLQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9IHRydWU7CisJ
aWYgKGludGVsX3dtX25lZWRfdXBkYXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSkpIHsKKwkJaWYgKHBs
YW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpCisJCQlpbnRlbF9jcnRjLT5hdG9t
aWMudXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzIHw9CisJCQkJMSA8PCBpOworCQllbHNlCisJCQlp
bnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtID0gdHJ1ZTsKKwl9CiAKIAlzd2l0Y2ggKHBsYW5l
LT50eXBlKSB7CiAJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3BtLmMKaW5kZXggNGQzY2I3MC4uMjQ3MGVkZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBA
IC0zNzUwLDYgKzM3NTAsNyBAQCB2b2lkIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBj
cnRjLT5kZXYtPmRldl9wcml2YXRlOwogCisJV0FSTl9PTihpcnFzX2Rpc2FibGVkKCkpOwogCWlm
IChkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20pCiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0
ZV93bShjcnRjKTsKIH0KQEAgLTM3NzAsNiArMzc3MSw3IEBAIHZvaWQgaW50ZWxfdXBkYXRlX3Nw
cml0ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXVuc2lnbmVkIGludCBk
c3RfaCA9IGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPmRzdCk7CiAJYm9vbCBzY2FsZWQgPSAoc3Jj
X3cgIT0gZHN0X3cgfHwgc3JjX2ggIT0gZHN0X2gpOwogCisJV0FSTl9PTihpcnFzX2Rpc2FibGVk
KCkpOwogCWlmIChkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfc3ByaXRlX3dtKQogCQlkZXZfcHJp
di0+ZGlzcGxheS51cGRhdGVfc3ByaXRlX3dtKHBsYW5lLCBjcnRjLAogCQkJCQkJICAgc3ByaXRl
X3dpZHRoLCBzcHJpdGVfaGVpZ2h0LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRl
eCBiNjI3MDY3Li5jZTJmYTkyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAt
MTk5LDggKzE5OSw2IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3Bs
YW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcm90YXRpb24gPSBkcm1fcGxhbmUtPnN0YXRl
LT5yb3RhdGlvbjsKIAlwbGFuZV9jdGwgfD0gc2tsX3BsYW5lX2N0bF9yb3RhdGlvbihyb3RhdGlv
bik7CiAKLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHJtX3BsYW5lLCBjcnRjKTsK
LQogCXN0cmlkZV9kaXYgPSBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KGRldiwgZmItPm1vZGlm
aWVyWzBdLAogCQkJCQkgICAgICAgZmItPnBpeGVsX2Zvcm1hdCk7CiAKQEAgLTI4Miw4ICsyODAs
NiBAQCBza2xfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBk
cm1fY3J0YyAqY3J0YykKIAogCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCBwbGFuZSksIDAp
OwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUsIHBsYW5lKSk7Ci0KLQlpbnRlbF91cGRh
dGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjKTsKIH0KIAogc3RhdGljIHZvaWQKQEAg
LTM5OSw4ICszOTUsNiBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFu
ZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChvYmotPnRpbGluZ19tb2RlICE9IEk5MTVf
VElMSU5HX05PTkUpCiAJCXNwcmN0bCB8PSBTUF9USUxFRDsKIAotCWludGVsX3VwZGF0ZV9zcHJp
dGVfd2F0ZXJtYXJrcyhkcGxhbmUsIGNydGMpOwotCiAJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8K
IAlzcmNfdy0tOwogCXNyY19oLS07CkBAIC00NjUsOCArNDU5LDYgQEAgdmx2X2Rpc2FibGVfcGxh
bmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlJ
OTE1X1dSSVRFKFNQU1VSRihwaXBlLCBwbGFuZSksIDApOwogCVBPU1RJTkdfUkVBRChTUFNVUkYo
cGlwZSwgcGxhbmUpKTsKLQotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcGxhbmUs
IGNydGMpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtNTMwLDggKzUyMiw2IEBAIGl2Yl91cGRhdGVf
cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlp
ZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQogCQlzcHJjdGwgfD0gU1BS
SVRFX1BJUEVfQ1NDX0VOQUJMRTsKIAotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhw
bGFuZSwgY3J0Yyk7Ci0KIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwogCXNyY193LS07CiAJc3Jj
X2gtLTsKQEAgLTY2NSw4ICs2NTUsNiBAQCBpbGtfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh
bmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKElTX0dFTjYoZGV2KSkKIAkJ
ZHZzY250ciB8PSBEVlNfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7IC8qIG11c3QgZGlzYWJsZSAqLwog
Ci0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjKTsKLQogCS8qIFNp
emVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKIAlzcmNfaC0tOwotLSAKMi4xLjQKCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls
aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==