From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 04/14] drm/i915/pmu: Decouple uAPI engine ids Date: Tue, 18 Jul 2017 15:36:08 +0100 Message-ID: <20170718143618.12254-5-tvrtko.ursulin@linux.intel.com> References: <20170718143618.12254-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE0406E35E for ; Tue, 18 Jul 2017 14:36:40 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id y43so3946151wrd.0 for ; Tue, 18 Jul 2017 07:36:40 -0700 (PDT) In-Reply-To: <20170718143618.12254-1-tvrtko.ursulin@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 Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFzIGVsc2V3 aGVyZSBpbiB0aGUgY29kZSB3ZSBoYXZlIHRvIGRlY291cGxlIHRoZSBiaW5hcnkKZW5naW5lIGlk ZW50aWZpZXJzIGZvciBlYXNpZXIgbWFpbnRlbmFuY2UuCgpBbHNvIHRoZSBzYW1wbGVyIG1hc2sg d2FzIGluY29ycmVjdCBpbiB0aGUgdGltZXIgY2FsbGJhY2suCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0 a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfcG11LmMgfCA0NCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcG11LmMKaW5kZXggZjAzZGRhZDQ0ZGE2Li45YTgyMDhkYmE3YTkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYwpAQCAtMTAsNiArMTAsMjUgQEAKICNkZWZpbmUgUklO R19NQVNLIDB4ZmZmZmZmZmYKICNkZWZpbmUgUklOR19NQVggMzIKIAorI2RlZmluZSBFTkdJTkVf U0FNUExFX01BU0sgKDB4ZikKKyNkZWZpbmUgRU5HSU5FX1NBTVBMRV9CSVRTICg0KQorCitzdGF0 aWMgY29uc3QgdW5zaWduZWQgaW50IGVuZ2luZV9tYXBbSTkxNV9OVU1fRU5HSU5FU10gPSB7CisJ W1JDU10gPSBJOTE1X1NBTVBMRV9SQ1MsCisJW0JDU10gPSBJOTE1X1NBTVBMRV9CQ1MsCisJW1ZD U10gPSBJOTE1X1NBTVBMRV9WQ1MsCisJW1ZDUzJdID0gSTkxNV9TQU1QTEVfVkNTMiwKKwlbVkVD U10gPSBJOTE1X1NBTVBMRV9WRUNTLAorfTsKKworc3RhdGljIGNvbnN0IHVuc2lnbmVkIGludCB1 c2VyX2VuZ2luZV9tYXBbSTkxNV9OVU1fRU5HSU5FU10gPSB7CisJW0k5MTVfU0FNUExFX1JDU10g PSBSQ1MsCisJW0k5MTVfU0FNUExFX0JDU10gPSBCQ1MsCisJW0k5MTVfU0FNUExFX1ZDU10gPSBW Q1MsCisJW0k5MTVfU0FNUExFX1ZDUzJdID0gVkNTMiwKKwlbSTkxNV9TQU1QTEVfVkVDU10gPSBW RUNTLAorfTsKKwogc3RhdGljIHZvaWQgZW5naW5lc19zYW1wbGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKQEAg LTI2LDkgKzQ1LDE2IEBAIHN0YXRpYyB2b2lkIGVuZ2luZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuOwogCiAJZm9yX2VhY2hfZW5naW5lKGVuZ2lu ZSwgZGV2X3ByaXYsIGlkKSB7CisJCXVuc2lnbmVkIGludCB1c2VyX2VuZ2luZSA9IGVuZ2luZV9t YXBbaWRdOwogCQl1MzIgdmFsOwogCi0JCWlmICgoZGV2X3ByaXYtPnBtdS5lbmFibGUgJiAoMHg3 IDw8ICg0KmlkKSkpID09IDApCisJCWlmIChXQVJOX09OX09OQ0UoaWQgPj0gQVJSQVlfU0laRShl bmdpbmVfbWFwKSkpCisJCQljb250aW51ZTsKKwkJZWxzZQorCQkJdXNlcl9lbmdpbmUgPSBlbmdp bmVfbWFwW2lkXTsKKworCQlpZiAoIShkZXZfcHJpdi0+cG11LmVuYWJsZSAmCisJCSAgICAoRU5H SU5FX1NBTVBMRV9NQVNLIDw8IChFTkdJTkVfU0FNUExFX0JJVFMgKiB1c2VyX2VuZ2luZSkpKSkK IAkJCWNvbnRpbnVlOwogCiAJCWlmIChpOTE1X3NlcW5vX3Bhc3NlZChpbnRlbF9lbmdpbmVfZ2V0 X3NlcW5vKGVuZ2luZSksCkBAIC0xMTIsNiArMTM4LDExIEBAIHN0YXRpYyBpbnQgZW5naW5lX2V2 ZW50X2luaXQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCWludCBlbmdpbmUgPSBldmVudC0+ YXR0ci5jb25maWcgPj4gMjsKIAlpbnQgc2FtcGxlID0gZXZlbnQtPmF0dHIuY29uZmlnICYgMzsK IAorCWlmIChXQVJOX09OX09OQ0UoZW5naW5lID49IEFSUkFZX1NJWkUodXNlcl9lbmdpbmVfbWFw KSkpCisJCXJldHVybiAtRU5PRU5UOworCWVsc2UKKwkJZW5naW5lID0gdXNlcl9lbmdpbmVfbWFw W2VuZ2luZV07CisKIAlzd2l0Y2ggKHNhbXBsZSkgewogCWNhc2UgSTkxNV9TQU1QTEVfUVVFVUVE OgogCWNhc2UgSTkxNV9TQU1QTEVfQlVTWToKQEAgLTEyNSw5ICsxNTYsNiBAQCBzdGF0aWMgaW50 IGVuZ2luZV9ldmVudF9pbml0KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAkJcmV0dXJuIC1F Tk9FTlQ7CiAJfQogCi0JaWYgKGVuZ2luZSA+PSBJOTE1X05VTV9FTkdJTkVTKQotCQlyZXR1cm4g LUVOT0VOVDsKLQogCWlmICghaTkxNS0+ZW5naW5lW2VuZ2luZV0pCiAJCXJldHVybiAtRU5PREVW OwogCkBAIC0zNjksNyArMzk3LDEzIEBAIHN0YXRpYyB2b2lkIGk5MTVfcG11X2V2ZW50X3JlYWQo c3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCWlmIChldmVudC0+YXR0ci5jb25maWcgPCAzMikg ewogCQlpbnQgZW5naW5lID0gZXZlbnQtPmF0dHIuY29uZmlnID4+IDI7CiAJCWludCBzYW1wbGUg PSBldmVudC0+YXR0ci5jb25maWcgJiAzOwotCQl2YWwgPSBpOTE1LT5lbmdpbmVbZW5naW5lXS0+ cG11X3NhbXBsZVtzYW1wbGVdOworCisJCWlmIChXQVJOX09OX09OQ0UoZW5naW5lID49IEFSUkFZ X1NJWkUodXNlcl9lbmdpbmVfbWFwKSkpIHsKKwkJCS8qIERvIG5vdGhpbmcgKi8KKwkJfSBlbHNl IHsKKwkJCWVuZ2luZSA9IHVzZXJfZW5naW5lX21hcFtlbmdpbmVdOworCQkJdmFsID0gaTkxNS0+ ZW5naW5lW2VuZ2luZV0tPnBtdV9zYW1wbGVbc2FtcGxlXTsKKwkJfQogCX0gZWxzZSBzd2l0Y2gg KGV2ZW50LT5hdHRyLmNvbmZpZykgewogCWNhc2UgSTkxNV9QTVVfQUNUVUFMX0ZSRVFVRU5DWToK IAkJdmFsID0gaTkxNS0+cG11LnNhbXBsZVtfX0k5MTVfU0FNUExFX0ZSRVFfQUNUXTsKLS0gCjIu OS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK