From: Lyude Subject: [PATCH v2] drm/i915/skl: Add support for the SAGV, fix underrun hangs Date: Tue, 12 Jul 2016 13:31:47 -0400 Message-ID: <1468344707-5349-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: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , Daniel Vetter , Lyude 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 a2UKZnVsbHkgZnVuY3Rpb25hbC4KCkNoYW5nZXMgc2luY2UgdjE6CiAtIEFkZGVkIGNvbW1lbnRz IGFib3V0IHRoaXMgcHJvYmFibHkgYmVpbmcgb25lIG9mIHRoZSByZXF1aXJlbWVudHMgdG8KICAg Zml4aW5nIFNreWxha2UncyB3YXRlcm1hcmsgaXNzdWVzCiAtIE1pbm9yIHN0eWxlIG5pdHBpY2tz IGZyb20gTWF0dCBSb3BlcgogLSBEaXNhYmxlIHRoZXNlIGZ1bmN0aW9ucyBvbiBCcm94dG9uLCBz aW5jZSBpdCBkb2Vzbid0IGhhdmUgYW4gU0FHVgoKQ2M6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5y b3BlckBpbnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNo PgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCB8ICAgMiArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5o IHwgICA1ICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMTEwICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgMTE3IGlu c2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAwM2UxYmZhLi42NjBkMGE2 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE5NTksNiArMTk1OSw4IEBAIHN0cnVjdCBk cm1faTkxNV9wcml2YXRlIHsKIAlzdHJ1Y3QgaTkxNV9zdXNwZW5kX3NhdmVkX3JlZ2lzdGVycyBy ZWdmaWxlOwogCXN0cnVjdCB2bHZfczBpeF9zdGF0ZSB2bHZfczBpeF9zdGF0ZTsKIAorCWJvb2wg c2tsX3NhZ3ZfZW5hYmxlZDsKKwogCXN0cnVjdCB7CiAJCS8qCiAJCSAqIFJhdyB3YXRlcm1hcmsg bGF0ZW5jeSB2YWx1ZXM6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl Zy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCA4YmZkZTc1Li45YjJl YjBiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTcxNjIsNiArNzE2MiwxMSBAQCBlbnVt IHsKICNkZWZpbmUgICBIU1dfUENPREVfREVfV1JJVEVfRlJFUV9SRVEJCTB4MTcKICNkZWZpbmUg ICBESVNQTEFZX0lQU19DT05UUk9MCQkJMHgxOQogI2RlZmluZQkgIEhTV19QQ09ERV9EWU5BTUlD X0RVVFlfQ1lDTEVfQ09OVFJPTAkweDFBCisjZGVmaW5lICAgR0VOOV9QQ09ERV9TQUdWX0NPTlRS T0wJCTB4MjEKKyNkZWZpbmUgICAgIEdFTjlfU0FHVl9ESVNBQkxFCQkJMHgwCisjZGVmaW5lICAg ICBHRU45X1NBR1ZfTE9XX0ZSRVEJCQkweDEKKyNkZWZpbmUgICAgIEdFTjlfU0FHVl9ISUdIX0ZS RVEJCQkweDIKKyNkZWZpbmUgICAgIEdFTjlfU0FHVl9EWU5BTUlDX0ZSRVEgICAgICAgICAgICAg IDB4MwogI2RlZmluZSBHRU42X1BDT0RFX0RBVEEJCQkJX01NSU8oMHgxMzgxMjgpCiAjZGVmaW5l ICAgR0VONl9QQ09ERV9GUkVRX0lBX1JBVElPX1NISUZUCTgKICNkZWZpbmUgICBHRU42X1BDT0RF X0ZSRVFfUklOR19SQVRJT19TSElGVAkxNgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggNWE4 ZWUwYy4uNTM5YTgyYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yODc2LDYgKzI4NzYs MTA5IEBAIHNrbF93bV9wbGFuZV9pZChjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKQog fQogCiBzdGF0aWMgdm9pZAorc2tsX3NhZ3ZfZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKK3sKKwl1MzIgdGVtcDsKKwlpbnQgcmV0OworCisJaWYgKElTX0JS T1hUT04oZGV2X3ByaXYpKQorCQlyZXR1cm47CisKKwltdXRleF9sb2NrKCZkZXZfcHJpdi0+cnBz Lmh3X2xvY2spOworCXJldCA9IHNhbmR5YnJpZGdlX3Bjb2RlX3JlYWQoZGV2X3ByaXYsIEdFTjlf UENPREVfU0FHVl9DT05UUk9MLCAmdGVtcCk7CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBz Lmh3X2xvY2spOworCisJaWYgKCFyZXQpIHsKKwkJZGV2X3ByaXYtPnNrbF9zYWd2X2VuYWJsZWQg PSAhISh0ZW1wICYgR0VOOV9TQUdWX0RZTkFNSUNfRlJFUSk7CisJfSBlbHNlIHsKKwkJLyoKKwkJ ICogSWYgZm9yIHNvbWUgcmVhc29uIHdlIGNhbid0IGFjY2VzcyB0aGUgU0FHViBzdGF0ZSwgZm9s bG93CisJCSAqIHRoZSBic3BlYyBhbmQgYXNzdW1lIGl0J3MgZW5hYmxlZAorCQkgKi8KKwkJRFJN X0VSUk9SKCJGYWlsZWQgdG8gZ2V0IFNBR1Ygc3RhdGUsIGFzc3VtaW5nIGVuYWJsZWRcbiIpOwor CQlkZXZfcHJpdi0+c2tsX3NhZ3ZfZW5hYmxlZCA9IHRydWU7CisJfQorfQorCisvKgorICogU0FH ViBkeW5hbWljYWxseSBhZGp1c3RzIHRoZSBzeXN0ZW0gYWdlbnQgdm9sdGFnZSBhbmQgY2xvY2sg ZnJlcXVlbmNpZXMKKyAqIGRlcGVuZGluZyBvbiBwb3dlciBhbmQgcGVyZm9ybWFuY2UgcmVxdWly ZW1lbnRzLiBUaGUgZGlzcGxheSBlbmdpbmUgYWNjZXNzCisgKiB0byBzeXN0ZW0gbWVtb3J5IGlz IGJsb2NrZWQgZHVyaW5nIHRoZSBhZGp1c3RtZW50IHRpbWUuIEhhdmluZyB0aGlzIGVuYWJsZWQK KyAqIGluIG11bHRpLXBpcGUgY29uZmlndXJhdGlvbnMgY2FuIGNhdXNlIGlzc3VlcyAoc3VjaCBh cyB1bmRlcnJ1bnMgY2F1c2luZworICogZnVsbCBzeXN0ZW0gaGFuZ3MpLCBhbmQgdGhlIGJzcGVj IGFsc28gc3VnZ2VzdHMgdGhhdCBzb2Z0d2FyZSBkaXNhYmxlIGl0CisgKiB3aGVuIG1vcmUgdGhl biBvbmUgcGlwZSBpcyBlbmFibGVkLgorICovCitzdGF0aWMgaW50Citza2xfZW5hYmxlX3NhZ3Yo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWludCByZXQ7CisKKwlpZiAo SVNfQlJPWFRPTihkZXZfcHJpdikpCisJCXJldHVybiAwOworCWlmIChkZXZfcHJpdi0+c2tsX3Nh Z3ZfZW5hYmxlZCkKKwkJcmV0dXJuIDA7CisKKwltdXRleF9sb2NrKCZkZXZfcHJpdi0+cnBzLmh3 X2xvY2spOworCURSTV9ERUJVR19LTVMoIkVuYWJsaW5nIHRoZSBTQUdWXG4iKTsKKworCXJldCA9 IHNhbmR5YnJpZGdlX3Bjb2RlX3dyaXRlKGRldl9wcml2LCBHRU45X1BDT0RFX1NBR1ZfQ09OVFJP TCwKKwkJCQkgICAgICBHRU45X1NBR1ZfRFlOQU1JQ19GUkVRKTsKKwlpZiAoIXJldCkKKwkJZGV2 X3ByaXYtPnNrbF9zYWd2X2VuYWJsZWQgPSB0cnVlOworCWVsc2UKKwkJRFJNX0VSUk9SKCJGYWls ZWQgdG8gZW5hYmxlIHRoZSBTQUdWXG4iKTsKKworCS8qIFdlIGRvbid0IG5lZWQgdG8gd2FpdCBm b3IgU0FHViB3aGVuIGVuYWJsaW5nICovCisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBzLmh3 X2xvY2spOworCXJldHVybiByZXQ7Cit9CisKK3N0YXRpYyBpbnQKK3NrbF9kaXNhYmxlX3NhZ3Yo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWludCByZXQgPSAwOworCXVu c2lnbmVkIGxvbmcgdGltZW91dDsKKwl1MzIgdGVtcDsKKworCWlmIChJU19CUk9YVE9OKGRldl9w cml2KSkKKwkJcmV0dXJuIDA7CisJaWYgKCFkZXZfcHJpdi0+c2tsX3NhZ3ZfZW5hYmxlZCkKKwkJ cmV0dXJuIDA7CisKKwltdXRleF9sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOworCURSTV9E RUJVR19LTVMoIkRpc2FibGluZyB0aGUgU0FHVlxuIik7CisKKwkvKiBic3BlYyBzYXlzIHRvIGtl ZXAgcmV0cnlpbmcgZm9yIGF0IGxlYXN0IDEgbXMgKi8KKwl0aW1lb3V0ID0gamlmZmllcyArIG1z ZWNzX3RvX2ppZmZpZXMoMSk7CisJZG8geworCQlyZXQgPSBzYW5keWJyaWRnZV9wY29kZV93cml0 ZShkZXZfcHJpdiwgR0VOOV9QQ09ERV9TQUdWX0NPTlRST0wsCisJCQkJCSAgICAgIEdFTjlfU0FH Vl9ESVNBQkxFKTsKKwkJaWYgKHJldCkgeworCQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gZGlzYWJs ZSB0aGUgU0FHVlxuIik7CisJCQlnb3RvIG91dDsKKwkJfQorCisJCXJldCA9IHNhbmR5YnJpZGdl X3Bjb2RlX3JlYWQoZGV2X3ByaXYsIEdFTjlfUENPREVfU0FHVl9DT05UUk9MLAorCQkJCQkgICAg ICZ0ZW1wKTsKKwkJaWYgKHJldCkgeworCQkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gY2hlY2sgdGhl IHN0YXR1cyBvZiB0aGUgU0FHVlxuIik7CisJCQlnb3RvIG91dDsKKwkJfQorCX0gd2hpbGUgKCEo dGVtcCAmIDB4MSkgJiYgamlmZmllcyA8IHRpbWVvdXQpOworCisJaWYgKHRlbXAgJiAweDEpCisJ CWRldl9wcml2LT5za2xfc2Fndl9lbmFibGVkID0gZmFsc2U7CisJZWxzZSB7CisJCXJldCA9IC0x OworCQlEUk1fRVJST1IoIlJlcXVlc3QgdG8gZGlzYWJsZSBTQUdWIHRpbWVkIG91dFxuIik7CisJ fQorCitvdXQ6CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOworCXJldHVy biByZXQ7Cit9CisKK3N0YXRpYyB2b2lkCiBza2xfZGRiX2dldF9waXBlX2FsbG9jYXRpb25fbGlt aXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSwKIAkJCQkgICBzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqYWxsb2MsIC8q IG91dCAqLwpAQCAtMzY4Niw2ICszNzg5LDExIEBAIHN0YXRpYyB2b2lkIHNrbF93cml0ZV93bV92 YWx1ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKIAor CWlmIChkZXZfcHJpdi0+YWN0aXZlX2NydGNzID09IDEpCisJCXNrbF9lbmFibGVfc2FndihkZXZf cHJpdik7CisJZWxzZQorCQlza2xfZGlzYWJsZV9zYWd2KGRldl9wcml2KTsKKwogCWZvcl9lYWNo X2ludGVsX2NydGMoZGV2LCBjcnRjKSB7CiAJCWludCBpLCBsZXZlbCwgbWF4X2xldmVsID0gaWxr X3dtX21heF9sZXZlbChkZXYpOwogCQllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CkBAIC00 MjI4LDYgKzQzMzYsOCBAQCB2b2lkIHNrbF93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAkJLyogRWFzeS9jb21tb24gY2FzZTsganVzdCBzYW5pdGl6ZSBEREIgbm93IGlm IGV2ZXJ5dGhpbmcgb2ZmICovCiAJCW1lbXNldChkZGIsIDAsIHNpemVvZigqZGRiKSk7CiAJfQor CisJc2tsX3NhZ3ZfZ2V0X2h3X3N0YXRlKGRldl9wcml2KTsKIH0KIAogc3RhdGljIHZvaWQgaWxr X3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLS0gCjIuNy40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK