From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 04/13] drm/i915: Remove special dpms handling from intel_crt.c Date: Thu, 16 Jul 2015 10:59:17 +0200 Message-ID: <1437037166-9339-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1437037166-9339-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 79CA86E4A7 for ; Thu, 16 Jul 2015 02:01:06 -0700 (PDT) In-Reply-To: <1437037166-9339-1-git-send-email-maarten.lankhorst@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 List-Id: intel-gfx@lists.freedesktop.org VGhlcmUncyBub3QgbXVjaCBwb2ludCBpbiBoYW5kbGluZyBhbnl0aGluZyBidXQgRFBNUyBPTi9P RkYsCm5vIG5lZWQgdG8gZ2V0IHNtYXJ0IGFib3V0IGl0LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyB8IDQ5ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgNDggZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwppbmRleCA1MjFhZjJjMDY5Y2IuLjM1 NGU5NmVhMmE1YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKQEAgLTIzNiw1MyArMjM2LDYg QEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX2NydChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlcikKIAlpbnRlbF9jcnRfc2V0X2RwbXMoZW5jb2RlciwgY3J0LT5jb25uZWN0b3ItPmJhc2Uu ZHBtcyk7CiB9CiAKLS8qIFNwZWNpYWwgZHBtcyBmdW5jdGlvbiB0byBzdXBwb3J0IGNsb25pbmcg YmV0d2VlbiBkdm8vc2R2by9jcnQuICovCi1zdGF0aWMgdm9pZCBpbnRlbF9jcnRfZHBtcyhzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBpbnQgbW9kZSkKLXsKLQlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY29ubmVjdG9yLT5kZXY7Ci0Jc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIgPSBpbnRlbF9hdHRhY2hlZF9lbmNvZGVyKGNvbm5lY3Rvcik7Ci0Jc3RydWN0IGRybV9jcnRj ICpjcnRjOwotCWludCBvbGRfZHBtczsKLQotCS8qIFBDSCBwbGF0Zm9ybXMgYW5kIFZMViBvbmx5 IHN1cHBvcnQgb24vb2ZmLiAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1ICYmIG1v ZGUgIT0gRFJNX01PREVfRFBNU19PTikKLQkJbW9kZSA9IERSTV9NT0RFX0RQTVNfT0ZGOwotCi0J aWYgKG1vZGUgPT0gY29ubmVjdG9yLT5kcG1zKQotCQlyZXR1cm47Ci0KLQlvbGRfZHBtcyA9IGNv bm5lY3Rvci0+ZHBtczsKLQljb25uZWN0b3ItPmRwbXMgPSBtb2RlOwotCi0JLyogT25seSBuZWVk IHRvIGNoYW5nZSBodyBzdGF0ZSB3aGVuIGFjdHVhbGx5IGVuYWJsZWQgKi8KLQljcnRjID0gZW5j b2Rlci0+YmFzZS5jcnRjOwotCWlmICghY3J0YykgewotCQllbmNvZGVyLT5jb25uZWN0b3JzX2Fj dGl2ZSA9IGZhbHNlOwotCQlyZXR1cm47Ci0JfQotCi0JLyogV2UgbmVlZCB0aGUgcGlwZSB0byBy dW4gZm9yIGFueXRoaW5nIGJ1dCBPRkYuICovCi0JaWYgKG1vZGUgPT0gRFJNX01PREVfRFBNU19P RkYpCi0JCWVuY29kZXItPmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7Ci0JZWxzZQotCQllbmNv ZGVyLT5jb25uZWN0b3JzX2FjdGl2ZSA9IHRydWU7Ci0KLQkvKiBXZSBjYWxsIGNvbm5lY3RvciBk cG1zIG1hbnVhbGx5IGJlbG93IGluIGNhc2UgcGlwZSBkcG1zIGRvZXNuJ3QKLQkgKiBjaGFuZ2Ug ZHVlIHRvIGNsb25pbmcuICovCi0JaWYgKG1vZGUgPCBvbGRfZHBtcykgewotCQkvKiBGcm9tIG9m ZiB0byBvbiwgZW5hYmxlIHRoZSBwaXBlIGZpcnN0LiAqLwotCQlpbnRlbF9jcnRjX3VwZGF0ZV9k cG1zKGNydGMpOwotCi0JCWludGVsX2NydF9zZXRfZHBtcyhlbmNvZGVyLCBtb2RlKTsKLQl9IGVs c2UgewotCQlpbnRlbF9jcnRfc2V0X2RwbXMoZW5jb2RlciwgbW9kZSk7Ci0KLQkJaW50ZWxfY3J0 Y191cGRhdGVfZHBtcyhjcnRjKTsKLQl9Ci0KLQlpbnRlbF9tb2Rlc2V0X2NoZWNrX3N0YXRlKGNv bm5lY3Rvci0+ZGV2KTsKLX0KLQogc3RhdGljIGVudW0gZHJtX21vZGVfc3RhdHVzCiBpbnRlbF9j cnRfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkgICAgIHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQpAQCAtNzk4LDcgKzc1MSw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2NydF9yZXNldChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCiBz dGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3MgaW50ZWxfY3J0X2Nvbm5lY3Rv cl9mdW5jcyA9IHsKIAkucmVzZXQgPSBpbnRlbF9jcnRfcmVzZXQsCi0JLmRwbXMgPSBpbnRlbF9j cnRfZHBtcywKKwkuZHBtcyA9IGludGVsX2Nvbm5lY3Rvcl9kcG1zLAogCS5kZXRlY3QgPSBpbnRl bF9jcnRfZGV0ZWN0LAogCS5maWxsX21vZGVzID0gZHJtX2hlbHBlcl9wcm9iZV9zaW5nbGVfY29u bmVjdG9yX21vZGVzLAogCS5kZXN0cm95ID0gaW50ZWxfY3J0X2Rlc3Ryb3ksCi0tIAoyLjEuMAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK