From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 06/13] drm/i915: Remove special dpms handling from intel_sdvo.c Date: Thu, 16 Jul 2015 10:59:19 +0200 Message-ID: <1437037166-9339-7-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 ED8586E522 for ; Thu, 16 Jul 2015 02:01:07 -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 VGhlcmUncyBub3QgbXVjaCBwb2ludCBpbiBoYW5kbGluZyBhbnl0aGluZyBidXQgRFBNUyBvbi9v ZmYsCm5vIG5lZWQgdG8gZ2V0IHNtYXJ0IGFib3V0IGl0LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZvLmMgfCA0NyArLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgNDYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCmluZGV4IGFhMmZkNzUxNjA5Yy4u NWE1Mjc2ODFlODYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zZHZv LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc2R2by5jCkBAIC0xNTA4LDUxICsx NTA4LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX3Nkdm8oc3RydWN0IGludGVsX2VuY29k ZXIgKmVuY29kZXIpCiAJaW50ZWxfc2R2b19zZXRfYWN0aXZlX291dHB1dHMoaW50ZWxfc2R2bywg aW50ZWxfc2R2by0+YXR0YWNoZWRfb3V0cHV0KTsKIH0KIAotLyogU3BlY2lhbCBkcG1zIGZ1bmN0 aW9uIHRvIHN1cHBvcnQgY2xvbmluZyBiZXR3ZWVuIGR2by9zZHZvL2NydC4gKi8KLXN0YXRpYyB2 b2lkIGludGVsX3Nkdm9fZHBtcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBpbnQg bW9kZSkKLXsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0Jc3RydWN0IGludGVsX3Nkdm8gKmlu dGVsX3Nkdm8gPSBpbnRlbF9hdHRhY2hlZF9zZHZvKGNvbm5lY3Rvcik7Ci0KLQkvKiBkdm8gc3Vw cG9ydHMgb25seSAyIGRwbXMgc3RhdGVzLiAqLwotCWlmIChtb2RlICE9IERSTV9NT0RFX0RQTVNf T04pCi0JCW1vZGUgPSBEUk1fTU9ERV9EUE1TX09GRjsKLQotCWlmIChtb2RlID09IGNvbm5lY3Rv ci0+ZHBtcykKLQkJcmV0dXJuOwotCi0JY29ubmVjdG9yLT5kcG1zID0gbW9kZTsKLQotCS8qIE9u bHkgbmVlZCB0byBjaGFuZ2UgaHcgc3RhdGUgd2hlbiBhY3R1YWxseSBlbmFibGVkICovCi0JY3J0 YyA9IGludGVsX3Nkdm8tPmJhc2UuYmFzZS5jcnRjOwotCWlmICghY3J0YykgewotCQlpbnRlbF9z ZHZvLT5iYXNlLmNvbm5lY3RvcnNfYWN0aXZlID0gZmFsc2U7Ci0JCXJldHVybjsKLQl9Ci0KLQkv KiBXZSBzZXQgYWN0aXZlIG91dHB1dHMgbWFudWFsbHkgYmVsb3cgaW4gY2FzZSBwaXBlIGRwbXMg ZG9lc24ndCBjaGFuZ2UKLQkgKiBkdWUgdG8gY2xvbmluZy4gKi8KLQlpZiAobW9kZSAhPSBEUk1f TU9ERV9EUE1TX09OKSB7Ci0JCWludGVsX3Nkdm9fc2V0X2FjdGl2ZV9vdXRwdXRzKGludGVsX3Nk dm8sIDApOwotCQlpZiAoMCkKLQkJCWludGVsX3Nkdm9fc2V0X2VuY29kZXJfcG93ZXJfc3RhdGUo aW50ZWxfc2R2bywgbW9kZSk7Ci0KLQkJaW50ZWxfc2R2by0+YmFzZS5jb25uZWN0b3JzX2FjdGl2 ZSA9IGZhbHNlOwotCi0JCWludGVsX2NydGNfdXBkYXRlX2RwbXMoY3J0Yyk7Ci0JfSBlbHNlIHsK LQkJaW50ZWxfc2R2by0+YmFzZS5jb25uZWN0b3JzX2FjdGl2ZSA9IHRydWU7Ci0KLQkJaW50ZWxf Y3J0Y191cGRhdGVfZHBtcyhjcnRjKTsKLQotCQlpZiAoMCkKLQkJCWludGVsX3Nkdm9fc2V0X2Vu Y29kZXJfcG93ZXJfc3RhdGUoaW50ZWxfc2R2bywgbW9kZSk7Ci0JCWludGVsX3Nkdm9fc2V0X2Fj dGl2ZV9vdXRwdXRzKGludGVsX3Nkdm8sIGludGVsX3Nkdm8tPmF0dGFjaGVkX291dHB1dCk7Ci0J fQotCi0JaW50ZWxfbW9kZXNldF9jaGVja19zdGF0ZShjb25uZWN0b3ItPmRldik7Ci19Ci0KIHN0 YXRpYyBlbnVtIGRybV9tb2RlX3N0YXR1cwogaW50ZWxfc2R2b19tb2RlX3ZhbGlkKHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCSAgICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICptb2RlKQpAQCAtMjE5MCw3ICsyMTQ1LDcgQEAgZG9uZToKIH0KIAogc3RhdGljIGNvbnN0IHN0 cnVjdCBkcm1fY29ubmVjdG9yX2Z1bmNzIGludGVsX3Nkdm9fY29ubmVjdG9yX2Z1bmNzID0gewot CS5kcG1zID0gaW50ZWxfc2R2b19kcG1zLAorCS5kcG1zID0gaW50ZWxfY29ubmVjdG9yX2RwbXMs CiAJLmRldGVjdCA9IGludGVsX3Nkdm9fZGV0ZWN0LAogCS5maWxsX21vZGVzID0gZHJtX2hlbHBl cl9wcm9iZV9zaW5nbGVfY29ubmVjdG9yX21vZGVzLAogCS5zZXRfcHJvcGVydHkgPSBpbnRlbF9z ZHZvX3NldF9wcm9wZXJ0eSwKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=