From: Jani Nikula Subject: [PATCH RESEND 1/4] drm/i915/opregion: bail out early for systems with no opregion VBT Date: Wed, 29 Mar 2017 13:32:55 +0300 Message-ID: <1490783578-6065-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id E379A6E704 for ; Wed, 29 Mar 2017 10:33:07 +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: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org UmVkdWNlIGluZGVudC4gTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgoKU2lnbmVkLW9mZi1ieTogSmFu aSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9vcHJlZ2lvbi5jIHwgNjQgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vcHJlZ2lvbi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ByZWdpb24uYwppbmRleCA0NDFjMDE0NjYzODQuLjc2YTM5 ZWU2ZDAwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ByZWdpb24u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vcHJlZ2lvbi5jCkBAIC05MjAsNiAr OTIwLDggQEAgaW50IGludGVsX29wcmVnaW9uX3NldHVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAljaGFyIGJ1ZltzaXplb2YoT1BSRUdJT05fU0lHTkFUVVJFKV07CiAJaW50 IGVyciA9IDA7CiAJdm9pZCAqYmFzZTsKKwljb25zdCB2b2lkICp2YnQgPSBOVUxMOworCXUzMiB2 YnRfc2l6ZSA9IDA7CiAKIAlCVUlMRF9CVUdfT04oc2l6ZW9mKHN0cnVjdCBvcHJlZ2lvbl9oZWFk ZXIpICE9IDB4MTAwKTsKIAlCVUlMRF9CVUdfT04oc2l6ZW9mKHN0cnVjdCBvcHJlZ2lvbl9hY3Bp KSAhPSAweDEwMCk7CkBAIC05NzIsNDUgKzk3NCw0MyBAQCBpbnQgaW50ZWxfb3ByZWdpb25fc2V0 dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChtYm94ZXMgJiBNQk9Y X0FTTEVfRVhUKQogCQlEUk1fREVCVUdfRFJJVkVSKCJBU0xFIGV4dGVuc2lvbiBzdXBwb3J0ZWRc biIpOwogCi0JaWYgKCFkbWlfY2hlY2tfc3lzdGVtKGludGVsX25vX29wcmVnaW9uX3ZidCkpIHsK LQkJY29uc3Qgdm9pZCAqdmJ0ID0gTlVMTDsKLQkJdTMyIHZidF9zaXplID0gMDsKLQotCQlpZiAo b3ByZWdpb24tPmhlYWRlci0+b3ByZWdpb25fdmVyID49IDIgJiYgb3ByZWdpb24tPmFzbGUgJiYK LQkJICAgIG9wcmVnaW9uLT5hc2xlLT5ydmRhICYmIG9wcmVnaW9uLT5hc2xlLT5ydmRzKSB7Ci0J CQlvcHJlZ2lvbi0+cnZkYSA9IG1lbXJlbWFwKG9wcmVnaW9uLT5hc2xlLT5ydmRhLAotCQkJCQkJ ICBvcHJlZ2lvbi0+YXNsZS0+cnZkcywKLQkJCQkJCSAgTUVNUkVNQVBfV0IpOwotCQkJdmJ0ID0g b3ByZWdpb24tPnJ2ZGE7Ci0JCQl2YnRfc2l6ZSA9IG9wcmVnaW9uLT5hc2xlLT5ydmRzOwotCQl9 CisJaWYgKGRtaV9jaGVja19zeXN0ZW0oaW50ZWxfbm9fb3ByZWdpb25fdmJ0KSkKKwkJZ290byBv dXQ7CisKKwlpZiAob3ByZWdpb24tPmhlYWRlci0+b3ByZWdpb25fdmVyID49IDIgJiYgb3ByZWdp b24tPmFzbGUgJiYKKwkgICAgb3ByZWdpb24tPmFzbGUtPnJ2ZGEgJiYgb3ByZWdpb24tPmFzbGUt PnJ2ZHMpIHsKKwkJb3ByZWdpb24tPnJ2ZGEgPSBtZW1yZW1hcChvcHJlZ2lvbi0+YXNsZS0+cnZk YSwKKwkJCQkJICBvcHJlZ2lvbi0+YXNsZS0+cnZkcywKKwkJCQkJICBNRU1SRU1BUF9XQik7CisJ CXZidCA9IG9wcmVnaW9uLT5ydmRhOworCQl2YnRfc2l6ZSA9IG9wcmVnaW9uLT5hc2xlLT5ydmRz OworCX0KIAorCWlmIChpbnRlbF9iaW9zX2lzX3ZhbGlkX3ZidCh2YnQsIHZidF9zaXplKSkgewor CQlEUk1fREVCVUdfS01TKCJGb3VuZCB2YWxpZCBWQlQgaW4gQUNQSSBPcFJlZ2lvbiAoUlZEQSlc biIpOworCQlvcHJlZ2lvbi0+dmJ0ID0gdmJ0OworCQlvcHJlZ2lvbi0+dmJ0X3NpemUgPSB2YnRf c2l6ZTsKKwl9IGVsc2UgeworCQl2YnQgPSBiYXNlICsgT1BSRUdJT05fVkJUX09GRlNFVDsKKwkJ LyoKKwkJICogVGhlIFZCVCBzcGVjaWZpY2F0aW9uIHNheXMgdGhhdCBpZiB0aGUgQVNMRSBleHQg bWFpbGJveCBpcworCQkgKiBub3QgdXNlZCBpdHMgYXJlYSBpcyByZXNlcnZlZCwgYnV0IG9uIHNv bWUgQ0hUIGJvYXJkcyB0aGUgVkJUCisJCSAqIGV4dGVuZHMgaW50byB0aGUgQVNMRSBleHQgYXJl YS4gQWxsb3cgdGhpcyBldmVuIHRob3VnaCBpdCBpcworCQkgKiBhZ2FpbnN0IHRoZSBzcGVjLCBz byB3ZSBkbyBub3QgZW5kIHVwIHJlamVjdGluZyB0aGUgVkJUIG9uCisJCSAqIHRob3NlIGJvYXJk cyAoYW5kIGVuZCB1cCBub3QgZmluZGluZyB0aGUgTENEIHBhbmVsIGJlY2F1c2Ugb2YKKwkJICog dGhpcykuCisJCSAqLworCQl2YnRfc2l6ZSA9IChtYm94ZXMgJiBNQk9YX0FTTEVfRVhUKSA/CisJ CQlPUFJFR0lPTl9BU0xFX0VYVF9PRkZTRVQgOiBPUFJFR0lPTl9TSVpFOworCQl2YnRfc2l6ZSAt PSBPUFJFR0lPTl9WQlRfT0ZGU0VUOwogCQlpZiAoaW50ZWxfYmlvc19pc192YWxpZF92YnQodmJ0 LCB2YnRfc2l6ZSkpIHsKLQkJCURSTV9ERUJVR19LTVMoIkZvdW5kIHZhbGlkIFZCVCBpbiBBQ1BJ IE9wUmVnaW9uIChSVkRBKVxuIik7CisJCQlEUk1fREVCVUdfS01TKCJGb3VuZCB2YWxpZCBWQlQg aW4gQUNQSSBPcFJlZ2lvbiAoTWFpbGJveCAjNClcbiIpOwogCQkJb3ByZWdpb24tPnZidCA9IHZi dDsKIAkJCW9wcmVnaW9uLT52YnRfc2l6ZSA9IHZidF9zaXplOwotCQl9IGVsc2UgewotCQkJdmJ0 ID0gYmFzZSArIE9QUkVHSU9OX1ZCVF9PRkZTRVQ7Ci0JCQkvKgotCQkJICogVGhlIFZCVCBzcGVj aWZpY2F0aW9uIHNheXMgdGhhdCBpZiB0aGUgQVNMRSBleHQKLQkJCSAqIG1haWxib3ggaXMgbm90 IHVzZWQgaXRzIGFyZWEgaXMgcmVzZXJ2ZWQsIGJ1dAotCQkJICogb24gc29tZSBDSFQgYm9hcmRz IHRoZSBWQlQgZXh0ZW5kcyBpbnRvIHRoZQotCQkJICogQVNMRSBleHQgYXJlYS4gQWxsb3cgdGhp cyBldmVuIHRob3VnaCBpdCBpcwotCQkJICogYWdhaW5zdCB0aGUgc3BlYywgc28gd2UgZG8gbm90 IGVuZCB1cCByZWplY3RpbmcKLQkJCSAqIHRoZSBWQlQgb24gdGhvc2UgYm9hcmRzIChhbmQgZW5k IHVwIG5vdCBmaW5kaW5nIHRoZQotCQkJICogTENEIHBhbmVsIGJlY2F1c2Ugb2YgdGhpcykuCi0J CQkgKi8KLQkJCXZidF9zaXplID0gKG1ib3hlcyAmIE1CT1hfQVNMRV9FWFQpID8KLQkJCQlPUFJF R0lPTl9BU0xFX0VYVF9PRkZTRVQgOiBPUFJFR0lPTl9TSVpFOwotCQkJdmJ0X3NpemUgLT0gT1BS RUdJT05fVkJUX09GRlNFVDsKLQkJCWlmIChpbnRlbF9iaW9zX2lzX3ZhbGlkX3ZidCh2YnQsIHZi dF9zaXplKSkgewotCQkJCURSTV9ERUJVR19LTVMoIkZvdW5kIHZhbGlkIFZCVCBpbiBBQ1BJIE9w UmVnaW9uIChNYWlsYm94ICM0KVxuIik7Ci0JCQkJb3ByZWdpb24tPnZidCA9IHZidDsKLQkJCQlv cHJlZ2lvbi0+dmJ0X3NpemUgPSB2YnRfc2l6ZTsKLQkJCX0KIAkJfQogCX0KIAorb3V0OgogCXJl dHVybiAwOwogCiBlcnJfb3V0OgotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=