From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 069/190] drm/i915: Remove duplicate golden
	render state init from execlists
Date: Mon, 11 Jan 2016 09:17:20 +0000
Message-ID: <1452503961-14837-69-git-send-email-chris@chris-wilson.co.uk>
References: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk>
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 mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68])
 by gabe.freedesktop.org (Postfix) with ESMTPS id B88316E252
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 Jan 2016 01:20:58 -0800 (PST)
Received: by mail-wm0-f68.google.com with SMTP id b14so25376031wmb.1
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 Jan 2016 01:20:58 -0800 (PST)
In-Reply-To: <1452503961-14837-1-git-send-email-chris@chris-wilson.co.uk>
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

Tm93IHRoYXQgd2UgdXNlIHRoZSBzYW1lIHZmdW5jcyBmb3IgZW1pdHRpbmcgdGhlIGJhdGNoIGJ1
ZmZlciBpbiBib3RoCmV4ZWNsaXN0cyBhbmQgbGVnYWN5LCB0aGUgZ29sZGVuIHJlbmRlciBzdGF0
ZSBpbml0aWFsaXNhdGlvbiBpcwppZGVudGljYWwgYmV0d2VlbiBib3RoLgoKU2lnbmVkLW9mZi1i
eTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAyMiArKysrKysrKysrKystLS0t
LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5oIHwgMTggLS0t
LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAg
ICB8IDM0ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3JlbmRlcnN0YXRlLmggICAgIHwgMTYgKysrKysrKysrLS0tLQogNCBmaWxlcyBjaGFu
Z2VkLCAyNyBpbnNlcnRpb25zKCspLCA2MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IGNjYzk4OGMyYjIyNi4uMjIyZjI1
Nzc3YmI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJf
c3RhdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUu
YwpAQCAtMjgsNiArMjgsMTUgQEAKICNpbmNsdWRlICJpOTE1X2Rydi5oIgogI2luY2x1ZGUgImlu
dGVsX3JlbmRlcnN0YXRlLmgiCiAKK3N0cnVjdCByZW5kZXJfc3RhdGUgeworCWNvbnN0IHN0cnVj
dCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgKnJvZGF0YTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X29iamVjdCAqb2JqOworCXU2NCBnZ3R0X29mZnNldDsKKwlpbnQgZ2VuOworCXUzMiBhdXhfYmF0
Y2hfc2l6ZTsKKwl1MzIgYXV4X2JhdGNoX29mZnNldDsKK307CisKIHN0YXRpYyBjb25zdCBzdHJ1
Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhICoKIHJlbmRlcl9zdGF0ZV9nZXRfcm9kYXRhKHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYsIGNvbnN0IGludCBnZW4pCiB7CkBAIC0xNjMsMTQgKzE3Miwx
NCBAQCBlcnJfb3V0OgogCiAjdW5kZWYgT1VUX0JBVENICiAKLXZvaWQgaTkxNV9nZW1fcmVuZGVy
X3N0YXRlX2Zpbmkoc3RydWN0IHJlbmRlcl9zdGF0ZSAqc28pCitzdGF0aWMgdm9pZCByZW5kZXJf
c3RhdGVfZmluaShzdHJ1Y3QgcmVuZGVyX3N0YXRlICpzbykKIHsKIAlpOTE1X2dlbV9vYmplY3Rf
Z2d0dF91bnBpbihzby0+b2JqKTsKIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmc28tPm9i
ai0+YmFzZSk7CiB9CiAKLWludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfcHJlcGFyZShzdHJ1Y3Qg
aW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJCSAgc3RydWN0IHJlbmRlcl9zdGF0ZSAqc28pCitz
dGF0aWMgaW50IHJlbmRlcl9zdGF0ZV9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp
bmcsCisJCQkJc3RydWN0IHJlbmRlcl9zdGF0ZSAqc28pCiB7CiAJaW50IHJldDsKIApAQCAtMTg2
LDcgKzE5NSw3IEBAIGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfcHJlcGFyZShzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICpyaW5nLAogCiAJcmV0ID0gcmVuZGVyX3N0YXRlX3NldHVwKHNvKTsKIAlp
ZiAocmV0KSB7Ci0JCWk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9maW5pKHNvKTsKKwkJcmVuZGVyX3N0
YXRlX2Zpbmkoc28pOwogCQlyZXR1cm4gcmV0OwogCX0KIApAQCAtMTk4LDcgKzIwNyw3IEBAIGlu
dCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg
KnJlcSkKIAlzdHJ1Y3QgcmVuZGVyX3N0YXRlIHNvOwogCWludCByZXQ7CiAKLQlyZXQgPSBpOTE1
X2dlbV9yZW5kZXJfc3RhdGVfcHJlcGFyZShyZXEtPmVuZ2luZSwgJnNvKTsKKwlyZXQgPSByZW5k
ZXJfc3RhdGVfcHJlcGFyZShyZXEtPmVuZ2luZSwgJnNvKTsKIAlpZiAocmV0KQogCQlyZXR1cm4g
cmV0OwogCkBAIC0yMjIsOCArMjMxLDcgQEAgaW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0
KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCX0KIAogCWk5MTVfdm1hX21vdmVf
dG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KHNvLm9iaiksIHJlcSk7Ci0KIG91dDoKLQlp
OTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaSgmc28pOworCXJlbmRlcl9zdGF0ZV9maW5pKCZzbyk7
CiAJcmV0dXJuIHJldDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z2VtX3JlbmRlcl9zdGF0ZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVy
X3N0YXRlLmgKaW5kZXggZTY0MWJiMDkzYTkwLi5jNDRmY2E4NTk5YmIgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5oCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5oCkBAIC0yNiwyNCArMjYsNiBAQAog
CiAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KIAotc3RydWN0IGludGVsX3JlbmRlcnN0YXRlX3Jv
ZGF0YSB7Ci0JY29uc3QgdTMyICpyZWxvYzsKLQljb25zdCB1MzIgKmJhdGNoOwotCWNvbnN0IHUz
MiBiYXRjaF9pdGVtczsKLX07Ci0KLXN0cnVjdCByZW5kZXJfc3RhdGUgewotCWNvbnN0IHN0cnVj
dCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgKnJvZGF0YTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X29iamVjdCAqb2JqOwotCXU2NCBnZ3R0X29mZnNldDsKLQlpbnQgZ2VuOwotCXUzMiBhdXhfYmF0
Y2hfc2l6ZTsKLQl1MzIgYXV4X2JhdGNoX29mZnNldDsKLX07Ci0KIGludCBpOTE1X2dlbV9yZW5k
ZXJfc3RhdGVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7Ci12b2lkIGk5
MTVfZ2VtX3JlbmRlcl9zdGF0ZV9maW5pKHN0cnVjdCByZW5kZXJfc3RhdGUgKnNvKTsKLWludCBp
OTE1X2dlbV9yZW5kZXJfc3RhdGVfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n
LAotCQkJCSAgc3RydWN0IHJlbmRlcl9zdGF0ZSAqc28pOwogCiAjZW5kaWYgLyogX0k5MTVfR0VN
X1JFTkRFUl9TVEFURV9IXyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA5ODM4NTAz
ZmFmY2EuLjJmOTJjNDMzOTdlYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTE2Mjcs
MzggKzE2MjcsNiBAQCBzdGF0aWMgaW50IGdlbjhfYWRkX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1
X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGludGVs
X2xyX2NvbnRleHRfcmVuZGVyX3N0YXRlX2luaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0
ICpyZXEpCi17Ci0Jc3RydWN0IHJlbmRlcl9zdGF0ZSBzbzsKLQlpbnQgcmV0OwotCi0JcmV0ID0g
aTkxNV9nZW1fcmVuZGVyX3N0YXRlX3ByZXBhcmUocmVxLT5lbmdpbmUsICZzbyk7Ci0JaWYgKHJl
dCkKLQkJcmV0dXJuIHJldDsKLQotCWlmIChzby5yb2RhdGEgPT0gTlVMTCkKLQkJcmV0dXJuIDA7
Ci0KLQlyZXQgPSByZXEtPmVuZ2luZS0+ZW1pdF9iYl9zdGFydChyZXEsIHNvLmdndHRfb2Zmc2V0
LAotCQkJCQkgc28ucm9kYXRhLT5iYXRjaF9pdGVtcyAqIDQsCi0JCQkJCSBJOTE1X0RJU1BBVENI
X1NFQ1VSRSk7Ci0JaWYgKHJldCkKLQkJZ290byBvdXQ7Ci0KLQlyZXQgPSByZXEtPmVuZ2luZS0+
ZW1pdF9iYl9zdGFydChyZXEsCi0JCQkJCSAoc28uZ2d0dF9vZmZzZXQgKyBzby5hdXhfYmF0Y2hf
b2Zmc2V0KSwKLQkJCQkJIHNvLmF1eF9iYXRjaF9zaXplLAotCQkJCQkgSTkxNV9ESVNQQVRDSF9T
RUNVUkUpOwotCWlmIChyZXQpCi0JCWdvdG8gb3V0OwotCi0JaTkxNV92bWFfbW92ZV90b19hY3Rp
dmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwgcmVxKTsKLQotb3V0OgotCWk5MTVfZ2Vt
X3JlbmRlcl9zdGF0ZV9maW5pKCZzbyk7Ci0JcmV0dXJuIHJldDsKLX0KLQogc3RhdGljIGludCBn
ZW44X2luaXRfcmNzX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7
CiAJaW50IHJldDsKQEAgLTE2NzUsNyArMTY0Myw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X3Jj
c19jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCWlmIChyZXQpCiAJ
CURSTV9FUlJPUigiTU9DUyBmYWlsZWQgdG8gcHJvZ3JhbTogZXhwZWN0IHBlcmZvcm1hbmNlIGlz
c3Vlcy5cbiIpOwogCi0JcmV0dXJuIGludGVsX2xyX2NvbnRleHRfcmVuZGVyX3N0YXRlX2luaXQo
cmVxKTsKKwlyZXR1cm4gaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2luaXQocmVxKTsKIH0KIAogLyoq
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yZW5kZXJzdGF0ZS5oIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmVuZGVyc3RhdGUuaAppbmRleCA1YmQ2OTg1Mjc1
MmMuLjA4ZjZmZWEwNWEyYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cmVuZGVyc3RhdGUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yZW5kZXJzdGF0
ZS5oCkBAIC0yNCwxMiArMjQsMTMgQEAKICNpZm5kZWYgX0lOVEVMX1JFTkRFUlNUQVRFX0gKICNk
ZWZpbmUgX0lOVEVMX1JFTkRFUlNUQVRFX0gKIAotI2luY2x1ZGUgImk5MTVfZHJ2LmgiCisjaW5j
bHVkZSA8bGludXgvdHlwZXMuaD4KIAotZXh0ZXJuIGNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJz
dGF0ZV9yb2RhdGEgZ2VuNl9udWxsX3N0YXRlOwotZXh0ZXJuIGNvbnN0IHN0cnVjdCBpbnRlbF9y
ZW5kZXJzdGF0ZV9yb2RhdGEgZ2VuN19udWxsX3N0YXRlOwotZXh0ZXJuIGNvbnN0IHN0cnVjdCBp
bnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgZ2VuOF9udWxsX3N0YXRlOwotZXh0ZXJuIGNvbnN0IHN0
cnVjdCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgZ2VuOV9udWxsX3N0YXRlOworc3RydWN0IGlu
dGVsX3JlbmRlcnN0YXRlX3JvZGF0YSB7CisJY29uc3QgdTMyICpyZWxvYzsKKwljb25zdCB1MzIg
KmJhdGNoOworCWNvbnN0IHUzMiBiYXRjaF9pdGVtczsKK307CiAKICNkZWZpbmUgUk9fUkVOREVS
U1RBVEUoX2cpCQkJCQkJXAogCWNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEg
Z2VuICMjIF9nICMjIF9udWxsX3N0YXRlID0geyBcCkBAIC0zOCw0ICszOSw5IEBAIGV4dGVybiBj
b25zdCBzdHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjlfbnVsbF9zdGF0ZTsKIAkJ
LmJhdGNoX2l0ZW1zID0gc2l6ZW9mKGdlbiAjIyBfZyAjIyBfbnVsbF9zdGF0ZV9iYXRjaCkvNCwg
XAogCX0KIAorZXh0ZXJuIGNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgZ2Vu
Nl9udWxsX3N0YXRlOworZXh0ZXJuIGNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2Rh
dGEgZ2VuN19udWxsX3N0YXRlOworZXh0ZXJuIGNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJzdGF0
ZV9yb2RhdGEgZ2VuOF9udWxsX3N0YXRlOworZXh0ZXJuIGNvbnN0IHN0cnVjdCBpbnRlbF9yZW5k
ZXJzdGF0ZV9yb2RhdGEgZ2VuOV9udWxsX3N0YXRlOworCiAjZW5kaWYgLyogSU5URUxfUkVOREVS
U1RBVEVfSCAqLwotLSAKMi43LjAucmMzCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp
bmZvL2ludGVsLWdmeAo=