From: Tvrtko Ursulin Subject: [PATCH] drm/i915/pmu: Work around compiler warnings on some kernel configs Date: Wed, 14 Mar 2018 08:05:35 +0000 Message-ID: <20180314080535.17490-1-tvrtko.ursulin@linux.intel.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 , dri-devel@lists.freedesktop.org, Rodrigo Vivi , intel-gfx@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFybmQgQmVy Z21hbiByZXBvcnRzOgoiIiIKVGhlIGNvbmRpdGlvbmFsIHNwaW5sb2NrIGNvbmZ1c2VzIGdjYyBp bnRvIHRoaW5raW5nIHRoZSAnZmxhZ3MnIHZhbHVlCm1pZ2h0IGNvbnRhaW4gdW5pbml0aWFsaXpl ZCBkYXRhOgoKZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYzogSW4gZnVuY3Rpb24gJ19f aTkxNV9wbXVfZXZlbnRfcmVhZCc6CmFyY2gveDg2L2luY2x1ZGUvYXNtL3BhcmF2aXJ0X3R5cGVz Lmg6NTczOjM6IGVycm9yOiAnZmxhZ3MnIG1heSBiZSB1c2VkIHVuaW5pdGlhbGl6ZWQgaW4gdGhp cyBmdW5jdGlvbiBbLVdlcnJvcj1tYXliZS11bmluaXRpYWxpemVkXQoKVGhlIGNvZGUgaXMgY29y cmVjdCwgYnV0IGl0J3MgZWFzeSB0byBzZWUgaG93IHRoZSBjb21waWxlciBnZXRzIGNvbmZ1c2Vk CmhlcmUuIFRoaXMgYXZvaWRzIHRoZSBwcm9ibGVtIGJ5IHB1bGxpbmcgdGhlIGxvY2sgb3V0c2lk ZSBvZiB0aGUgZnVuY3Rpb24KaW50byBpdHMgb25seSBjYWxsZXIuCiIiIgoKT24gZGVlcGVyIGxv b2sgaXQgc2VlbXMgdGhpcyBpcyBjYXVzZWQgYnkgcGFyYXZpcnQgc3BpbmxvY2tzCmltcGxlbWVu dGF0aW9uIHdoZW4gQ09ORklHX1BBUkFWSVJUX0RFQlVHIGlzIHNldCwgd2hpY2ggYnkgYmVpbmcK Y29tcGxpY2F0ZWQsIG1hbmFnZXMgdG8gY29udmluY2UgZ2NjIGxvY2tlZCBwYXJhbWV0ZXIgY2Fu IGJlIGNoYW5nZWQKZXh0ZXJuYWxseSAoaW1wb3NzaWJsZSkuCgpXb3JrIGFyb3VuZCBpdCBieSBy ZW1vdmluZyB0aGUgY29uZGl0aW9uYWwgbG9ja2luZyBwYXJhbWV0ZXJzIGFsdG9nZXRoZXIuCihJ dCB3YXMgbmV2ZXIgdGhlIG1vc3QgZWxlZ2FudCBjb2RlIGFueXdheS4pCgpTbGlnaHQgcGVuYWx0 eSB3ZSBub3cgcGF5IGlzIGFuIGFkZGl0aW9uYWwgaXJxc2F2ZSBzcGluIGxvY2svdW5sb2NrIGN5 Y2xlCm9uIHRoZSBldmVudCBlbmFibGUgcGF0aC4gQnV0IHNpbmNlIGVuYWJsZSBpcyBub3QgYSBm YXN0IHBhdGgsIHRoYXQgaXMKcHJlZmVycmFibGUgdG8gdGhlIGFsdGVybmF0aXZlIHNvbHV0aW9u IHdoaWNoIHdhcyBkb2luZyBNTUlPIHVuZGVyIGlycXNhdmUKc3BpbmxvY2suCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXBvcnRlZC1i eTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KRml4ZXM6IDFmZTY5OWUzMDExMyAoImRy bS9pOTE1L3BtdTogRml4IHNsZWVwIHVuZGVyIGF0b21pYyBpbiBSQzYgcmVhZG91dCIpCkNjOiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRl bC5jb20+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzog Sm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogUm9k cmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJs aWVkQGxpbnV4LmllPgpDYzogaW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpDYzogZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcG11LmMgfCAzMiArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3BtdS5jCmluZGV4IDRiYzdhZWZhOTU0MS4uMTFmYjc2YmQzODYwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcG11LmMKQEAgLTQxMiw3ICs0MTIsNyBAQCBzdGF0aWMgdTY0IF9fZ2V0X3JjNihzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAlyZXR1cm4gdmFsOwogfQogCi1zdGF0aWMgdTY0IGdl dF9yYzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgbG9ja2VkKQorc3RhdGlj IHU2NCBnZXRfcmM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewogI2lmIElTX0VO QUJMRUQoQ09ORklHX1BNKQogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CkBAIC00MjgsOCArNDI4LDcg QEAgc3RhdGljIHU2NCBnZXRfcmM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29s IGxvY2tlZCkKIAkJICogcHJldmlvdXNseS4KIAkJICovCiAKLQkJaWYgKCFsb2NrZWQpCi0JCQlz cGluX2xvY2tfaXJxc2F2ZSgmaTkxNS0+cG11LmxvY2ssIGZsYWdzKTsKKwkJc3Bpbl9sb2NrX2ly cXNhdmUoJmk5MTUtPnBtdS5sb2NrLCBmbGFncyk7CiAKIAkJaWYgKHZhbCA+PSBpOTE1LT5wbXUu c2FtcGxlW19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyKSB7CiAJCQlpOTE1LT5wbXUu c2FtcGxlW19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyID0gMDsKQEAgLTQzOCwxMiAr NDM3LDEwIEBAIHN0YXRpYyB1NjQgZ2V0X3JjNihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwgYm9vbCBsb2NrZWQpCiAJCQl2YWwgPSBpOTE1LT5wbXUuc2FtcGxlW19fSTkxNV9TQU1QTEVf UkM2X0VTVElNQVRFRF0uY3VyOwogCQl9CiAKLQkJaWYgKCFsb2NrZWQpCi0JCQlzcGluX3VubG9j a19pcnFyZXN0b3JlKCZpOTE1LT5wbXUubG9jaywgZmxhZ3MpOworCQlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZpOTE1LT5wbXUubG9jaywgZmxhZ3MpOwogCX0gZWxzZSB7CiAJCXN0cnVjdCBwY2lf ZGV2ICpwZGV2ID0gaTkxNS0+ZHJtLnBkZXY7CiAJCXN0cnVjdCBkZXZpY2UgKmtkZXYgPSAmcGRl di0+ZGV2OwotCQl1bnNpZ25lZCBsb25nIGZsYWdzMjsKIAogCQkvKgogCQkgKiBXZSBhcmUgcnVu dGltZSBzdXNwZW5kZWQuCkBAIC00NTIsMTAgKzQ0OSw4IEBAIHN0YXRpYyB1NjQgZ2V0X3JjNihz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9vbCBsb2NrZWQpCiAJCSAqIG9uIHRvcCBv ZiB0aGUgbGFzdCBrbm93biByZWFsIHZhbHVlLCBhcyB0aGUgYXBwcm94aW1hdGVkIFJDNgogCQkg KiBjb3VudGVyIHZhbHVlLgogCQkgKi8KLQkJaWYgKCFsb2NrZWQpCi0JCQlzcGluX2xvY2tfaXJx c2F2ZSgmaTkxNS0+cG11LmxvY2ssIGZsYWdzKTsKLQotCQlzcGluX2xvY2tfaXJxc2F2ZSgma2Rl di0+cG93ZXIubG9jaywgZmxhZ3MyKTsKKwkJc3Bpbl9sb2NrX2lycXNhdmUoJmk5MTUtPnBtdS5s b2NrLCBmbGFncyk7CisJCXNwaW5fbG9jaygma2Rldi0+cG93ZXIubG9jayk7CiAKIAkJaWYgKCFp OTE1LT5wbXUuc2FtcGxlW19fSTkxNV9TQU1QTEVfUkM2X0VTVElNQVRFRF0uY3VyKQogCQkJaTkx NS0+cG11LnN1c3BlbmRlZF9qaWZmaWVzX2xhc3QgPQpAQCAtNDY1LDE0ICs0NjAsMTMgQEAgc3Rh dGljIHU2NCBnZXRfcmM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sIGxvY2tl ZCkKIAkJICAgICAgaTkxNS0+cG11LnN1c3BlbmRlZF9qaWZmaWVzX2xhc3Q7CiAJCXZhbCArPSBq aWZmaWVzIC0ga2Rldi0+cG93ZXIuYWNjb3VudGluZ190aW1lc3RhbXA7CiAKLQkJc3Bpbl91bmxv Y2tfaXJxcmVzdG9yZSgma2Rldi0+cG93ZXIubG9jaywgZmxhZ3MyKTsKKwkJc3Bpbl91bmxvY2so JmtkZXYtPnBvd2VyLmxvY2spOwogCiAJCXZhbCA9IGppZmZpZXNfdG9fbnNlY3ModmFsKTsKIAkJ dmFsICs9IGk5MTUtPnBtdS5zYW1wbGVbX19JOTE1X1NBTVBMRV9SQzZdLmN1cjsKIAkJaTkxNS0+ cG11LnNhbXBsZVtfX0k5MTVfU0FNUExFX1JDNl9FU1RJTUFURURdLmN1ciA9IHZhbDsKIAotCQlp ZiAoIWxvY2tlZCkKLQkJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmk5MTUtPnBtdS5sb2NrLCBm bGFncyk7CisJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmk5MTUtPnBtdS5sb2NrLCBmbGFncyk7 CiAJfQogCiAJcmV0dXJuIHZhbDsKQEAgLTQ4MSw3ICs0NzUsNyBAQCBzdGF0aWMgdTY0IGdldF9y YzYoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgbG9ja2VkKQogI2VuZGlmCiB9 CiAKLXN0YXRpYyB1NjQgX19pOTE1X3BtdV9ldmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpl dmVudCwgYm9vbCBsb2NrZWQpCitzdGF0aWMgdTY0IF9faTkxNV9wbXVfZXZlbnRfcmVhZChzdHJ1 Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUg PQogCQljb250YWluZXJfb2YoZXZlbnQtPnBtdSwgdHlwZW9mKCppOTE1KSwgcG11LmJhc2UpOwpA QCAtNTE5LDcgKzUxMyw3IEBAIHN0YXRpYyB1NjQgX19pOTE1X3BtdV9ldmVudF9yZWFkKHN0cnVj dCBwZXJmX2V2ZW50ICpldmVudCwgYm9vbCBsb2NrZWQpCiAJCQl2YWwgPSBjb3VudF9pbnRlcnJ1 cHRzKGk5MTUpOwogCQkJYnJlYWs7CiAJCWNhc2UgSTkxNV9QTVVfUkM2X1JFU0lERU5DWToKLQkJ CXZhbCA9IGdldF9yYzYoaTkxNSwgbG9ja2VkKTsKKwkJCXZhbCA9IGdldF9yYzYoaTkxNSk7CiAJ CQlicmVhazsKIAkJfQogCX0KQEAgLTUzNCw3ICs1MjgsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3Bt dV9ldmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogYWdhaW46CiAJcHJldiA9 IGxvY2FsNjRfcmVhZCgmaHdjLT5wcmV2X2NvdW50KTsKLQluZXcgPSBfX2k5MTVfcG11X2V2ZW50 X3JlYWQoZXZlbnQsIGZhbHNlKTsKKwluZXcgPSBfX2k5MTVfcG11X2V2ZW50X3JlYWQoZXZlbnQp OwogCiAJaWYgKGxvY2FsNjRfY21weGNoZygmaHdjLT5wcmV2X2NvdW50LCBwcmV2LCBuZXcpICE9 IHByZXYpCiAJCWdvdG8gYWdhaW47CkBAIC01ODQsMTQgKzU3OCwxNCBAQCBzdGF0aWMgdm9pZCBp OTE1X3BtdV9lbmFibGUoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCQllbmdpbmUtPnBtdS5l bmFibGVfY291bnRbc2FtcGxlXSsrOwogCX0KIAorCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmk5 MTUtPnBtdS5sb2NrLCBmbGFncyk7CisKIAkvKgogCSAqIFN0b3JlIHRoZSBjdXJyZW50IGNvdW50 ZXIgdmFsdWUgc28gd2UgY2FuIHJlcG9ydCB0aGUgY29ycmVjdCBkZWx0YQogCSAqIGZvciBhbGwg bGlzdGVuZXJzLiBFdmVuIHdoZW4gdGhlIGV2ZW50IHdhcyBhbHJlYWR5IGVuYWJsZWQgYW5kIGhh cwogCSAqIGFuIGV4aXN0aW5nIG5vbi16ZXJvIHZhbHVlLgogCSAqLwotCWxvY2FsNjRfc2V0KCZl dmVudC0+aHcucHJldl9jb3VudCwgX19pOTE1X3BtdV9ldmVudF9yZWFkKGV2ZW50LCB0cnVlKSk7 Ci0KLQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZpOTE1LT5wbXUubG9jaywgZmxhZ3MpOworCWxv Y2FsNjRfc2V0KCZldmVudC0+aHcucHJldl9jb3VudCwgX19pOTE1X3BtdV9ldmVudF9yZWFkKGV2 ZW50KSk7CiB9CiAKIHN0YXRpYyB2b2lkIGk5MTVfcG11X2Rpc2FibGUoc3RydWN0IHBlcmZfZXZl bnQgKmV2ZW50KQotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK