From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH] drm/i915: Re-enable GGTT earlier during resume
	on pre-gen6 platforms
Date: Fri,  6 May 2016 21:35:55 +0300
Message-ID: <1462559755-353-1-git-send-email-ville.syrjala@linux.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>
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
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, drm-intel-fixes@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1v
dmUgdGhlIGludGVsX2VuYWJsZV9ndHQoKSBjYWxsIHRvIGhhcHBlbiBiZWZvcmUgd2UgdG91Y2gg
dGhlIEdUVApkdXJpbmcgcmVzdW1lLiBSaWdodCBub3cgaXQncyBkb25lIHdheSB0b28gbGF0ZS4g
QmVmb3JlCmNvbW1pdCBlYmI3Yzc4ZDM1OGIgKCJhZ3AvaW50ZWwtZ3R0OiBPbmx5IHJlZ2lzdGVy
IGZha2UgYWdwIGRyaXZlciBmb3IgZ2VuMSIpCml0IHdhcyBhY3R1YWxseSBkb25lIGVhcmxpZXIg
b24gYWNjb3VudCBvZiBhbHNvIGdldHRpbmcgY2FsbGVkIGZyb20KdGhlIHJlc3VtZSBob29rIG9m
IHRoZSBmYWtlIGFncCBkcml2ZXIuIFdpdGggdGhlIGZha2UgYWdwIGRyaXZlcgpubyBsb25nZXIg
Z2V0dGluZyByZWdpc3RlcmVkIHdlIG11c3QgbW92ZSB0aGUgY2FsbCB1cC4KClRoZSBzeW1wdG9t
cyBJJ3ZlIHNlZW4gb24gbXkgODMwIG1hY2hpbmUgaW5jbHVkZSBsb3dtZW0gY29ycnVwdGlvbiwK
b3RoZXIga2luZHMgb2YgbWVtb3J5IGNvcnJ1cHRpb24sIGFuZCBzdHJhaWdodCB1cCBodW5nIG1h
Y2hpbmUgZHVyaW5nCm9yIGp1c3QgYWZ0ZXIgcmVzdW1lLiBOb3QgcmVhbGx5IHN1cmUgd2hhdCBj
YXVzZXMgdGhlIG1lbW9yeSBjb3JydXB0aW9uLApidXQgc28gZmFyIEkndmUgbm90IHNlZW4gYW55
IHdpdGggdGhpcyBmaXguCgpJIHRoaW5rIHdlIHNob3VsZG4ndCByZWFsbHkgbmVlZCB0byBjYWxs
IHRoaXMgZHVyaW5nIGluaXQsIGJ1dCB3ZSBoYXZlCmJlZW4gZG9pbmcgdGhhdCBzbyBJJ3ZlIGRl
Y2lkZWQgdG8ga2VlcCB0aGUgY2FsbC4gSG93ZXZlciBtb3ZpbmcgdGhhdApjYWxsIGVhcmxpZXIg
Y291bGQgYmUgcHJ1ZGVudCBhcyB3ZWxsLiBEb2luZyBpdCByaWdodCBhZnRlciB0aGUKaW50ZWwt
Z3R0IHByb2JlIHNlZW1zIGFwcHJvcHJpYXRlLgoKQWxzbyB0ZXN0ZWQgdGhpcyBvbiA5NDZneixl
bGssaWxrIGFuZCBhbGwgc2VlbWVkIHF1aXRlIGhhcHB5IHdpdGgKdGhpcyBjaGFuZ2UuCgpDYzog
RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IGRybS1pbnRlbC1maXhl
c0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKRml4ZXM6IGViYjdjNzhkMzU4YiAoImFncC9pbnRlbC1n
dHQ6IE9ubHkgcmVnaXN0ZXIgZmFrZSBhZ3AgZHJpdmVyIGZvciBnZW4xIikKU2lnbmVkLW9mZi1i
eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jICAgICB8IDYgKysrKysrCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICB8IDUgKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtLmMgICAgIHwgMyAtLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0
dC5jIHwgOSArKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwg
MSArCiA1IGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZG1hLmMKaW5kZXggYWQ3YWJlNTE3NzAwLi5jMjI1ZDkyMTU4YTkgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kbWEuYwpAQCAtMTIzNCw2ICsxMjM0LDEyIEBAIHN0YXRpYyBpbnQg
aTkxNV9kcml2ZXJfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ
aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAorCXJldCA9IGk5MTVfZ2d0dF9lbmFibGVfaHcoZGV2
KTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJPUigiZmFpbGVkIHRvIGVuYWJsZSBHR1RUXG4iKTsK
KwkJZ290byBvdXRfZ2d0dDsKKwl9CisKIAkvKiBXQVJOSU5HOiBBcHBhcmVudGx5IHdlIG11c3Qg
a2ljayBmYmRldiBkcml2ZXJzIGJlZm9yZSB2Z2Fjb24sCiAJICogb3RoZXJ3aXNlIHRoZSB2Z2Eg
ZmJkZXYgZHJpdmVyIGZhbGxzIG92ZXIuICovCiAJcmV0ID0gaTkxNV9raWNrX291dF9maXJtd2Fy
ZV9mYihkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry
di5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA5ZmQyMjFjOTcyNzUu
LjNmNDFlOGFlZDU0ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu
YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC03MzAsOSArNzMwLDE0
IEBAIGludCBpOTE1X3N1c3BlbmRfc3dpdGNoZXJvbyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBw
bV9tZXNzYWdlX3Qgc3RhdGUpCiBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl
di0+ZGV2X3ByaXZhdGU7CisJaW50IHJldDsKIAogCWRpc2FibGVfcnBtX3dha2VyZWZfYXNzZXJ0
cyhkZXZfcHJpdik7CiAKKwlyZXQgPSBpOTE1X2dndHRfZW5hYmxlX2h3KGRldik7CisJaWYgKHJl
dCkKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gcmUtZW5hYmxlIEdHVFRcbiIpOworCiAJaW50ZWxf
Y3NyX3Vjb2RlX3Jlc3VtZShkZXZfcHJpdik7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9t
dXRleCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBhODhlNmM5ZTk1MTYuLjk4YjJhMWM0
OGYzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC00ODIzLDkgKzQ4MjMsNiBAQCBpOTE1
X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqZW5naW5lOwogCWludCByZXQ7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA2
ICYmICFpbnRlbF9lbmFibGVfZ3R0KCkpCi0JCXJldHVybiAtRUlPOwotCiAJLyogRG91YmxlIGxh
eWVyIHNlY3VyaXR5IGJsYW5rZXQsIHNlZSBpOTE1X2dlbV9pbml0KCkgKi8KIAlpbnRlbF91bmNv
cmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAKZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggZDI4NGIxN2FmNDMxLi4xMDEzOGEwZmYwM2MgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMTU3LDYgKzMxNTcsMTUgQEAgc3RhdGlj
IHZvaWQgaTkxNV9nbWNoX3JlbW92ZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAlp
bnRlbF9nbWNoX3JlbW92ZSgpOwogfQogCitpbnQKK2k5MTVfZ2d0dF9lbmFibGVfaHcoc3RydWN0
IGRybV9kZXZpY2UgKmRldikKK3sKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA2ICYmICFp
bnRlbF9lbmFibGVfZ3R0KCkpCisJCXJldHVybiAtRUlPOworCisJcmV0dXJuIDA7Cit9CisKIC8q
KgogICogaTkxNV9nZ3R0X2luaXRfaHcgLSBJbml0aWFsaXplIEdHVFQgaGFyZHdhcmUKICAqIEBk
ZXY6IERSTSBkZXZpY2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggMThhZjNh
ZjE4NzU0Li42ZTM0ZjJlOWYwODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBA
IC01MTYsNiArNTE2LDcgQEAgaTkxNV9wYWdlX2Rpcl9kbWFfYWRkcihjb25zdCBzdHJ1Y3QgaTkx
NV9od19wcGd0dCAqcHBndHQsIGNvbnN0IHVuc2lnbmVkIG4pCiAJCXB4X2RtYShwcGd0dC0+YmFz
ZS5zY3JhdGNoX3BkKTsKIH0KIAoraW50IGk5MTVfZ2d0dF9lbmFibGVfaHcoc3RydWN0IGRybV9k
ZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZ3R0X2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRl
dik7CiB2b2lkIGk5MTVfZ2VtX2luaXRfZ2d0dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZv
aWQgaTkxNV9nZ3R0X2NsZWFudXBfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci0tIAoyLjcu
NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v
bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==