From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 1/2] drm/i915: Merge duplicate gen4 and vlv/chv enable vblank callbacks Date: Fri, 7 Oct 2016 20:49:52 +0100 Message-ID: <20161007194953.15616-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 mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 954966EC49 for ; Fri, 7 Oct 2016 19:49:59 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id b201so4400221wmb.1 for ; Fri, 07 Oct 2016 12:49:59 -0700 (PDT) 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 Z2VuNC92bHYvY2h2IGFsbCB1c2UgdGhlIHNhbWUgYml0cyBpbiBwaXBlc3RhdCB0byBlbmFibGUg dGhlIHZibGFuawppbnRlcnJ1cHQsIHNvIHRoZXkgY2FuIHNoYXJlIHRoZSBzYW1lIGNhbGxiYWNr cyB0byBlbmFibGUvZGlzYWJsZS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIHwgNTkg KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyOCBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEu YwppbmRleCBiZDZjOGIwZWVhZWYuLjFlNDNmZTMwZGExMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jCkBAIC0yNzE4LDQ1ICsyNzE4LDQwIEBAIHZvaWQgaTkxNV9oYW5kbGVfZXJyb3Ioc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogLyogQ2FsbGVkIGZyb20gZHJtIGdlbmVyaWMg Y29kZSwgcGFzc2VkICdjcnRjJyB3aGljaAogICogd2UgdXNlIGFzIGEgcGlwZSBpbmRleAogICov Ci1zdGF0aWMgaW50IGk5MTVfZW5hYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1 bnNpZ25lZCBpbnQgcGlwZSkKK3N0YXRpYyBpbnQgaTh4eF9lbmFibGVfdmJsYW5rKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKQogewogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdz OwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwot CWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KQotCQlpOTE1X2VuYWJsZV9waXBlc3RhdChk ZXZfcHJpdiwgcGlwZSwKLQkJCQkgICAgIFBJUEVfU1RBUlRfVkJMQU5LX0lOVEVSUlVQVF9TVEFU VVMpOwotCWVsc2UKLQkJaTkxNV9lbmFibGVfcGlwZXN0YXQoZGV2X3ByaXYsIHBpcGUsCi0JCQkJ ICAgICBQSVBFX1ZCTEFOS19JTlRFUlJVUFRfU1RBVFVTKTsKKwlpOTE1X2VuYWJsZV9waXBlc3Rh dChkZXZfcHJpdiwgcGlwZSwgUElQRV9WQkxBTktfSU5URVJSVVBUX1NUQVRVUyk7CiAJc3Bpbl91 bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPmlycV9sb2NrLCBpcnFmbGFncyk7CiAKIAlyZXR1 cm4gMDsKIH0KIAotc3RhdGljIGludCBpcm9ubGFrZV9lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKQorc3RhdGljIGludCBpOTY1X2VuYWJsZV92 Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUpCiB7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXVuc2lnbmVk IGxvbmcgaXJxZmxhZ3M7Ci0JdWludDMyX3QgYml0ID0gKElOVEVMX0lORk8oZGV2KS0+Z2VuID49 IDcpID8gREVfUElQRV9WQkxBTktfSVZCKHBpcGUpIDoKLQkJCQkJCSAgICAgREVfUElQRV9WQkxB TksocGlwZSk7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPmlycV9sb2NrLCBpcnFm bGFncyk7Ci0JaWxrX2VuYWJsZV9kaXNwbGF5X2lycShkZXZfcHJpdiwgYml0KTsKKwlpOTE1X2Vu YWJsZV9waXBlc3RhdChkZXZfcHJpdiwgcGlwZSwKKwkJCSAgICAgUElQRV9TVEFSVF9WQkxBTktf SU5URVJSVVBUX1NUQVRVUyk7CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2X3ByaXYtPmly cV9sb2NrLCBpcnFmbGFncyk7CiAKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCB2YWxsZXl2 aWV3X2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBp cGUpCitzdGF0aWMgaW50IGlyb25sYWtlX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdW5zaWduZWQgaW50IHBpcGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CisJdWludDMy X3QgYml0ID0gSU5URUxfR0VOKGRldikgPj0gNyA/CisJCURFX1BJUEVfVkJMQU5LX0lWQihwaXBl KSA6IERFX1BJUEVfVkJMQU5LKHBpcGUpOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2 LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwotCWk5MTVfZW5hYmxlX3BpcGVzdGF0KGRldl9wcml2LCBw aXBlLAotCQkJICAgICBQSVBFX1NUQVJUX1ZCTEFOS19JTlRFUlJVUFRfU1RBVFVTKTsKKwlpbGtf ZW5hYmxlX2Rpc3BsYXlfaXJxKGRldl9wcml2LCBiaXQpOwogCXNwaW5fdW5sb2NrX2lycXJlc3Rv cmUoJmRldl9wcml2LT5pcnFfbG9jaywgaXJxZmxhZ3MpOwogCiAJcmV0dXJuIDA7CkBAIC0yNzc3 LDM4ICsyNzcyLDM2IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKQogLyogQ2FsbGVkIGZyb20gZHJtIGdlbmVy aWMgY29kZSwgcGFzc2VkICdjcnRjJyB3aGljaAogICogd2UgdXNlIGFzIGEgcGlwZSBpbmRleAog ICovCi1zdGF0aWMgdm9pZCBpOTE1X2Rpc2FibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHVuc2lnbmVkIGludCBwaXBlKQorc3RhdGljIHZvaWQgaTh4eF9kaXNhYmxlX3ZibGFuayhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJdW5zaWduZWQgbG9uZyBp cnFmbGFnczsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZs YWdzKTsKLQlpOTE1X2Rpc2FibGVfcGlwZXN0YXQoZGV2X3ByaXYsIHBpcGUsCi0JCQkgICAgICBQ SVBFX1ZCTEFOS19JTlRFUlJVUFRfU1RBVFVTIHwKLQkJCSAgICAgIFBJUEVfU1RBUlRfVkJMQU5L X0lOVEVSUlVQVF9TVEFUVVMpOworCWk5MTVfZGlzYWJsZV9waXBlc3RhdChkZXZfcHJpdiwgcGlw ZSwgUElQRV9WQkxBTktfSU5URVJSVVBUX1NUQVRVUyk7CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9y ZSgmZGV2X3ByaXYtPmlycV9sb2NrLCBpcnFmbGFncyk7CiB9CiAKLXN0YXRpYyB2b2lkIGlyb25s YWtlX2Rpc2FibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBw aXBlKQorc3RhdGljIHZvaWQgaTk2NV9kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGRldik7CiAJdW5zaWduZWQgbG9uZyBpcnFmbGFnczsKLQl1aW50MzJf dCBiaXQgPSAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNykgPyBERV9QSVBFX1ZCTEFOS19JVkIo cGlwZSkgOgotCQkJCQkJICAgICBERV9QSVBFX1ZCTEFOSyhwaXBlKTsKIAogCXNwaW5fbG9ja19p cnFzYXZlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKLQlpbGtfZGlzYWJsZV9kaXNw bGF5X2lycShkZXZfcHJpdiwgYml0KTsKKwlpOTE1X2Rpc2FibGVfcGlwZXN0YXQoZGV2X3ByaXYs IHBpcGUsCisJCQkgICAgICBQSVBFX1NUQVJUX1ZCTEFOS19JTlRFUlJVUFRfU1RBVFVTKTsKIAlz cGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKIH0K IAotc3RhdGljIHZvaWQgdmFsbGV5dmlld19kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKK3N0YXRpYyB2b2lkIGlyb25sYWtlX2Rpc2FibGVf dmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlKQogewogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAl1bnNpZ25l ZCBsb25nIGlycWZsYWdzOworCXVpbnQzMl90IGJpdCA9IElOVEVMX0dFTihkZXYpID49IDcgPwor CQlERV9QSVBFX1ZCTEFOS19JVkIocGlwZSkgOiBERV9QSVBFX1ZCTEFOSyhwaXBlKTsKIAogCXNw aW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZsYWdzKTsKLQlpOTE1X2Rp c2FibGVfcGlwZXN0YXQoZGV2X3ByaXYsIHBpcGUsCi0JCQkgICAgICBQSVBFX1NUQVJUX1ZCTEFO S19JTlRFUlJVUFRfU1RBVFVTKTsKKwlpbGtfZGlzYWJsZV9kaXNwbGF5X2lycShkZXZfcHJpdiwg Yml0KTsKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXZfcHJpdi0+aXJxX2xvY2ssIGlycWZs YWdzKTsKIH0KIApAQCAtNDU3OSwxNiArNDU3MiwxNiBAQCB2b2lkIGludGVsX2lycV9pbml0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZGV2LT5kcml2ZXItPmlycV9wcmVp bnN0YWxsID0gY2hlcnJ5dmlld19pcnFfcHJlaW5zdGFsbDsKIAkJZGV2LT5kcml2ZXItPmlycV9w b3N0aW5zdGFsbCA9IGNoZXJyeXZpZXdfaXJxX3Bvc3RpbnN0YWxsOwogCQlkZXYtPmRyaXZlci0+ aXJxX3VuaW5zdGFsbCA9IGNoZXJyeXZpZXdfaXJxX3VuaW5zdGFsbDsKLQkJZGV2LT5kcml2ZXIt PmVuYWJsZV92YmxhbmsgPSB2YWxsZXl2aWV3X2VuYWJsZV92Ymxhbms7Ci0JCWRldi0+ZHJpdmVy LT5kaXNhYmxlX3ZibGFuayA9IHZhbGxleXZpZXdfZGlzYWJsZV92Ymxhbms7CisJCWRldi0+ZHJp dmVyLT5lbmFibGVfdmJsYW5rID0gaTk2NV9lbmFibGVfdmJsYW5rOworCQlkZXYtPmRyaXZlci0+ ZGlzYWJsZV92YmxhbmsgPSBpOTY1X2Rpc2FibGVfdmJsYW5rOwogCQlkZXZfcHJpdi0+ZGlzcGxh eS5ocGRfaXJxX3NldHVwID0gaTkxNV9ocGRfaXJxX3NldHVwOwogCX0gZWxzZSBpZiAoSVNfVkFM TEVZVklFVyhkZXZfcHJpdikpIHsKIAkJZGV2LT5kcml2ZXItPmlycV9oYW5kbGVyID0gdmFsbGV5 dmlld19pcnFfaGFuZGxlcjsKIAkJZGV2LT5kcml2ZXItPmlycV9wcmVpbnN0YWxsID0gdmFsbGV5 dmlld19pcnFfcHJlaW5zdGFsbDsKIAkJZGV2LT5kcml2ZXItPmlycV9wb3N0aW5zdGFsbCA9IHZh bGxleXZpZXdfaXJxX3Bvc3RpbnN0YWxsOwogCQlkZXYtPmRyaXZlci0+aXJxX3VuaW5zdGFsbCA9 IHZhbGxleXZpZXdfaXJxX3VuaW5zdGFsbDsKLQkJZGV2LT5kcml2ZXItPmVuYWJsZV92Ymxhbmsg PSB2YWxsZXl2aWV3X2VuYWJsZV92Ymxhbms7Ci0JCWRldi0+ZHJpdmVyLT5kaXNhYmxlX3ZibGFu ayA9IHZhbGxleXZpZXdfZGlzYWJsZV92Ymxhbms7CisJCWRldi0+ZHJpdmVyLT5lbmFibGVfdmJs YW5rID0gaTk2NV9lbmFibGVfdmJsYW5rOworCQlkZXYtPmRyaXZlci0+ZGlzYWJsZV92Ymxhbmsg PSBpOTY1X2Rpc2FibGVfdmJsYW5rOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5ocGRfaXJxX3NldHVw ID0gaTkxNV9ocGRfaXJxX3NldHVwOwogCX0gZWxzZSBpZiAoSU5URUxfSU5GTyhkZXZfcHJpdikt PmdlbiA+PSA4KSB7CiAJCWRldi0+ZHJpdmVyLT5pcnFfaGFuZGxlciA9IGdlbjhfaXJxX2hhbmRs ZXI7CkBAIC00NjE3LDIxICs0NjEwLDI1IEBAIHZvaWQgaW50ZWxfaXJxX2luaXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkJZGV2LT5kcml2ZXItPmlycV9wb3N0aW5zdGFs bCA9IGk4eHhfaXJxX3Bvc3RpbnN0YWxsOwogCQkJZGV2LT5kcml2ZXItPmlycV9oYW5kbGVyID0g aTh4eF9pcnFfaGFuZGxlcjsKIAkJCWRldi0+ZHJpdmVyLT5pcnFfdW5pbnN0YWxsID0gaTh4eF9p cnFfdW5pbnN0YWxsOworCQkJZGV2LT5kcml2ZXItPmVuYWJsZV92YmxhbmsgPSBpOHh4X2VuYWJs ZV92Ymxhbms7CisJCQlkZXYtPmRyaXZlci0+ZGlzYWJsZV92YmxhbmsgPSBpOHh4X2Rpc2FibGVf dmJsYW5rOwogCQl9IGVsc2UgaWYgKElTX0dFTjMoZGV2X3ByaXYpKSB7CiAJCQlkZXYtPmRyaXZl ci0+aXJxX3ByZWluc3RhbGwgPSBpOTE1X2lycV9wcmVpbnN0YWxsOwogCQkJZGV2LT5kcml2ZXIt PmlycV9wb3N0aW5zdGFsbCA9IGk5MTVfaXJxX3Bvc3RpbnN0YWxsOwogCQkJZGV2LT5kcml2ZXIt PmlycV91bmluc3RhbGwgPSBpOTE1X2lycV91bmluc3RhbGw7CiAJCQlkZXYtPmRyaXZlci0+aXJx X2hhbmRsZXIgPSBpOTE1X2lycV9oYW5kbGVyOworCQkJZGV2LT5kcml2ZXItPmVuYWJsZV92Ymxh bmsgPSBpOHh4X2VuYWJsZV92Ymxhbms7CisJCQlkZXYtPmRyaXZlci0+ZGlzYWJsZV92Ymxhbmsg PSBpOHh4X2Rpc2FibGVfdmJsYW5rOwogCQl9IGVsc2UgewogCQkJZGV2LT5kcml2ZXItPmlycV9w cmVpbnN0YWxsID0gaTk2NV9pcnFfcHJlaW5zdGFsbDsKIAkJCWRldi0+ZHJpdmVyLT5pcnFfcG9z dGluc3RhbGwgPSBpOTY1X2lycV9wb3N0aW5zdGFsbDsKIAkJCWRldi0+ZHJpdmVyLT5pcnFfdW5p bnN0YWxsID0gaTk2NV9pcnFfdW5pbnN0YWxsOwogCQkJZGV2LT5kcml2ZXItPmlycV9oYW5kbGVy ID0gaTk2NV9pcnFfaGFuZGxlcjsKKwkJCWRldi0+ZHJpdmVyLT5lbmFibGVfdmJsYW5rID0gaTk2 NV9lbmFibGVfdmJsYW5rOworCQkJZGV2LT5kcml2ZXItPmRpc2FibGVfdmJsYW5rID0gaTk2NV9k aXNhYmxlX3ZibGFuazsKIAkJfQogCQlpZiAoSTkxNV9IQVNfSE9UUExVRyhkZXZfcHJpdikpCiAJ CQlkZXZfcHJpdi0+ZGlzcGxheS5ocGRfaXJxX3NldHVwID0gaTkxNV9ocGRfaXJxX3NldHVwOwot CQlkZXYtPmRyaXZlci0+ZW5hYmxlX3ZibGFuayA9IGk5MTVfZW5hYmxlX3ZibGFuazsKLQkJZGV2 LT5kcml2ZXItPmRpc2FibGVfdmJsYW5rID0gaTkxNV9kaXNhYmxlX3ZibGFuazsKIAl9CiB9CiAK LS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK