From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3.5 16.5/22] drm/i915: Make intel_display_suspend atomic. Date: Thu, 21 May 2015 14:40:46 +0200 Message-ID: <555DD24E.1050101@linux.intel.com> References: <1432129094-11765-1-git-send-email-maarten.lankhorst@linux.intel.com> <1432137874-20543-1-git-send-email-maarten.lankhorst@linux.intel.com> <1432137874-20543-7-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C46D56E8C7 for ; Thu, 21 May 2015 05:40:50 -0700 (PDT) In-Reply-To: <1432137874-20543-7-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 Q2FsY3VsYXRlIGFsbCBzdGF0ZSB1c2luZyBhIG5vcm1hbCB0cmFuc2l0aW9uLCBidXQgYWZ0ZXJ3 YXJkcyBmdWRnZQpjcnRjLT5zdGF0ZS0+YWN0aXZlIGJhY2sgdG8gaXRzIG9sZCB2YWx1ZS4gVGhp cyBzaG91bGQgc3RpbGwgYWxsb3cKc3RhdGUgcmVzdG9yZSBpbiBzZXR1cF9od19zdGF0ZSB0byB3 b3JrIHByb3Blcmx5LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4u bGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgfCA0NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4YjFkOTExMzZkMjUuLjJkYzU5MTQ3ZDg5MCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTk1MSwxNiArNTk1MSw1NSBA QCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAg Ki8KIHZvaWQgaW50ZWxfZGlzcGxheV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7 Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0 cnVjdCBkcm1fbW9kZV9jb25maWcgKmNvbmZpZyA9ICZkZXYtPm1vZGVfY29uZmlnOworCXN0cnVj dCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4ID0gY29uZmlnLT5hY3F1aXJlX2N0eDsKKwlz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwor CXVuc2lnbmVkIGNydGNfbWFzayA9IDA7CisJaW50IHJldCA9IDA7CisKKwlpZiAoV0FSTl9PTigh Y3R4KSkKKwkJcmV0dXJuOworCisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmY3R4LT53d19jdHgpOwor CXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOworCWlmIChXQVJOX09OKCFzdGF0 ZSkpCisJCXJldHVybjsKKworCXN0YXRlLT5hY3F1aXJlX2N0eCA9IGN0eDsKKwlzdGF0ZS0+YWxs b3dfbW9kZXNldCA9IHRydWU7CiAKIAlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQlpZiAo IXRvX2ludGVsX2NydGMoY3J0YyktPmFjdGl2ZSkKKwkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpj cnRjX3N0YXRlID0KKwkJCWRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwor CisJCXJldCA9IFBUUl9FUlJfT1JfWkVSTyhjcnRjX3N0YXRlKTsKKwkJaWYgKHJldCkKKwkJCWdv dG8gZnJlZTsKKworCQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSkKIAkJCWNvbnRpbnVlOwogCi0J CWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoY3J0Yyk7Ci0JCWRldl9wcml2LT5kaXNwbGF5LmNy dGNfZGlzYWJsZShjcnRjKTsKKwkJY3J0Y19zdGF0ZS0+YWN0aXZlID0gZmFsc2U7CisJCWNydGNf bWFzayB8PSAxIDw8IGRybV9jcnRjX2luZGV4KGNydGMpOwogCX0KKworCWlmIChjcnRjX21hc2sp IHsKKwkJcmV0ID0gaW50ZWxfc2V0X21vZGUoc3RhdGUpOworCisJCWlmICghcmV0KSB7CisJCQlm b3JfZWFjaF9jcnRjKGRldiwgY3J0YykKKwkJCQlpZiAoY3J0Y19tYXNrICYgKDEgPDwgZHJtX2Ny dGNfaW5kZXgoY3J0YykpKQorCQkJCQljcnRjLT5zdGF0ZS0+YWN0aXZlID0gdHJ1ZTsKKworCQkJ cmV0dXJuOworCQl9CisJfQorCitmcmVlOgorCWlmIChyZXQpCisJCURSTV9FUlJPUigiU3VzcGVu ZGluZyBjcnRjJ3MgZmFpbGVkIHdpdGggJWlcbiIsIHJldCk7CisJZHJtX2F0b21pY19zdGF0ZV9m cmVlKHN0YXRlKTsKIH0KIAogLyogTWFzdGVyIGZ1bmN0aW9uIHRvIGVuYWJsZS9kaXNhYmxlIENS VEMgYW5kIGNvcnJlc3BvbmRpbmcgcG93ZXIgd2VsbHMgKi8KLS0gCjIuMS4wCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK