From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 06/18] drm/i915: Flush the ring stop bit after clearing RING_HEAD in reset Date: Fri, 25 May 2018 10:31:54 +0100 Message-ID: <20180525093206.1919-7-chris@chris-wilson.co.uk> References: <20180525093206.1919-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id C882A6E923 for ; Fri, 25 May 2018 09:32:47 +0000 (UTC) In-Reply-To: <20180525093206.1919-1-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SW5zaWRlIHRoZSBsaXZlX2hhbmdjaGVjayAocmVzZXQpIHNlbGZ0ZXN0cywgd2Ugb2NjYXNpb25h bGx5IHNlZQpmYWlsdXJlcyBsaWtlCgo8Nz5bICAyMzkuMDk0ODQwXSBpOTE1X2dlbV9zZXRfd2Vk Z2VkIHJjczAKPDc+WyAgMjM5LjA5NDg0M10gaTkxNV9nZW1fc2V0X3dlZGdlZCAJY3VycmVudCBz ZXFubyAxOWE5OCwgbGFzdCAxOWE5YSwgaGFuZ2NoZWNrIDAgWzUxNTggbXNdCjw3PlsgIDIzOS4w OTQ4NDZdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCVJlc2V0IGNvdW50OiA2MjM5IChnbG9iYWwgMSkK PDc+WyAgMjM5LjA5NDg0OF0gaTkxNV9nZW1fc2V0X3dlZGdlZCAJUmVxdWVzdHM6Cjw3PlsgIDIz OS4wOTUwNTJdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlmaXJzdCAgMTlhOTkgW2U4Yzo1Zl0gcHJp bz0xMDI0IEAgNTE1OW1zOiAobnVsbCkKPDc+WyAgMjM5LjA5NTA1Nl0gaTkxNV9nZW1fc2V0X3dl ZGdlZCAJCWxhc3QgICAxOWE5YSBbZTgxOjFhXSBwcmlvPTEzOSBAIDUxNTltczogaWd0L3JjczBb NTk3N10vMQo8Nz5bICAyMzkuMDk1MDU5XSBpOTE1X2dlbV9zZXRfd2VkZ2VkIAkJYWN0aXZlIDE5 YTk5IFtlOGM6NWZdIHByaW89MTAyNCBAIDUxNTltczogKG51bGwpCjw3PlsgIDIzOS4wOTUwNjJd IGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlbaGVhZCAwMjIwLCBwb3N0Zml4IDAyODAsIHRhaWwgMDJh OCwgYmF0Y2ggMHhmZmZmZmZmZl9mZmZmZmZmZl0KPDc+WyAgMjM5LjEwMDA1MF0gaTkxNV9nZW1f c2V0X3dlZGdlZCAJCXJpbmctPnN0YXJ0OiAgMHgwMDI4MzAwMAo8Nz5bICAyMzkuMTAwMDUzXSBp OTE1X2dlbV9zZXRfd2VkZ2VkIAkJcmluZy0+aGVhZDogICAweDAwMDAwMWY4Cjw3PlsgIDIzOS4x MDAwNTVdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlyaW5nLT50YWlsOiAgIDB4MDAwMDAyYTgKPDc+ WyAgMjM5LjEwMDA1N10gaTkxNV9nZW1fc2V0X3dlZGdlZCAJCXJpbmctPmVtaXQ6ICAgMHgwMDAw MDJhOAo8Nz5bICAyMzkuMTAwMDU5XSBpOTE1X2dlbV9zZXRfd2VkZ2VkIAkJcmluZy0+c3BhY2U6 ICAweDAwMDAwZjEwCjw3PlsgIDIzOS4xMDAwODVdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCVJJTkdf U1RBUlQ6IDB4MDAyODMwMDAKPDc+WyAgMjM5LjEwMDA4OF0gaTkxNV9nZW1fc2V0X3dlZGdlZCAJ UklOR19IRUFEOiAgMHgwMDAwMDI2MAo8Nz5bICAyMzkuMTAwMDkxXSBpOTE1X2dlbV9zZXRfd2Vk Z2VkIAlSSU5HX1RBSUw6ICAweDAwMDAwMmE4Cjw3PlsgIDIzOS4xMDAwOTRdIGk5MTVfZ2VtX3Nl dF93ZWRnZWQgCVJJTkdfQ1RMOiAgIDB4MDAwMDAwMDEKPDc+WyAgMjM5LjEwMDA5N10gaTkxNV9n ZW1fc2V0X3dlZGdlZCAJUklOR19NT0RFOiAgMHgwMDAwMDMwMCBbaWRsZV0KPDc+WyAgMjM5LjEw MDEwMF0gaTkxNV9nZW1fc2V0X3dlZGdlZCAJUklOR19JTVI6IGZmZmZmZWZlCjw3PlsgIDIzOS4x MDAxMDRdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCUFDVEhEOiAgMHgwMDAwMDAwMF8wMDAwNjA5Ywo8 Nz5bICAyMzkuMTAwMTA4XSBpOTE1X2dlbV9zZXRfd2VkZ2VkIAlCQkFERFI6IDB4MDAwMDAwMDBf MDAwMDYwOWQKPDc+WyAgMjM5LjEwMDExMV0gaTkxNV9nZW1fc2V0X3dlZGdlZCAJRE1BX0ZBRERS OiAweDAwMDAwMDAwXzAwMjgzMjYwCjw3PlsgIDIzOS4xMDAxMTRdIGk5MTVfZ2VtX3NldF93ZWRn ZWQgCUlQRUlSOiAweDAwMDAwMDAwCjw3PlsgIDIzOS4xMDAxMTddIGk5MTVfZ2VtX3NldF93ZWRn ZWQgCUlQRUhSOiAweDAyODAwMDAwCjw3PlsgIDIzOS4xMDAxMjBdIGk5MTVfZ2VtX3NldF93ZWRn ZWQgCUV4ZWNsaXN0IHN0YXR1czogMHgwMDA0NDA1MiAwMDAwMDAwMgo8Nz5bICAyMzkuMTAwMTI0 XSBpOTE1X2dlbV9zZXRfd2VkZ2VkIAlFeGVjbGlzdCBDU0IgcmVhZCA1IFs1IGNhY2hlZF0sIHdy aXRlIDUgWzUgZnJvbSBod3NdLCBpbnRlcnJ1cHQgcG9zdGVkPyBubywgdGFza2xldCBxdWV1ZWQ/ IG5vIChlbmFibGVkKQo8Nz5bICAyMzkuMTAwMTI4XSBpOTE1X2dlbV9zZXRfd2VkZ2VkIAkJRUxT UFswXSBjb3VudD0xLCByaW5nLT5zdGFydD0wMDI4MzAwMCwgcnE6IDE5YTk5IFtlOGM6NWZdIHBy aW89MTAyNCBAIDUxNjRtczogKG51bGwpCjw3PlsgIDIzOS4xMDAxMzJdIGk5MTVfZ2VtX3NldF93 ZWRnZWQgCQlFTFNQWzFdIGNvdW50PTEsIHJpbmctPnN0YXJ0PTAwMjU3MDAwLCBycTogMTlhOWEg W2U4MToxYV0gcHJpbz0xMzkgQCA1MTY0bXM6IGlndC9yY3MwWzU5NzddLzEKPDc+WyAgMjM5LjEw MDEzNV0gaTkxNV9nZW1fc2V0X3dlZGdlZCAJCUhXIGFjdGl2ZT8gMHg1Cjw3PlsgIDIzOS4xMDAy NTBdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlFIDE5YTk5IFtlOGM6NWZdIHByaW89MTAyNCBAIDUx NjRtczogKG51bGwpCjw3PlsgIDIzOS4xMDAzMzhdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlFIDE5 YTlhIFtlODE6MWFdIHByaW89MTM5IEAgNTE2NG1zOiBpZ3QvcmNzMFs1OTc3XS8xCjw3PlsgIDIz OS4xMDAzNDBdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlRdWV1ZSBwcmlvcml0eTogMTM5Cjw3Plsg IDIzOS4xMDAzNDNdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlRIDAgW2U5ODoxOV0gcHJpbz0xMzIg QCA1MTY0bXM6IGlndC9yY3MwWzU5NzddLzgKPDc+WyAgMjM5LjEwMDM0Nl0gaTkxNV9nZW1fc2V0 X3dlZGdlZCAJCVEgMCBbZTg0OjE5XSBwcmlvPTEyMSBAIDUxNjVtczogaWd0L3JjczBbNTk3N10v Mgo8Nz5bICAyMzkuMTAwMzQ5XSBpOTE1X2dlbV9zZXRfd2VkZ2VkIAkJUSAwIFtlODc6MTldIHBy aW89ODIgQCA1MTY1bXM6IGlndC9yY3MwWzU5NzddLzMKPDc+WyAgMjM5LjEwMDM1Ml0gaTkxNV9n ZW1fc2V0X3dlZGdlZCAJCVEgMCBbZTg0OjFhXSBwcmlvPTQ0IEAgNTE2NG1zOiBpZ3QvcmNzMFs1 OTc3XS8yCjw3PlsgIDIzOS4xMDAzNTZdIGk5MTVfZ2VtX3NldF93ZWRnZWQgCQlRIDAgW2U4Yjox OV0gcHJpbz0yMCBAIDUxNjVtczogaWd0L3JjczBbNTk3N10vNAo8Nz5bICAyMzkuMTAwMzYyXSBp OTE1X2dlbV9zZXRfd2VkZ2VkIAlkcnZfc2VsZnRlc3QgWzU4OTRdIHdhaXRpbmcgZm9yIDE5YTk5 Cgp3aGVyZSB0aGUgR1BVIHNhdyBhbiBhcmJpdHJhdGlvbiBwb2ludCBhbmQgaWRsZXM7IEFORCBI QVMgTk9UIEJFRU4gUkVTRVQhClRoZSBSSU5HX01PREUgaW5kaWNhdGVzIHRoYXQgaXMgaWRsZSBh bmQgaGFzIHRoZSBTVE9QX1JJTkcgYml0IHNldCwgc28KdHJ5IGNsZWFyaW5nIGl0LgoKdjI6IE9u bHkgY2xlYXIgdGhlIGJpdCBvbiByZXN0YXJ0aW5nIHRoZSByaW5nLCBhcyB3ZSB3YW50IHRvIGJl IHN1cmUgdGhlClNUT1BfUklORyBiaXQgaXMga2VwdCBpZiByZXNldCBmYWlscyBvbiB3ZWRnaW5n Lgp2MzogU3BvdCB3aGVuIHRoZSByaW5nIHN0YXRlIGRvZXNuJ3QgbWFrZSBzZW5zZSB3aGVuIHJl LWluaXRpYWxpc2luZyB0aGUKZW5naW5lIGFuZCBkdW1wIGl0IHRvIHRoZSBsb2dzIHNvIHRoYXQg d2UgZG9uJ3QgaGF2ZSB0byB3YWl0IGZvciBhbgplcnJvciBsYXRlciBhbmQgdHJ5IHRvIGd1ZXNz IHdoYXQgaGFwcGVuZWQgZWFybGllci4KdjQ6IFByZXBhcmUgdG8gcHJpbnQgYWxsIHRoZSB1bmV4 cGVjdGVkIHN0YXRlLCBub3QganVzdCB0aGUgZmlyc3QuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBX aWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgfCAyMiArKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMjIg aW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggODU3YWIwNDQ1MmYw Li5iM2E1Y2ZiNzY4OWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xNzgxLDYgKzE3 ODEsOSBAQCBzdGF0aWMgdm9pZCBlbmFibGVfZXhlY2xpc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZSkKIAkJSTkxNV9XUklURShSSU5HX01PREVfR0VONyhlbmdpbmUpLAogCQkJICAg X01BU0tFRF9CSVRfRU5BQkxFKEdGWF9SVU5fTElTVF9FTkFCTEUpKTsKIAorCUk5MTVfV1JJVEUo UklOR19NSV9NT0RFKGVuZ2luZS0+bW1pb19iYXNlKSwKKwkJICAgX01BU0tFRF9CSVRfRElTQUJM RShTVE9QX1JJTkcpKTsKKwogCUk5MTVfV1JJVEUoUklOR19IV1NfUEdBKGVuZ2luZS0+bW1pb19i YXNlKSwKIAkJICAgZW5naW5lLT5zdGF0dXNfcGFnZS5nZ3R0X29mZnNldCk7CiAJUE9TVElOR19S RUFEKFJJTkdfSFdTX1BHQShlbmdpbmUtPm1taW9fYmFzZSkpOwpAQCAtMTc4OSw2ICsxNzkyLDE5 IEBAIHN0YXRpYyB2b2lkIGVuYWJsZV9leGVjbGlzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCWVuZ2luZS0+ZXhlY2xpc3RzLmNzYl9oZWFkID0gLTE7CiB9CiAKK3N0YXRpYyBi b29sIHVuZXhwZWN0ZWRfc3RhcnRpbmdfc3RhdGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkx NTsKKwlib29sIHVuZXhwZWN0ZWQgPSBmYWxzZTsKKworCWlmIChJOTE1X1JFQUQoUklOR19NSV9N T0RFKGVuZ2luZS0+bW1pb19iYXNlKSkgJiBTVE9QX1JJTkcpIHsKKwkJRFJNX0RFQlVHX0RSSVZF UigiU1RPUF9SSU5HIHN0aWxsIHNldCBpbiBSSU5HX01JX01PREVcbiIpOworCQl1bmV4cGVjdGVk ID0gdHJ1ZTsKKwl9CisKKwlyZXR1cm4gdW5leHBlY3RlZDsKK30KKwogc3RhdGljIGludCBnZW44 X2luaXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXN0 cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzID0gJmVuZ2luZS0+ ZXhlY2xpc3RzOwpAQCAtMTgwMSw2ICsxODE3LDEyIEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X2Nv bW1vbl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlpbnRlbF9lbmdpbmVf cmVzZXRfYnJlYWRjcnVtYnMoZW5naW5lKTsKIAlpbnRlbF9lbmdpbmVfaW5pdF9oYW5nY2hlY2so ZW5naW5lKTsKIAorCWlmIChHRU1fU0hPV19ERUJVRygpICYmIHVuZXhwZWN0ZWRfc3RhcnRpbmdf c3RhdGUoZW5naW5lKSkgeworCQlzdHJ1Y3QgZHJtX3ByaW50ZXIgcCA9IGRybV9kZWJ1Z19wcmlu dGVyKF9fZnVuY19fKTsKKworCQlpbnRlbF9lbmdpbmVfZHVtcChlbmdpbmUsICZwLCBOVUxMKTsK Kwl9CisKIAllbmFibGVfZXhlY2xpc3RzKGVuZ2luZSk7CiAKIAkvKiBBZnRlciBhIEdQVSByZXNl dCwgd2UgbWF5IGhhdmUgcmVxdWVzdHMgdG8gcmVwbGF5ICovCi0tIAoyLjE3LjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=