From: James Ausmus Subject: [CI v2 1/2] drm/i915: Move SAGV block time to dev_priv Date: Fri, 27 Sep 2019 15:52:28 -0700 Message-ID: <20190927225229.7394-1-james.ausmus@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDB356E2C0 for ; Fri, 27 Sep 2019 22:51:52 +0000 (UTC) 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: Lucas De Marchi List-Id: intel-gfx@lists.freedesktop.org SW4gcHJlcCBmb3IgbmV3ZXIgcGxhdGZvcm1zIGhhdmluZyBtb3JlIGNvbXBsaWNhdGVkIHdheXMg dG8gZGV0ZXJtaW5lCnRoZSBTQUdWIGJsb2NrIHRpbWUsIG1vdmUgdGhlIHZhcmlhYmxlIHRvIGRl dl9wcml2LCBhbmQgZXh0cmFjdCB0aGUKc2V0dGluZyB0byBhbiBpbml0aWFsIHNldHVwIGZ1bmN0 aW9uLiBXaGlsZSB3ZSdyZSBhdCBpdCwgdXBkYXRlIHRoZSBpZgpsYWRkZXIgdG8gZm9sbG93IHRo ZSBuZXcgZ2VuIC0+IG9sZCBnZW4gb3JkZXIgcHJlZmVyZW5jZSwgYW5kIHdhcm4gb24KYW55IG5v bi1zcGVjaWZpZWQgZ2VuLgoKdjI6IFNob3J0ZW4gdGhlIGZ1bmN0aW9uIG5hbWUgKFZpbGxlKSwg cmV0dXJuIGRpcmVjdGx5IChWaWxsZSksIG1vdmUKc2Fndl9ibG9ja190aW1lX3VzIHZhbHVlIHRv IGRldl9wcml2IChWaWxsZSkKCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgpDYzogU3RhbmlzbGF2IExpc292c2tpeSA8c3RhbmlzbGF2Lmxpc292c2tp eUBpbnRlbC5jb20+CkNjOiBMdWNhcyBEZSBNYXJjaGkgPGx1Y2FzLmRlbWFyY2hpQGludGVsLmNv bT4KU2lnbmVkLW9mZi1ieTogSmFtZXMgQXVzbXVzIDxqYW1lcy5hdXNtdXNAaW50ZWwuY29tPgot LS0KClJlc2VuZGluZyBmb3IgQ0ksIGFzIEkgZXZpZGVudGx5IGNvbmZ1c2VkIFBhdGNod29yay4u LgoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMiArKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDMzICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDMzN2Q4MzA2NDE2YS4uODdhODM1YTAyMTBiIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE1NzksNiArMTU3OSw4IEBAIHN0cnVjdCBkcm1faTkx NV9wcml2YXRlIHsKIAkJSTkxNV9TQUdWX05PVF9DT05UUk9MTEVECiAJfSBzYWd2X3N0YXR1czsK IAorCWludCBzYWd2X2Jsb2NrX3RpbWVfdXM7CisKIAlzdHJ1Y3QgewogCQkvKgogCQkgKiBSYXcg d2F0ZXJtYXJrIGxhdGVuY3kgdmFsdWVzOgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggYmZj ZjAzYWI1MjQ1Li5iNDEzYTdmM2JjNWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzY0 Miw2ICszNjQyLDI2IEBAIGludGVsX2hhc19zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAkJZGV2X3ByaXYtPnNhZ3Zfc3RhdHVzICE9IEk5MTVfU0FHVl9OT1RfQ09OVFJP TExFRDsKIH0KIAorc3RhdGljIHZvaWQKK3NrbF9zZXR1cF9zYWd2X2Jsb2NrX3RpbWUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWlmIChJU19HRU4oZGV2X3ByaXYsIDEx KSkgeworCQlkZXZfcHJpdi0+c2Fndl9ibG9ja190aW1lX3VzID0gMTA7CisJCXJldHVybjsKKwl9 IGVsc2UgaWYgKElTX0dFTihkZXZfcHJpdiwgMTApKSB7CisJCWRldl9wcml2LT5zYWd2X2Jsb2Nr X3RpbWVfdXMgPSAyMDsKKwkJcmV0dXJuOworCX0gZWxzZSBpZiAoSVNfR0VOKGRldl9wcml2LCA5 KSkgeworCQlkZXZfcHJpdi0+c2Fndl9ibG9ja190aW1lX3VzID0gMzA7CisJCXJldHVybjsKKwl9 IGVsc2UgeworCQlNSVNTSU5HX0NBU0UoSU5URUxfR0VOKGRldl9wcml2KSk7CisJfQorCisJLyog RGVmYXVsdCB0byBhbiB1bnVzYWJsZSBibG9jayB0aW1lICovCisJZGV2X3ByaXYtPnNhZ3ZfYmxv Y2tfdGltZV91cyA9IDEwMDA7Cit9CisKIC8qCiAgKiBTQUdWIGR5bmFtaWNhbGx5IGFkanVzdHMg dGhlIHN5c3RlbSBhZ2VudCB2b2x0YWdlIGFuZCBjbG9jayBmcmVxdWVuY2llcwogICogZGVwZW5k aW5nIG9uIHBvd2VyIGFuZCBwZXJmb3JtYW5jZSByZXF1aXJlbWVudHMuIFRoZSBkaXNwbGF5IGVu Z2luZSBhY2Nlc3MKQEAgLTM3MzAsMTggKzM3NTAsMTAgQEAgYm9vbCBpbnRlbF9jYW5fZW5hYmxl X3NhZ3Yoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJZW51bSBwaXBlIHBpcGU7CiAJaW50IGxldmVsLCBsYXRl bmN5OwotCWludCBzYWd2X2Jsb2NrX3RpbWVfdXM7CiAKIAlpZiAoIWludGVsX2hhc19zYWd2KGRl dl9wcml2KSkKIAkJcmV0dXJuIGZhbHNlOwogCi0JaWYgKElTX0dFTihkZXZfcHJpdiwgOSkpCi0J CXNhZ3ZfYmxvY2tfdGltZV91cyA9IDMwOwotCWVsc2UgaWYgKElTX0dFTihkZXZfcHJpdiwgMTAp KQotCQlzYWd2X2Jsb2NrX3RpbWVfdXMgPSAyMDsKLQllbHNlCi0JCXNhZ3ZfYmxvY2tfdGltZV91 cyA9IDEwOwotCiAJLyoKIAkgKiBJZiB0aGVyZSBhcmUgbm8gYWN0aXZlIENSVENzLCBubyBhZGRp dGlvbmFsIGNoZWNrcyBuZWVkIGJlIHBlcmZvcm1lZAogCSAqLwpAQCAtMzc4OCw3ICszODAwLDcg QEAgYm9vbCBpbnRlbF9jYW5fZW5hYmxlX3NhZ3Yoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAq c3RhdGUpCiAJCSAqIGluY3VyIG1lbW9yeSBsYXRlbmNpZXMgaGlnaGVyIHRoYW4gc2Fndl9ibG9j a190aW1lX3VzIHdlCiAJCSAqIGNhbid0IGVuYWJsZSBTQUdWLgogCQkgKi8KLQkJaWYgKGxhdGVu Y3kgPCBzYWd2X2Jsb2NrX3RpbWVfdXMpCisJCWlmIChsYXRlbmN5IDwgZGV2X3ByaXYtPnNhZ3Zf YmxvY2tfdGltZV91cykKIAkJCXJldHVybiBmYWxzZTsKIAl9CiAKQEAgLTkwMTMsNiArOTAyNSw5 IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJZWxzZSBpZiAoSVNfR0VOKGRldl9wcml2LCA1KSkKIAkJaTkxNV9pcm9ubGFrZV9nZXRfbWVt X2ZyZXEoZGV2X3ByaXYpOwogCisJaWYgKElTX0dFTjlfQkMoZGV2X3ByaXYpIHx8IElOVEVMX0dF TihkZXZfcHJpdikgPj0gMTApCisJCXNrbF9zZXR1cF9zYWd2X2Jsb2NrX3RpbWUoZGV2X3ByaXYp OworCiAJLyogRm9yIEZJRk8gd2F0ZXJtYXJrIHVwZGF0ZXMgKi8KIAlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA+PSA5KSB7CiAJCXNrbF9zZXR1cF93bV9sYXRlbmN5KGRldl9wcml2KTsKLS0gCjIu MjIuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4