From: Lyude Subject: [PATCH v3] drm/i915/skl: Add support for the SAGV, fix underrun hangs Date: Tue, 12 Jul 2016 13:36:03 -0400 Message-ID: <1468344963-6282-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 Cc: David Airlie , Daniel Vetter , "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org U2luY2UgdGhlIHdhdGVybWFyayBjYWxjdWxhdGlvbnMgZm9yIFNreWxha2UgYXJlIHN0aWxsIGJy b2tlbiwgd2UncmUgYXB0CnRvIGhpdHRpbmcgdW5kZXJydW5zIHZlcnkgZWFzaWx5IHVuZGVyIG11 bHRpLW1vbml0b3IgY29uZmlndXJhdGlvbnMuCldoaWxlIGl0IHdvdWxkIGJlIGxvdmVseSBpZiB0 aGlzIHdhcyBmaXhlZCwgaXQncyBub3QuIEFub3RoZXIgcHJvYmxlbQp0aGF0J3MgYmVlbiBjb21p bmcgZnJvbSB0aGlzIGhvd2V2ZXIsIGlzIHRoZSBteXN0ZXJpb3VzIGlzc3VlIG9mCnVuZGVycnVu cyBjYXVzaW5nIGZ1bGwgc3lzdGVtIGhhbmdzLiBBbiBlYXN5IHdheSB0byByZXByb2R1Y2UgdGhp cyB3aXRoCmEgc2t5bGFrZSBzeXN0ZW06CgotIEdldCBhIGxhcHRvcCB3aXRoIGEgc2t5bGFrZSBH UFUsIGFuZCBob29rIHVwIHR3byBleHRlcm5hbCBtb25pdG9ycyB0bwogIGl0Ci0gTW92ZSB0aGUg Y3Vyc29yIGZyb20gdGhlIGJ1aWx0LWluIExDRCB0byBvbmUgb2YgdGhlIGV4dGVybmFsIGRpc3Bs YXlzCiAgYXMgcXVpY2tseSBhcyB5b3UgY2FuCi0gWW91J2xsIGdldCBhIGZldyBwaXBlIHVuZGVy cnVucywgYW5kIGV2ZW50dWFsbHkgdGhlIGVudGlyZSBzeXN0ZW0gd2lsbAogIGp1c3QgZnJlZXpl LgoKQWZ0ZXIgZG9pbmcgYSBsb3Qgb2YgaW52ZXN0aWdhdGlvbiBhbmQgcmVhZGluZyB0aHJvdWdo IHRoZSBic3BlYywgSQpmb3VuZCB0aGUgZXhpc3RlbmNlIG9mIHRoZSBTQUdWLCB3aGljaCBpcyBy ZXNwb25zaWJsZSBmb3IgYWRqdXN0aW5nIHRoZQpzeXN0ZW0gYWdlbnQgdm9sdGFnZSBhbmQgY2xv Y2sgZnJlcXVlbmNpZXMgZGVwZW5kaW5nIG9uIGhvdyBtdWNoIHBvd2VyCndlIG5lZWQuIEFjY29y ZGluZyB0byB0aGUgYnNwZWM6CgoiVGhlIGRpc3BsYXkgZW5naW5lIGFjY2VzcyB0byBzeXN0ZW0g bWVtb3J5IGlzIGJsb2NrZWQgZHVyaW5nIHRoZQogYWRqdXN0bWVudCB0aW1lLiBTQUdWIGRlZmF1 bHRzIHRvIGVuYWJsZWQuIFNvZnR3YXJlIG11c3QgdXNlIHRoZQogR1QtZHJpdmVyIHBjb2RlIG1h aWxib3ggdG8gZGlzYWJsZSBTQUdWIHdoZW4gdGhlIGRpc3BsYXkgZW5naW5lIGlzIG5vdAogYWJs ZSB0byB0b2xlcmF0ZSB0aGUgYmxvY2tpbmcgdGltZS4iCgpUaGUgcmVzdCBvZiB0aGUgYnNwZWMg Z29lcyBvbiB0byBleHBsYWluIHRoYXQgc29mdHdhcmUgY2FuIHNpbXBseSBsZWF2ZQp0aGUgU0FH ViBlbmFibGVkLCBhbmQgZGlzYWJsZSBpdCB3aGVuIHdlIHVzZSBpbnRlcmxhY2VkIHBpcGVzL2hh dmUgbW9yZQp0aGVuIG9uZSBwaXBlIGFjdGl2ZS4KClN1cmUgZW5vdWdoLCB3aXRoIHRoaXMgcGF0 Y2hzZXQgdGhlIHN5c3RlbSBoYW5ncyByZXN1bHRpbmcgZnJvbSBwaXBlCnVuZGVycnVucyBvbiBT a3lsYWtlIGhhdmUgY29tcGxldGVseSB2YW5pc2hlZCBvbiBteSBUNDYwcy4gQWRkaXRpb25hbGx5 LAp0aGUgYnNwZWMgbWVudGlvbnMgdHVybmluZyBvZmYgdGhlIFNBR1YJd2l0aCBtb3JlIHRoZW4g b25lIHBpcGUgZW5hYmxlZAphcyBhIHdvcmthcm91bmQgZm9yIGRpc3BsYXkgdW5kZXJydW5zLiBX aGlsZSB0aGlzIHBhdGNoIGRvZXNuJ3QgZW50aXJlbHkKZml4IHRoYXQsIGl0IGxvb2tzIGxpa2Ug aXQgZG9lcyBpbXByb3ZlIHRoZSBzaXR1YXRpb24gYSBsaXR0bGUgYml0IHNvCml0J3MgbGlrZWx5 IHRoaXMgaXMgZ29pbmcgdG8gYmUgcmVxdWlyZWQgdG8gbWFrZSB3YXRlcm1hcmtzIG9uIFNreWxh a2UKZnVsbHkgZnVuY3Rpb25hbC4KCkNoYW5nZXMgc2luY2UgdjI6CiAtIFJlYWxseSBhcHBseSBt aW5vciBzdHlsZSBuaXRwaWNrcyB0byBwYXRjaCB0aGlzIHRpbWUKQ2hhbmdlcyBzaW5jZSB2MToK IC0gQWRkZWQgY29tbWVudHMgYWJvdXQgdGhpcyBwcm9iYWJseSBiZWluZyBvbmUgb2YgdGhlIHJl cXVpcmVtZW50cyB0bwogICBmaXhpbmcgU2t5bGFrZSdzIHdhdGVybWFyayBpc3N1ZXMKIC0gTWlu b3Igc3R5bGUgbml0cGlja3MgZnJvbSBNYXR0IFJvcGVyCiAtIERpc2FibGUgdGhlc2UgZnVuY3Rp b25zIG9uIEJyb3h0b24sIHNpbmNlIGl0IGRvZXNuJ3QgaGF2ZSBhbiBTQUdWCgpDYzogTWF0dCBS b3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmll bC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgICAyICsKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcmVnLmggfCAgIDUgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMgfCAxMTAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMyBmaWxl cyBjaGFuZ2VkLCAxMTcgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IDAzZTFiZmEuLjY2MGQwYTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTk1OSw2ICsx OTU5LDggQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCXN0cnVjdCBpOTE1X3N1c3BlbmRf c2F2ZWRfcmVnaXN0ZXJzIHJlZ2ZpbGU7CiAJc3RydWN0IHZsdl9zMGl4X3N0YXRlIHZsdl9zMGl4 X3N0YXRlOwogCisJYm9vbCBza2xfc2Fndl9lbmFibGVkOworCiAJc3RydWN0IHsKIAkJLyoKIAkJ ICogUmF3IHdhdGVybWFyayBsYXRlbmN5IHZhbHVlczoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmlu ZGV4IDhiZmRlNzUuLjliMmViMGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNzE2Miw2 ICs3MTYyLDExIEBAIGVudW0gewogI2RlZmluZSAgIEhTV19QQ09ERV9ERV9XUklURV9GUkVRX1JF UQkJMHgxNwogI2RlZmluZSAgIERJU1BMQVlfSVBTX0NPTlRST0wJCQkweDE5CiAjZGVmaW5lCSAg SFNXX1BDT0RFX0RZTkFNSUNfRFVUWV9DWUNMRV9DT05UUk9MCTB4MUEKKyNkZWZpbmUgICBHRU45 X1BDT0RFX1NBR1ZfQ09OVFJPTAkJMHgyMQorI2RlZmluZSAgICAgR0VOOV9TQUdWX0RJU0FCTEUJ CQkweDAKKyNkZWZpbmUgICAgIEdFTjlfU0FHVl9MT1dfRlJFUQkJCTB4MQorI2RlZmluZSAgICAg R0VOOV9TQUdWX0hJR0hfRlJFUQkJCTB4MgorI2RlZmluZSAgICAgR0VOOV9TQUdWX0RZTkFNSUNf RlJFUSAgICAgICAgICAgICAgMHgzCiAjZGVmaW5lIEdFTjZfUENPREVfREFUQQkJCQlfTU1JTygw eDEzODEyOCkKICNkZWZpbmUgICBHRU42X1BDT0RFX0ZSRVFfSUFfUkFUSU9fU0hJRlQJOAogI2Rl ZmluZSAgIEdFTjZfUENPREVfRlJFUV9SSU5HX1JBVElPX1NISUZUCTE2CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwppbmRleCA1YThlZTBjLi45NDg1NjRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK QEAgLTI4NzYsNiArMjg3NiwxMDkgQEAgc2tsX3dtX3BsYW5lX2lkKGNvbnN0IHN0cnVjdCBpbnRl bF9wbGFuZSAqcGxhbmUpCiB9CiAKIHN0YXRpYyB2b2lkCitza2xfc2Fndl9nZXRfaHdfc3RhdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCXUzMiB0ZW1wOworCWludCBy ZXQ7CisKKwlpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCisJCXJldHVybjsKKworCW11dGV4X2xv Y2soJmRldl9wcml2LT5ycHMuaHdfbG9jayk7CisJcmV0ID0gc2FuZHlicmlkZ2VfcGNvZGVfcmVh ZChkZXZfcHJpdiwgR0VOOV9QQ09ERV9TQUdWX0NPTlRST0wsICZ0ZW1wKTsKKwltdXRleF91bmxv Y2soJmRldl9wcml2LT5ycHMuaHdfbG9jayk7CisKKwlpZiAoIXJldCkgeworCQlkZXZfcHJpdi0+ c2tsX3NhZ3ZfZW5hYmxlZCA9ICEhKHRlbXAgJiBHRU45X1NBR1ZfRFlOQU1JQ19GUkVRKTsKKwl9 IGVsc2UgeworCQkvKgorCQkgKiBJZiBmb3Igc29tZSByZWFzb24gd2UgY2FuJ3QgYWNjZXNzIHRo ZSBTQUdWIHN0YXRlLCBmb2xsb3cKKwkJICogdGhlIGJzcGVjIGFuZCBhc3N1bWUgaXQncyBlbmFi bGVkCisJCSAqLworCQlEUk1fRVJST1IoIkZhaWxlZCB0byBnZXQgU0FHViBzdGF0ZSwgYXNzdW1p bmcgZW5hYmxlZFxuIik7CisJCWRldl9wcml2LT5za2xfc2Fndl9lbmFibGVkID0gdHJ1ZTsKKwl9 Cit9CisKKy8qCisgKiBTQUdWIGR5bmFtaWNhbGx5IGFkanVzdHMgdGhlIHN5c3RlbSBhZ2VudCB2 b2x0YWdlIGFuZCBjbG9jayBmcmVxdWVuY2llcworICogZGVwZW5kaW5nIG9uIHBvd2VyIGFuZCBw ZXJmb3JtYW5jZSByZXF1aXJlbWVudHMuIFRoZSBkaXNwbGF5IGVuZ2luZSBhY2Nlc3MKKyAqIHRv IHN5c3RlbSBtZW1vcnkgaXMgYmxvY2tlZCBkdXJpbmcgdGhlIGFkanVzdG1lbnQgdGltZS4gSGF2 aW5nIHRoaXMgZW5hYmxlZAorICogaW4gbXVsdGktcGlwZSBjb25maWd1cmF0aW9ucyBjYW4gY2F1 c2UgaXNzdWVzIChzdWNoIGFzIHVuZGVycnVucyBjYXVzaW5nCisgKiBmdWxsIHN5c3RlbSBoYW5n cyksIGFuZCB0aGUgYnNwZWMgYWxzbyBzdWdnZXN0cyB0aGF0IHNvZnR3YXJlIGRpc2FibGUgaXQK KyAqIHdoZW4gbW9yZSB0aGVuIG9uZSBwaXBlIGlzIGVuYWJsZWQuCisgKi8KK3N0YXRpYyBpbnQK K3NrbF9lbmFibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJ aW50IHJldDsKKworCWlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKKwkJcmV0dXJuIDA7CisJaWYg KGRldl9wcml2LT5za2xfc2Fndl9lbmFibGVkKQorCQlyZXR1cm4gMDsKKworCW11dGV4X2xvY2so JmRldl9wcml2LT5ycHMuaHdfbG9jayk7CisJRFJNX0RFQlVHX0tNUygiRW5hYmxpbmcgdGhlIFNB R1ZcbiIpOworCisJcmV0ID0gc2FuZHlicmlkZ2VfcGNvZGVfd3JpdGUoZGV2X3ByaXYsIEdFTjlf UENPREVfU0FHVl9DT05UUk9MLAorCQkJCSAgICAgIEdFTjlfU0FHVl9EWU5BTUlDX0ZSRVEpOwor CWlmICghcmV0KQorCQlkZXZfcHJpdi0+c2tsX3NhZ3ZfZW5hYmxlZCA9IHRydWU7CisJZWxzZQor CQlEUk1fRVJST1IoIkZhaWxlZCB0byBlbmFibGUgdGhlIFNBR1ZcbiIpOworCisJLyogV2UgZG9u J3QgbmVlZCB0byB3YWl0IGZvciBTQUdWIHdoZW4gZW5hYmxpbmcgKi8KKwltdXRleF91bmxvY2so JmRldl9wcml2LT5ycHMuaHdfbG9jayk7CisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIGludAor c2tsX2Rpc2FibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJ aW50IHJldCA9IDA7CisJdW5zaWduZWQgbG9uZyB0aW1lb3V0OworCXUzMiB0ZW1wOworCisJaWYg KElTX0JST1hUT04oZGV2X3ByaXYpKQorCQlyZXR1cm4gMDsKKwlpZiAoIWRldl9wcml2LT5za2xf c2Fndl9lbmFibGVkKQorCQlyZXR1cm4gMDsKKworCW11dGV4X2xvY2soJmRldl9wcml2LT5ycHMu aHdfbG9jayk7CisJRFJNX0RFQlVHX0tNUygiRGlzYWJsaW5nIHRoZSBTQUdWXG4iKTsKKworCS8q IGJzcGVjIHNheXMgdG8ga2VlcCByZXRyeWluZyBmb3IgYXQgbGVhc3QgMSBtcyAqLworCXRpbWVv dXQgPSBqaWZmaWVzICsgbXNlY3NfdG9famlmZmllcygxKTsKKwlkbyB7CisJCXJldCA9IHNhbmR5 YnJpZGdlX3Bjb2RlX3dyaXRlKGRldl9wcml2LCBHRU45X1BDT0RFX1NBR1ZfQ09OVFJPTCwKKwkJ CQkJICAgICAgR0VOOV9TQUdWX0RJU0FCTEUpOworCQlpZiAocmV0KSB7CisJCQlEUk1fRVJST1Io IkZhaWxlZCB0byBkaXNhYmxlIHRoZSBTQUdWXG4iKTsKKwkJCWdvdG8gb3V0OworCQl9CisKKwkJ cmV0ID0gc2FuZHlicmlkZ2VfcGNvZGVfcmVhZChkZXZfcHJpdiwgR0VOOV9QQ09ERV9TQUdWX0NP TlRST0wsCisJCQkJCSAgICAgJnRlbXApOworCQlpZiAocmV0KSB7CisJCQlEUk1fRVJST1IoIkZh aWxlZCB0byBjaGVjayB0aGUgc3RhdHVzIG9mIHRoZSBTQUdWXG4iKTsKKwkJCWdvdG8gb3V0Owor CQl9CisJfSB3aGlsZSAoISh0ZW1wICYgMHgxKSAmJiBqaWZmaWVzIDwgdGltZW91dCk7CisKKwlp ZiAodGVtcCAmIDB4MSkgeworCQlkZXZfcHJpdi0+c2tsX3NhZ3ZfZW5hYmxlZCA9IGZhbHNlOwor CX0gZWxzZSB7CisJCXJldCA9IC0xOworCQlEUk1fRVJST1IoIlJlcXVlc3QgdG8gZGlzYWJsZSBT QUdWIHRpbWVkIG91dFxuIik7CisJfQorCitvdXQ6CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ cnBzLmh3X2xvY2spOworCXJldHVybiByZXQ7Cit9CisKK3N0YXRpYyB2b2lkCiBza2xfZGRiX2dl dF9waXBlX2FsbG9jYXRpb25fbGltaXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAg Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkgICBzdHJ1Y3Qgc2ts X2RkYl9lbnRyeSAqYWxsb2MsIC8qIG91dCAqLwpAQCAtMzY4Niw2ICszNzg5LDExIEBAIHN0YXRp YyB2b2lkIHNrbF93cml0ZV93bV92YWx1ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsKIAlzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YzsKIAorCWlmIChkZXZfcHJpdi0+YWN0aXZlX2NydGNzID09IDEpCisJ CXNrbF9lbmFibGVfc2FndihkZXZfcHJpdik7CisJZWxzZQorCQlza2xfZGlzYWJsZV9zYWd2KGRl dl9wcml2KTsKKwogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7CiAJCWludCBpLCBs ZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOwogCQllbnVtIHBpcGUgcGlw ZSA9IGNydGMtPnBpcGU7CkBAIC00MjI4LDYgKzQzMzYsOCBAQCB2b2lkIHNrbF93bV9nZXRfaHdf c3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJLyogRWFzeS9jb21tb24gY2FzZTsganVz dCBzYW5pdGl6ZSBEREIgbm93IGlmIGV2ZXJ5dGhpbmcgb2ZmICovCiAJCW1lbXNldChkZGIsIDAs IHNpemVvZigqZGRiKSk7CiAJfQorCisJc2tsX3NhZ3ZfZ2V0X2h3X3N0YXRlKGRldl9wcml2KTsK IH0KIAogc3RhdGljIHZvaWQgaWxrX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK