From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 07/14] drm/i915/ivb: Move
	WaCxSRDisabledForSpriteScaling w/a to atomic check
Date: Mon, 14 Sep 2015 19:19:23 -0700
Message-ID: <1442283570-26824-8-git-send-email-matthew.d.roper@intel.com>
References: <1442283570-26824-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 C08376E97D
 for <intel-gfx@lists.freedesktop.org>; Mon, 14 Sep 2015 19:20:06 -0700 (PDT)
In-Reply-To: <1442283570-26824-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

RGV0ZXJtaW5lIHdoZXRoZXIgd2UgbmVlZCB0byBhcHBseSB0aGlzIHdvcmthcm91bmQgYXQgYXRv
bWljIGNoZWNrIHRpbWUKYW5kIGp1c3Qgc2V0IGEgZmxhZyB0aGF0IHdpbGwgYmUgdXNlZCBieSB0
aGUgbWFpbiB3YXRlcm1hcmsgdXBkYXRlCnJvdXRpbmUuCgpNb3ZpbmcgdGhpcyB3b3JrYXJvdW5k
IGludG8gdGhlIGF0b21pYyBmcmFtZXdvcmsgcmVkdWNlcwppbGtfdXBkYXRlX3Nwcml0ZV93bSgp
IHRvIGp1c3QgYSBzdGFuZGFyZCB3YXRlcm1hcmsgdXBkYXRlLCBzbyBkcm9wIGl0CmNvbXBsZXRl
bHkgYW5kIGp1c3QgZW5zdXJlIHRoYXQgaWxrX3VwZGF0ZV93bSgpIGlzIGNhbGxlZCB3aGVuZXZl
ciBhCnNwcml0ZSBwbGFuZSBpcyB1cGRhdGVkIGluIGEgd2F5IHRoYXQgd291bGQgYWZmZWN0IHdh
dGVybWFya3MuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50
ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jICB8ICAxICsK
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDM5ICsrKysrKysrKysrKysr
KysrKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg
ICAgIHwgIDMgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAzNSAr
KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNl
cnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5j
CmluZGV4IGYxOTc1ZjIuLjA1YjEyMDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5j
CkBAIC05NCw2ICs5NCw3IEBAIGludGVsX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1f
Y3J0YyAqY3J0YykKIAlfX2RybV9hdG9taWNfaGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKGNy
dGMsICZjcnRjX3N0YXRlLT5iYXNlKTsKIAogCWNydGNfc3RhdGUtPnVwZGF0ZV9waXBlID0gZmFs
c2U7CisJY3J0Y19zdGF0ZS0+ZGlzYWJsZV9scF93bSA9IGZhbHNlOwogCiAJcmV0dXJuICZjcnRj
X3N0YXRlLT5iYXNlOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDAx
NzY0MWEuLmRhYTBlZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEx
NTE0LDE4ICsxMTUxNCwzMiBAQCByZXRyeToKIHN0YXRpYyBib29sIGludGVsX3dtX25lZWRfdXBk
YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCSBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl
ICpzdGF0ZSkKIHsKLQkvKiBVcGRhdGUgd2F0ZXJtYXJrcyBvbiB0aWxpbmcgY2hhbmdlcy4gKi8K
KwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm5ldyA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHN0
YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1ciA9IHRvX2ludGVsX3BsYW5lX3N0
YXRlKHBsYW5lLT5zdGF0ZSk7CisKKwkvKiBVcGRhdGUgd2F0ZXJtYXJrcyBvbiB0aWxpbmcgb3Ig
c2l6ZSBjaGFuZ2VzLiAqLwogCWlmICghcGxhbmUtPnN0YXRlLT5mYiB8fCAhc3RhdGUtPmZiIHx8
CiAJICAgIHBsYW5lLT5zdGF0ZS0+ZmItPm1vZGlmaWVyWzBdICE9IHN0YXRlLT5mYi0+bW9kaWZp
ZXJbMF0gfHwKLQkgICAgcGxhbmUtPnN0YXRlLT5yb3RhdGlvbiAhPSBzdGF0ZS0+cm90YXRpb24p
Ci0JCXJldHVybiB0cnVlOwotCi0JaWYgKHBsYW5lLT5zdGF0ZS0+Y3J0Y193ICE9IHN0YXRlLT5j
cnRjX3cpCisJICAgIHBsYW5lLT5zdGF0ZS0+cm90YXRpb24gIT0gc3RhdGUtPnJvdGF0aW9uIHx8
CisJICAgIGRybV9yZWN0X3dpZHRoKCZuZXctPnNyYykgIT0gZHJtX3JlY3Rfd2lkdGgoJmN1ci0+
c3JjKSB8fAorCSAgICBkcm1fcmVjdF9oZWlnaHQoJm5ldy0+c3JjKSAhPSBkcm1fcmVjdF9oZWln
aHQoJmN1ci0+c3JjKSB8fAorCSAgICBkcm1fcmVjdF93aWR0aCgmbmV3LT5kc3QpICE9IGRybV9y
ZWN0X3dpZHRoKCZjdXItPmRzdCkgfHwKKwkgICAgZHJtX3JlY3RfaGVpZ2h0KCZuZXctPmRzdCkg
IT0gZHJtX3JlY3RfaGVpZ2h0KCZjdXItPmRzdCkpCiAJCXJldHVybiB0cnVlOwogCiAJcmV0dXJu
IGZhbHNlOwogfQogCitzdGF0aWMgYm9vbCBuZWVkc19zY2FsaW5nKHN0cnVjdCBpbnRlbF9wbGFu
ZV9zdGF0ZSAqc3RhdGUpCit7CisJaW50IHNyY193ID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5z
cmMpID4+IDE2OworCWludCBzcmNfaCA9IGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPnNyYykgPj4g
MTY7CisJaW50IGRzdF93ID0gZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5kc3QpOworCWludCBkc3Rf
aCA9IGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPmRzdCk7CisKKwlyZXR1cm4gKHNyY193ICE9IGRz
dF93IHx8IHNyY19oICE9IGRzdF9oKTsKK30KKwogaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxj
X2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkJCSAgICBzdHJ1
Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKQEAgLTExNTQxLDcgKzExNTU1LDYg
QEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0
YXRlICpjcnRjX3N0YXRlLAogCWJvb2wgbW9kZV9jaGFuZ2VkID0gbmVlZHNfbW9kZXNldChjcnRj
X3N0YXRlKTsKIAlib29sIHdhc19jcnRjX2VuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+YWN0aXZlOwog
CWJvb2wgaXNfY3J0Y19lbmFibGVkID0gY3J0Y19zdGF0ZS0+YWN0aXZlOwotCiAJYm9vbCB0dXJu
X29mZiwgdHVybl9vbiwgdmlzaWJsZSwgd2FzX3Zpc2libGU7CiAJc3RydWN0IGRybV9mcmFtZWJ1
ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+ZmI7CiAKQEAgLTExNjU5LDExICsxMTY3MiwyMyBAQCBp
bnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg
KmNydGNfc3RhdGUsCiAJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJTT1I6CiAJCWJyZWFrOwogCWNh
c2UgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKLQkJaWYgKHR1cm5fb2ZmICYmICFtb2RlX2NoYW5n
ZWQpIHsKKwkJLyoKKwkJICogV2FDeFNSRGlzYWJsZWRGb3JTcHJpdGVTY2FsaW5nOml2YgorCQkg
KgorCQkgKiBjc3RhdGUtPnVwZGF0ZV93bSB3YXMgYWxyZWFkeSBzZXQgYWJvdmUsIHNvIHRoaXMg
ZmxhZyB3aWxsCisJCSAqIHRha2UgZWZmZWN0IHdoZW4gd2UgY29tbWl0IGFuZCBwcm9ncmFtIHdh
dGVybWFya3MuCisJCSAqLworCQlpZiAoSVNfSVZZQlJJREdFKGRldikgJiYKKwkJICAgIG5lZWRz
X3NjYWxpbmcodG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKSAmJgorCQkgICAgIW5l
ZWRzX3NjYWxpbmcob2xkX3BsYW5lX3N0YXRlKSkgeworCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShj
cnRjX3N0YXRlKS0+ZGlzYWJsZV9scF93bSA9IHRydWU7CisJCX0gZWxzZSBpZiAodHVybl9vZmYg
JiYgIW1vZGVfY2hhbmdlZCkgewogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0g
dHJ1ZTsKIAkJCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfc3ByaXRlX3dhdGVybWFya3MgfD0K
IAkJCQkxIDw8IGk7CiAJCX0KKworCQlicmVhazsKIAl9CiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rydi5oCmluZGV4IDAyYTc1NWEuLjNmYTJlNjYgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rydi5oCkBAIC00NTgsNiArNDU4LDkgQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewog
CiAJLyogdy9hIGZvciB3YWl0aW5nIDIgdmJsYW5rcyBkdXJpbmcgY3J0YyBlbmFibGUgKi8KIAll
bnVtIHBpcGUgaHN3X3dvcmthcm91bmRfcGlwZTsKKworCS8qIElWQiBzcHJpdGUgc2NhbGluZyB3
L2EgKFdhQ3hTUkRpc2FibGVkRm9yU3ByaXRlU2NhbGluZzppdmIpICovCisJYm9vbCBkaXNhYmxl
X2xwX3dtOwogfTsKIAogc3RydWN0IHZsdl93bV9zdGF0ZSB7CmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u
YwppbmRleCA1MWRiZGE3Li5kNjAxNjMwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM3
MjgsNiArMzcyOCwxOCBAQCBzdGF0aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0
YyAqY3J0YykKIAogCVdBUk5fT04oY3N0YXRlLT5iYXNlLmFjdGl2ZSAhPSBpbnRlbF9jcnRjLT5h
Y3RpdmUpOwogCisJLyoKKwkgKiBJVkIgd29ya2Fyb3VuZDogbXVzdCBkaXNhYmxlIGxvdyBwb3dl
ciB3YXRlcm1hcmtzIGZvciBhdCBsZWFzdAorCSAqIG9uZSBmcmFtZSBiZWZvcmUgZW5hYmxpbmcg
c2NhbGluZy4gIExQIHdhdGVybWFya3MgY2FuIGJlIHJlLWVuYWJsZWQKKwkgKiB3aGVuIHNjYWxp
bmcgaXMgZGlzYWJsZWQuCisJICoKKwkgKiBXYUN4U1JEaXNhYmxlZEZvclNwcml0ZVNjYWxpbmc6
aXZiCisJICovCisJaWYgKGNzdGF0ZS0+ZGlzYWJsZV9scF93bSkgeworCQlpbGtfZGlzYWJsZV9s
cF93bShkZXYpOworCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBl
KTsKKwl9CisKIAlpbnRlbF9jb21wdXRlX3BpcGVfd20oY3N0YXRlLCAmcGlwZV93bSk7CiAKIAlp
ZiAoIW1lbWNtcCgmaW50ZWxfY3J0Yy0+d20uYWN0aXZlLCAmcGlwZV93bSwgc2l6ZW9mKHBpcGVf
d20pKSkKQEAgLTM3NTksMjggKzM3NzEsNiBAQCBzdGF0aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0
cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpbGtfd3JpdGVfd21fdmFsdWVzKGRldl9wcml2LCAmcmVz
dWx0cyk7CiB9CiAKLXN0YXRpYyB2b2lkCi1pbGtfdXBkYXRlX3Nwcml0ZV93bShzdHJ1Y3QgZHJt
X3BsYW5lICpwbGFuZSwKLQkJICAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCSAgICAgdWlu
dDMyX3Qgc3ByaXRlX3dpZHRoLCB1aW50MzJfdCBzcHJpdGVfaGVpZ2h0LAotCQkgICAgIGludCBw
aXhlbF9zaXplLCBib29sIGVuYWJsZWQsIGJvb2wgc2NhbGVkKQotewotCXN0cnVjdCBkcm1fZGV2
aWNlICpkZXYgPSBwbGFuZS0+ZGV2OwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUg
PSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Ci0KLQkvKgotCSAqIElWQiB3b3JrYXJvdW5kOiBtdXN0
IGRpc2FibGUgbG93IHBvd2VyIHdhdGVybWFya3MgZm9yIGF0IGxlYXN0Ci0JICogb25lIGZyYW1l
IGJlZm9yZSBlbmFibGluZyBzY2FsaW5nLiAgTFAgd2F0ZXJtYXJrcyBjYW4gYmUgcmUtZW5hYmxl
ZAotCSAqIHdoZW4gc2NhbGluZyBpcyBkaXNhYmxlZC4KLQkgKgotCSAqIFdhQ3hTUkRpc2FibGVk
Rm9yU3ByaXRlU2NhbGluZzppdmIKLQkgKi8KLQlpZiAoSVNfSVZZQlJJREdFKGRldikgJiYgc2Nh
bGVkICYmIGlsa19kaXNhYmxlX2xwX3dtKGRldikpCi0JCWludGVsX3dhaXRfZm9yX3ZibGFuayhk
ZXYsIGludGVsX3BsYW5lLT5waXBlKTsKLQotCWlsa191cGRhdGVfd20oY3J0Yyk7Ci19Ci0KIHN0
YXRpYyB2b2lkIHNrbF9waXBlX3dtX2FjdGl2ZV9zdGF0ZSh1aW50MzJfdCB2YWwsCiAJCQkJICAg
ICBzdHJ1Y3Qgc2tsX3BpcGVfd20gKmFjdGl2ZSwKIAkJCQkgICAgIGJvb2wgaXNfdHJhbnN3bSwK
QEAgLTcwOTEsNyArNzA4MSw2IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2Rldmlj
ZSAqZGV2KQogCQkgICAgKCFJU19HRU41KGRldikgJiYgZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5
WzBdICYmCiAJCSAgICAgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5WzBdICYmIGRldl9wcml2LT53
bS5jdXJfbGF0ZW5jeVswXSkpIHsKIAkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGls
a191cGRhdGVfd207Ci0JCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfc3ByaXRlX3dtID0gaWxr
X3VwZGF0ZV9zcHJpdGVfd207CiAJCX0gZWxzZSB7CiAJCQlEUk1fREVCVUdfS01TKCJGYWlsZWQg
dG8gcmVhZCBkaXNwbGF5IHBsYW5lIGxhdGVuY3kuICIKIAkJCQkgICAgICAiRGlzYWJsZSBDeFNS
XG4iKTsKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv
cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs
LWdmeAo=