From: ville.syrjala@linux.intel.com Subject: [PATCH 2/2] drm/i915: Adjust sideband locking a bit for CHV/VLV Date: Tue, 26 May 2015 20:42:31 +0300 Message-ID: <1432662151-11760-2-git-send-email-ville.syrjala@linux.intel.com> References: <1432662151-11760-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: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B615D6E756 for ; Tue, 26 May 2015 10:42:44 -0700 (PDT) In-Reply-To: <1432662151-11760-1-git-send-email-ville.syrjala@linux.intel.com> 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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmNo dl9lbmFibGVfcGxsKCkgZG9lc24ndCBuZWVkIHRvIGhvbGQgc2JfbG9jayBmb3IgdGhlIGVudGly ZSBkdXJhdGlvbiBvZgp0aGUgZnVuY3Rpb24uIERyb3AgdGhlIGxvY2sgYXMgc29vbiBhcyBwb3Nz aWJsZS4KCnZhbGxleXZpZXdfc2V0X2NkY2xrKCkgZG9lcyBhIHBvdGVudGlhbCBsb2NrK3VubG9j aytsb2NrK3VubG9jayBjeWNsZQp3aXRoIHNiX2xvY2suIE1vdmUgR3JhYiB0aGUgbG9jayBhIGZl dyBsaW5lcyBlYXJsaWVyIHNvIHdlIGNhbiBtYWtlIGRvCndpdGggYSBzaW5nbGUgbG9jayt1bmxv Y2sgY3ljbGUgYWx3YXlzLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCAxMCArKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCsp LCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3 MmI2NTI5Li4wNjdiMWRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0x NjY4LDYgKzE2NjgsOCBAQCBzdGF0aWMgdm9pZCBjaHZfZW5hYmxlX3BsbChzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKIAl0bXAgfD0gRFBJT19EQ0xLUF9FTjsKIAl2bHZfZHBpb193cml0ZShkZXZf cHJpdiwgcGlwZSwgQ0hWX0NNTl9EVzE0KHBvcnQpLCB0bXApOwogCisJbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+c2JfbG9jayk7CisKIAkvKgogCSAqIE5lZWQgdG8gd2FpdCA+IDEwMG5zIGJldHdl ZW4gZGNsa3AgY2xvY2sgZW5hYmxlIGJpdCBhbmQgUExMIGVuYWJsZS4KIAkgKi8KQEAgLTE2ODMs OCArMTY4NSw2IEBAIHN0YXRpYyB2b2lkIGNodl9lbmFibGVfcGxsKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAogCS8qIG5vdCBzdXJlIHdoZW4gdGhpcyBzaG91bGQgYmUgd3JpdHRlbiAqLwogCUk5 MTVfV1JJVEUoRFBMTF9NRChwaXBlKSwgcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuZHBsbF9t ZCk7CiAJUE9TVElOR19SRUFEKERQTExfTUQocGlwZSkpOwotCi0JbXV0ZXhfdW5sb2NrKCZkZXZf cHJpdi0+c2JfbG9jayk7CiB9CiAKIHN0YXRpYyBpbnQgaW50ZWxfbnVtX2R2b19waXBlcyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtNTc4MCwxMiArNTc4MCwxMyBAQCBzdGF0aWMgdm9pZCB2 YWxsZXl2aWV3X3NldF9jZGNsayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgY2RjbGspCiAJ fQogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKIAorCW11dGV4X2xvY2so JmRldl9wcml2LT5zYl9sb2NrKTsKKwogCWlmIChjZGNsayA9PSA0MDAwMDApIHsKIAkJdTMyIGRp dmlkZXI7CiAKIAkJZGl2aWRlciA9IERJVl9ST1VORF9DTE9TRVNUKGRldl9wcml2LT5ocGxsX2Zy ZXEgPDwgMSwgY2RjbGspIC0gMTsKIAotCQltdXRleF9sb2NrKCZkZXZfcHJpdi0+c2JfbG9jayk7 CiAJCS8qIGFkanVzdCBjZGNsayBkaXZpZGVyICovCiAJCXZhbCA9IHZsdl9jY2tfcmVhZChkZXZf cHJpdiwgQ0NLX0RJU1BMQVlfQ0xPQ0tfQ09OVFJPTCk7CiAJCXZhbCAmPSB+RElTUExBWV9GUkVR VUVOQ1lfVkFMVUVTOwpAQCAtNTc5NiwxMCArNTc5Nyw4IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZp ZXdfc2V0X2NkY2xrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBjZGNsaykKIAkJCSAgICAg IERJU1BMQVlfRlJFUVVFTkNZX1NUQVRVUykgPT0gKGRpdmlkZXIgPDwgRElTUExBWV9GUkVRVUVO Q1lfU1RBVFVTX1NISUZUKSwKIAkJCSAgICAgNTApKQogCQkJRFJNX0VSUk9SKCJ0aW1lZCBvdXQg d2FpdGluZyBmb3IgQ0RjbGsgY2hhbmdlXG4iKTsKLQkJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ c2JfbG9jayk7CiAJfQogCi0JbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnNiX2xvY2spOwogCS8qIGFk anVzdCBzZWxmLXJlZnJlc2ggZXhpdCBsYXRlbmN5IHZhbHVlICovCiAJdmFsID0gdmx2X2J1bml0 X3JlYWQoZGV2X3ByaXYsIEJVTklUX1JFR19CSVNPQyk7CiAJdmFsICY9IH4weDdmOwpAQCAtNTgx Myw2ICs1ODEyLDcgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19zZXRfY2RjbGsoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgaW50IGNkY2xrKQogCWVsc2UKIAkJdmFsIHw9IDMwMDAgLyAyNTA7IC8q IDMuMCB1c2VjICovCiAJdmx2X2J1bml0X3dyaXRlKGRldl9wcml2LCBCVU5JVF9SRUdfQklTT0Ms IHZhbCk7CisKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5zYl9sb2NrKTsKIAogCXZsdl91cGRh dGVfY2RjbGsoZGV2KTsKLS0gCjIuMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=