From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 07/15] drm/i915/ivb: Move
	WaCxSRDisabledForSpriteScaling w/a to atomic check
Date: Thu, 24 Sep 2015 15:53:12 -0700
Message-ID: <1443135200-9870-8-git-send-email-matthew.d.roper@intel.com>
References: <1443135200-9870-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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id CD5E76E233
 for <intel-gfx@lists.freedesktop.org>; Thu, 24 Sep 2015 15:53:53 -0700 (PDT)
In-Reply-To: <1443135200-9870-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
ZWwuY29tPgpSZXZpZXdlZC1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0
QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMu
YyAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzOSArKysr
KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rydi5oICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAg
ICAgIHwgMzUgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdl
ZCwgNDggaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9hdG9taWMuYwppbmRleCBmMTk3NWYyLi4wNWIxMjAzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9hdG9taWMuYwpAQCAtOTQsNiArOTQsNyBAQCBpbnRlbF9jcnRjX2R1cGxpY2F0ZV9zdGF0ZShz
dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJX19kcm1fYXRvbWljX2hlbHBlcl9jcnRjX2R1cGxpY2F0
ZV9zdGF0ZShjcnRjLCAmY3J0Y19zdGF0ZS0+YmFzZSk7CiAKIAljcnRjX3N0YXRlLT51cGRhdGVf
cGlwZSA9IGZhbHNlOworCWNydGNfc3RhdGUtPmRpc2FibGVfbHBfd20gPSBmYWxzZTsKIAogCXJl
dHVybiAmY3J0Y19zdGF0ZS0+YmFzZTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwppbmRleCBhM2U2MmJjLi43NjMxY2I0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCkBAIC0xMTU1MSwxOCArMTE1NTEsMzIgQEAgcmV0cnk6CiBzdGF0aWMgYm9vbCBpbnRlbF93
bV9uZWVkX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCQkgc3RydWN0IGRybV9w
bGFuZV9zdGF0ZSAqc3RhdGUpCiB7Ci0JLyogVXBkYXRlIHdhdGVybWFya3Mgb24gdGlsaW5nIGNo
YW5nZXMuICovCisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpuZXcgPSB0b19pbnRlbF9wbGFu
ZV9zdGF0ZShzdGF0ZSk7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpjdXIgPSB0b19pbnRl
bF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpOworCisJLyogVXBkYXRlIHdhdGVybWFya3Mgb24g
dGlsaW5nIG9yIHNpemUgY2hhbmdlcy4gKi8KIAlpZiAoIXBsYW5lLT5zdGF0ZS0+ZmIgfHwgIXN0
YXRlLT5mYiB8fAogCSAgICBwbGFuZS0+c3RhdGUtPmZiLT5tb2RpZmllclswXSAhPSBzdGF0ZS0+
ZmItPm1vZGlmaWVyWzBdIHx8Ci0JICAgIHBsYW5lLT5zdGF0ZS0+cm90YXRpb24gIT0gc3RhdGUt
PnJvdGF0aW9uKQotCQlyZXR1cm4gdHJ1ZTsKLQotCWlmIChwbGFuZS0+c3RhdGUtPmNydGNfdyAh
PSBzdGF0ZS0+Y3J0Y193KQorCSAgICBwbGFuZS0+c3RhdGUtPnJvdGF0aW9uICE9IHN0YXRlLT5y
b3RhdGlvbiB8fAorCSAgICBkcm1fcmVjdF93aWR0aCgmbmV3LT5zcmMpICE9IGRybV9yZWN0X3dp
ZHRoKCZjdXItPnNyYykgfHwKKwkgICAgZHJtX3JlY3RfaGVpZ2h0KCZuZXctPnNyYykgIT0gZHJt
X3JlY3RfaGVpZ2h0KCZjdXItPnNyYykgfHwKKwkgICAgZHJtX3JlY3Rfd2lkdGgoJm5ldy0+ZHN0
KSAhPSBkcm1fcmVjdF93aWR0aCgmY3VyLT5kc3QpIHx8CisJICAgIGRybV9yZWN0X2hlaWdodCgm
bmV3LT5kc3QpICE9IGRybV9yZWN0X2hlaWdodCgmY3VyLT5kc3QpKQogCQlyZXR1cm4gdHJ1ZTsK
IAogCXJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIGJvb2wgbmVlZHNfc2NhbGluZyhzdHJ1Y3Qg
aW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQoreworCWludCBzcmNfdyA9IGRybV9yZWN0X3dpZHRo
KCZzdGF0ZS0+c3JjKSA+PiAxNjsKKwlpbnQgc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRl
LT5zcmMpID4+IDE2OworCWludCBkc3RfdyA9IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+ZHN0KTsK
KwlpbnQgZHN0X2ggPSBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5kc3QpOworCisJcmV0dXJuIChz
cmNfdyAhPSBkc3RfdyB8fCBzcmNfaCAhPSBkc3RfaCk7Cit9CisKIGludCBpbnRlbF9wbGFuZV9h
dG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJ
CQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CkBAIC0xMTU3OCw3
ICsxMTU5Miw2IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBk
cm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlib29sIG1vZGVfY2hhbmdlZCA9IG5lZWRzX21v
ZGVzZXQoY3J0Y19zdGF0ZSk7CiAJYm9vbCB3YXNfY3J0Y19lbmFibGVkID0gY3J0Yy0+c3RhdGUt
PmFjdGl2ZTsKIAlib29sIGlzX2NydGNfZW5hYmxlZCA9IGNydGNfc3RhdGUtPmFjdGl2ZTsKLQog
CWJvb2wgdHVybl9vZmYsIHR1cm5fb24sIHZpc2libGUsIHdhc192aXNpYmxlOwogCXN0cnVjdCBk
cm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmZiOwogCkBAIC0xMTY5NiwxMSArMTE3
MDksMjMgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9j
cnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCWNhc2UgRFJNX1BMQU5FX1RZUEVfQ1VSU09SOgogCQli
cmVhazsKIAljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Ci0JCWlmICh0dXJuX29mZiAmJiAh
bW9kZV9jaGFuZ2VkKSB7CisJCS8qCisJCSAqIFdhQ3hTUkRpc2FibGVkRm9yU3ByaXRlU2NhbGlu
ZzppdmIKKwkJICoKKwkJICogY3N0YXRlLT51cGRhdGVfd20gd2FzIGFscmVhZHkgc2V0IGFib3Zl
LCBzbyB0aGlzIGZsYWcgd2lsbAorCQkgKiB0YWtlIGVmZmVjdCB3aGVuIHdlIGNvbW1pdCBhbmQg
cHJvZ3JhbSB3YXRlcm1hcmtzLgorCQkgKi8KKwkJaWYgKElTX0lWWUJSSURHRShkZXYpICYmCisJ
CSAgICBuZWVkc19zY2FsaW5nKHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKSkgJiYK
KwkJICAgICFuZWVkc19zY2FsaW5nKG9sZF9wbGFuZV9zdGF0ZSkpIHsKKwkJCXRvX2ludGVsX2Ny
dGNfc3RhdGUoY3J0Y19zdGF0ZSktPmRpc2FibGVfbHBfd20gPSB0cnVlOworCQl9IGVsc2UgaWYg
KHR1cm5fb2ZmICYmICFtb2RlX2NoYW5nZWQpIHsKIAkJCWludGVsX2NydGMtPmF0b21pYy53YWl0
X3ZibGFuayA9IHRydWU7CiAJCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3Nwcml0ZV93YXRl
cm1hcmtzIHw9CiAJCQkJMSA8PCBpOwogCQl9CisKKwkJYnJlYWs7CiAJfQogCXJldHVybiAwOwog
fQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBjOTYyODlkLi5hMmEwMzAxIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDU4LDYgKzQ1OCw5IEBAIHN0cnVjdCBpbnRlbF9jcnRj
X3N0YXRlIHsKIAogCS8qIHcvYSBmb3Igd2FpdGluZyAyIHZibGFua3MgZHVyaW5nIGNydGMgZW5h
YmxlICovCiAJZW51bSBwaXBlIGhzd193b3JrYXJvdW5kX3BpcGU7CisKKwkvKiBJVkIgc3ByaXRl
IHNjYWxpbmcgdy9hIChXYUN4U1JEaXNhYmxlZEZvclNwcml0ZVNjYWxpbmc6aXZiKSAqLworCWJv
b2wgZGlzYWJsZV9scF93bTsKIH07CiAKIHN0cnVjdCB2bHZfd21fc3RhdGUgewpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3BtLmMKaW5kZXggN2JmY2M5OC4uNDY4MWYwMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w
bS5jCkBAIC0zNzUyLDYgKzM3NTIsMTggQEAgc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1
Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlXQVJOX09OKGNzdGF0ZS0+YmFzZS5hY3RpdmUgIT0gaW50
ZWxfY3J0Yy0+YWN0aXZlKTsKIAorCS8qCisJICogSVZCIHdvcmthcm91bmQ6IG11c3QgZGlzYWJs
ZSBsb3cgcG93ZXIgd2F0ZXJtYXJrcyBmb3IgYXQgbGVhc3QKKwkgKiBvbmUgZnJhbWUgYmVmb3Jl
IGVuYWJsaW5nIHNjYWxpbmcuICBMUCB3YXRlcm1hcmtzIGNhbiBiZSByZS1lbmFibGVkCisJICog
d2hlbiBzY2FsaW5nIGlzIGRpc2FibGVkLgorCSAqCisJICogV2FDeFNSRGlzYWJsZWRGb3JTcHJp
dGVTY2FsaW5nOml2YgorCSAqLworCWlmIChjc3RhdGUtPmRpc2FibGVfbHBfd20pIHsKKwkJaWxr
X2Rpc2FibGVfbHBfd20oZGV2KTsKKwkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgaW50ZWxf
Y3J0Yy0+cGlwZSk7CisJfQorCiAJaW50ZWxfY29tcHV0ZV9waXBlX3dtKGNzdGF0ZSwgJnBpcGVf
d20pOwogCiAJaWYgKCFtZW1jbXAoJmludGVsX2NydGMtPndtLmFjdGl2ZSwgJnBpcGVfd20sIHNp
emVvZihwaXBlX3dtKSkpCkBAIC0zNzgzLDI4ICszNzk1LDYgQEAgc3RhdGljIHZvaWQgaWxrX3Vw
ZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaWxrX3dyaXRlX3dtX3ZhbHVlcyhkZXZf
cHJpdiwgJnJlc3VsdHMpOwogfQogCi1zdGF0aWMgdm9pZAotaWxrX3VwZGF0ZV9zcHJpdGVfd20o
c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCSAgICAgc3RydWN0IGRybV9jcnRjICpjcnRjLAot
CQkgICAgIHVpbnQzMl90IHNwcml0ZV93aWR0aCwgdWludDMyX3Qgc3ByaXRlX2hlaWdodCwKLQkJ
ICAgICBpbnQgcGl4ZWxfc2l6ZSwgYm9vbCBlbmFibGVkLCBib29sIHNjYWxlZCkKLXsKLQlzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmlu
dGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCi0JLyoKLQkgKiBJVkIgd29ya2Fy
b3VuZDogbXVzdCBkaXNhYmxlIGxvdyBwb3dlciB3YXRlcm1hcmtzIGZvciBhdCBsZWFzdAotCSAq
IG9uZSBmcmFtZSBiZWZvcmUgZW5hYmxpbmcgc2NhbGluZy4gIExQIHdhdGVybWFya3MgY2FuIGJl
IHJlLWVuYWJsZWQKLQkgKiB3aGVuIHNjYWxpbmcgaXMgZGlzYWJsZWQuCi0JICoKLQkgKiBXYUN4
U1JEaXNhYmxlZEZvclNwcml0ZVNjYWxpbmc6aXZiCi0JICovCi0JaWYgKElTX0lWWUJSSURHRShk
ZXYpICYmIHNjYWxlZCAmJiBpbGtfZGlzYWJsZV9scF93bShkZXYpKQotCQlpbnRlbF93YWl0X2Zv
cl92YmxhbmsoZGV2LCBpbnRlbF9wbGFuZS0+cGlwZSk7Ci0KLQlpbGtfdXBkYXRlX3dtKGNydGMp
OwotfQotCiBzdGF0aWMgdm9pZCBza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodWludDMyX3QgdmFs
LAogCQkJCSAgICAgc3RydWN0IHNrbF9waXBlX3dtICphY3RpdmUsCiAJCQkJICAgICBib29sIGlz
X3RyYW5zd20sCkBAIC03MTQ1LDcgKzcxMzUsNiBAQCB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0
IGRybV9kZXZpY2UgKmRldikKIAkJICAgICghSVNfR0VONShkZXYpICYmIGRldl9wcml2LT53bS5w
cmlfbGF0ZW5jeVswXSAmJgogCQkgICAgIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeVswXSAmJiBk
ZXZfcHJpdi0+d20uY3VyX2xhdGVuY3lbMF0pKSB7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRh
dGVfd20gPSBpbGtfdXBkYXRlX3dtOwotCQkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3Nwcml0
ZV93bSA9IGlsa191cGRhdGVfc3ByaXRlX3dtOwogCQl9IGVsc2UgewogCQkJRFJNX0RFQlVHX0tN
UygiRmFpbGVkIHRvIHJlYWQgZGlzcGxheSBwbGFuZSBsYXRlbmN5LiAiCiAJCQkJICAgICAgIkRp
c2FibGUgQ3hTUlxuIik7Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK