From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 40/62] drm/i915: Remove duplicate golden render
	state init from execlists
Date: Fri,  3 Jun 2016 17:37:05 +0100
Message-ID: <1464971847-15809-41-git-send-email-chris@chris-wilson.co.uk>
References: <1464971847-15809-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-x243.google.com (mail-wm0-x243.google.com
 [IPv6:2a00:1450:400c:c09::243])
 by gabe.freedesktop.org (Postfix) with ESMTPS id C842D6EE3A
 for <intel-gfx@lists.freedesktop.org>; Fri,  3 Jun 2016 16:38:13 +0000 (UTC)
Received: by mail-wm0-x243.google.com with SMTP id n184so620720wmn.1
 for <intel-gfx@lists.freedesktop.org>; Fri, 03 Jun 2016 09:38:13 -0700 (PDT)
In-Reply-To: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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
cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAyMyArKysrKysrKysrKysrLS0t
LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuaCB8IDE4IC0t
LS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAg
ICAgfCAzNCArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yZW5kZXJzdGF0ZS5oICAgICB8IDE2ICsrKysrKysrKy0tLS0KIDQgZmlsZXMgY2hh
bmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgNjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRleCA2YWVkYjkxM2Y2OTQuLjg1ODdk
YmMzMDJlMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVy
X3N0YXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRl
LmMKQEAgLTI4LDYgKzI4LDE1IEBACiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIKICNpbmNsdWRlICJp
bnRlbF9yZW5kZXJzdGF0ZS5oIgogCitzdHJ1Y3QgcmVuZGVyX3N0YXRlIHsKKwljb25zdCBzdHJ1
Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhICpyb2RhdGE7CisJc3RydWN0IGRybV9pOTE1X2dl
bV9vYmplY3QgKm9iajsKKwl1NjQgZ2d0dF9vZmZzZXQ7CisJaW50IGdlbjsKKwl1MzIgYXV4X2Jh
dGNoX3NpemU7CisJdTMyIGF1eF9iYXRjaF9vZmZzZXQ7Cit9OworCiBzdGF0aWMgY29uc3Qgc3Ry
dWN0IGludGVsX3JlbmRlcnN0YXRlX3JvZGF0YSAqCiByZW5kZXJfc3RhdGVfZ2V0X3JvZGF0YShj
b25zdCBpbnQgZ2VuKQogewpAQCAtNTEsNiArNjAsNyBAQCBzdGF0aWMgaW50IHJlbmRlcl9zdGF0
ZV9pbml0KHN0cnVjdCByZW5kZXJfc3RhdGUgKnNvLAogCWludCByZXQ7CiAKIAlzby0+Z2VuID0g
SU5URUxfR0VOKGRldl9wcml2KTsKKwlzby0+Z2d0dF9vZmZzZXQgPSAwOwogCXNvLT5yb2RhdGEg
PSByZW5kZXJfc3RhdGVfZ2V0X3JvZGF0YShzby0+Z2VuKTsKIAlpZiAoc28tPnJvZGF0YSA9PSBO
VUxMKQogCQlyZXR1cm4gMDsKQEAgLTE2NCwxNCArMTc0LDE0IEBAIGVycl9vdXQ6CiAKICN1bmRl
ZiBPVVRfQkFUQ0gKIAotdm9pZCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaShzdHJ1Y3QgcmVu
ZGVyX3N0YXRlICpzbykKK3N0YXRpYyB2b2lkIHJlbmRlcl9zdGF0ZV9maW5pKHN0cnVjdCByZW5k
ZXJfc3RhdGUgKnNvKQogewogCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHNvLT5vYmopOwog
CWk5MTVfZ2VtX29iamVjdF9wdXQoc28tPm9iaik7CiB9CiAKLWludCBpOTE1X2dlbV9yZW5kZXJf
c3RhdGVfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCi0JCQkJICBzdHJ1
Y3QgcmVuZGVyX3N0YXRlICpzbykKK3N0YXRpYyBpbnQgcmVuZGVyX3N0YXRlX3ByZXBhcmUoc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQkJCXN0cnVjdCByZW5kZXJfc3RhdGUgKnNv
KQogewogCWludCByZXQ7CiAKQEAgLTE4Nyw3ICsxOTcsNyBAQCBpbnQgaTkxNV9nZW1fcmVuZGVy
X3N0YXRlX3ByZXBhcmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCiAJcmV0ID0g
cmVuZGVyX3N0YXRlX3NldHVwKHNvKTsKIAlpZiAocmV0KSB7Ci0JCWk5MTVfZ2VtX3JlbmRlcl9z
dGF0ZV9maW5pKHNvKTsKKwkJcmVuZGVyX3N0YXRlX2Zpbmkoc28pOwogCQlyZXR1cm4gcmV0Owog
CX0KIApAQCAtMTk5LDcgKzIwOSw3IEBAIGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChz
dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlzdHJ1Y3QgcmVuZGVyX3N0YXRlIHNv
OwogCWludCByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfcHJlcGFyZShyZXEt
PmVuZ2luZSwgJnNvKTsKKwlyZXQgPSByZW5kZXJfc3RhdGVfcHJlcGFyZShyZXEtPmVuZ2luZSwg
JnNvKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0yMjMsOCArMjMzLDcgQEAgaW50
IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq
cmVxKQogCX0KIAogCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0
KHNvLm9iaiksIHJlcSk7Ci0KIG91dDoKLQlpOTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaSgmc28p
OworCXJlbmRlcl9zdGF0ZV9maW5pKCZzbyk7CiAJcmV0dXJuIHJldDsKIH0KZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5oIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmgKaW5kZXggNmFhYTNhMTBhNjMwLi5j
NDRmY2E4NTk5YmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl
bmRlcl9zdGF0ZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9z
dGF0ZS5oCkBAIC0yNiwyNCArMjYsNiBAQAogCiAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4KIAot
c3RydWN0IGludGVsX3JlbmRlcnN0YXRlX3JvZGF0YSB7Ci0JY29uc3QgdTMyICpyZWxvYzsKLQlj
b25zdCB1MzIgKmJhdGNoOwotCWNvbnN0IHUzMiBiYXRjaF9pdGVtczsKLX07Ci0KLXN0cnVjdCBy
ZW5kZXJfc3RhdGUgewotCWNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgKnJv
ZGF0YTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwotCXU2NCBnZ3R0X29mZnNl
dDsKLQlpbnQgZ2VuOwotCXUzMiBhdXhfYmF0Y2hfc2l6ZTsKLQl1MzIgYXV4X2JhdGNoX29mZnNl
dDsKLX07Ci0KIGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVf
Z2VtX3JlcXVlc3QgKnJlcSk7Ci12b2lkIGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9maW5pKHN0cnVj
dCByZW5kZXJfc3RhdGUgKnNvKTsKLWludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfcHJlcGFyZShz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCi0JCQkJICBzdHJ1Y3QgcmVuZGVyX3N0YXRl
ICpzbyk7CiAKICNlbmRpZiAvKiBfSTkxNV9HRU1fUkVOREVSX1NUQVRFX0hfICovCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2xyYy5jCmluZGV4IGVlZTkyNzRmNzUxNi4uM2Y3ZjdkNzI0ODdlIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTcyMywzOCArMTcyMyw2IEBAIHN0YXRpYyBpbnQgZ2Vu
OF9lbWl0X3JlcXVlc3RfcmVuZGVyKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz
dCkKIAlyZXR1cm4gaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChyZXF1ZXN0
KTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0
cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQotewotCXN0cnVjdCByZW5kZXJfc3RhdGUg
c287Ci0JaW50IHJldDsKLQotCXJldCA9IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9wcmVwYXJlKHJl
cS0+ZW5naW5lLCAmc28pOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0KLQlpZiAoc28ucm9k
YXRhID09IE5VTEwpCi0JCXJldHVybiAwOwotCi0JcmV0ID0gcmVxLT5lbmdpbmUtPmVtaXRfYmJf
c3RhcnQocmVxLCBzby5nZ3R0X29mZnNldCwKLQkJCQkJIHNvLnJvZGF0YS0+YmF0Y2hfaXRlbXMg
KiA0LAotCQkJCQkgSTkxNV9ESVNQQVRDSF9TRUNVUkUpOwotCWlmIChyZXQpCi0JCWdvdG8gb3V0
OwotCi0JcmV0ID0gcmVxLT5lbmdpbmUtPmVtaXRfYmJfc3RhcnQocmVxLAotCQkJCQkgKHNvLmdn
dHRfb2Zmc2V0ICsgc28uYXV4X2JhdGNoX29mZnNldCksCi0JCQkJCSBzby5hdXhfYmF0Y2hfc2l6
ZSwKLQkJCQkJIEk5MTVfRElTUEFUQ0hfU0VDVVJFKTsKLQlpZiAocmV0KQotCQlnb3RvIG91dDsK
LQotCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KHNvLm9iaiks
IHJlcSk7Ci0KLW91dDoKLQlpOTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaSgmc28pOwotCXJldHVy
biByZXQ7Ci19Ci0KIHN0YXRpYyBpbnQgZ2VuOF9pbml0X3Jjc19jb250ZXh0KHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCWludCByZXQ7CkBAIC0xNzcxLDcgKzE3MzksNyBA
QCBzdGF0aWMgaW50IGdlbjhfaW5pdF9yY3NfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl
cXVlc3QgKnJlcSkKIAlpZiAocmV0KQogCQlEUk1fRVJST1IoIk1PQ1MgZmFpbGVkIHRvIHByb2dy
YW06IGV4cGVjdCBwZXJmb3JtYW5jZSBpc3N1ZXMuXG4iKTsKIAotCXJldHVybiBpbnRlbF9scl9j
b250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHJlcSk7CisJcmV0dXJuIGk5MTVfZ2VtX3JlbmRlcl9z
dGF0ZV9pbml0KHJlcSk7CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfcmVuZGVyc3RhdGUuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JlbmRl
cnN0YXRlLmgKaW5kZXggNWJkNjk4NTI3NTJjLi4wOGY2ZmVhMDVhMmMgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JlbmRlcnN0YXRlLmgKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcmVuZGVyc3RhdGUuaApAQCAtMjQsMTIgKzI0LDEzIEBACiAjaWZuZGVm
IF9JTlRFTF9SRU5ERVJTVEFURV9ICiAjZGVmaW5lIF9JTlRFTF9SRU5ERVJTVEFURV9ICiAKLSNp
bmNsdWRlICJpOTE1X2Rydi5oIgorI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+CiAKLWV4dGVybiBj
b25zdCBzdHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjZfbnVsbF9zdGF0ZTsKLWV4
dGVybiBjb25zdCBzdHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjdfbnVsbF9zdGF0
ZTsKLWV4dGVybiBjb25zdCBzdHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjhfbnVs
bF9zdGF0ZTsKLWV4dGVybiBjb25zdCBzdHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdl
bjlfbnVsbF9zdGF0ZTsKK3N0cnVjdCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgeworCWNvbnN0
IHUzMiAqcmVsb2M7CisJY29uc3QgdTMyICpiYXRjaDsKKwljb25zdCB1MzIgYmF0Y2hfaXRlbXM7
Cit9OwogCiAjZGVmaW5lIFJPX1JFTkRFUlNUQVRFKF9nKQkJCQkJCVwKIAljb25zdCBzdHJ1Y3Qg
aW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbiAjIyBfZyAjIyBfbnVsbF9zdGF0ZSA9IHsgXApA
QCAtMzgsNCArMzksOSBAQCBleHRlcm4gY29uc3Qgc3RydWN0IGludGVsX3JlbmRlcnN0YXRlX3Jv
ZGF0YSBnZW45X251bGxfc3RhdGU7CiAJCS5iYXRjaF9pdGVtcyA9IHNpemVvZihnZW4gIyMgX2cg
IyMgX251bGxfc3RhdGVfYmF0Y2gpLzQsIFwKIAl9CiAKK2V4dGVybiBjb25zdCBzdHJ1Y3QgaW50
ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjZfbnVsbF9zdGF0ZTsKK2V4dGVybiBjb25zdCBzdHJ1
Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjdfbnVsbF9zdGF0ZTsKK2V4dGVybiBjb25z
dCBzdHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjhfbnVsbF9zdGF0ZTsKK2V4dGVy
biBjb25zdCBzdHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhIGdlbjlfbnVsbF9zdGF0ZTsK
KwogI2VuZGlmIC8qIElOVEVMX1JFTkRFUlNUQVRFX0ggKi8KLS0gCjIuOC4xCgpfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs
aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz
a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK