From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 4/4] drm/i915: Wait for vblank in hsw_enable_ips() Date: Tue, 11 Mar 2014 19:37:36 +0200 Message-ID: <1394559456-7348-5-git-send-email-ville.syrjala@linux.intel.com> References: <1394559456-7348-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 2699EFB371 for ; Tue, 11 Mar 2014 10:41:15 -0700 (PDT) In-Reply-To: <1394559456-7348-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v dyB0aGF0IHRoZSB2Ymxhbmsgd2FpdCBpcyBnb25lIGZyb20gaW50ZWxfZW5hYmxlX3ByaW1hcnlf cGxhbmUoKSwKaHN3X2VuYWJsZV9pcHMoKSBuZWVkcyB0byBkbyB0aGUgdmJsYW5rIHdhaXQgaXRz ZWxmLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAx MiArKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8ICA1 ICstLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDZiZmEzNTcuLjJiZGRkNDEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTM1NTAsMTcgKzM1NTAsMTcg QEAgc3RhdGljIHZvaWQgaW50ZWxfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRj KQogCiB2b2lkIGhzd19lbmFibGVfaXBzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNydGMtPmJhc2UuZGV2LT5kZXZfcHJp dmF0ZTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CisJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAogCWlmICgh Y3J0Yy0+Y29uZmlnLmlwc19lbmFibGVkKQogCQlyZXR1cm47CiAKLQkvKiBXZSBjYW4gb25seSBl bmFibGUgSVBTIGFmdGVyIHdlIGVuYWJsZSBhIHBsYW5lIGFuZCB3YWl0IGZvciBhIHZibGFuay4K LQkgKiBXZSBndWFyYW50ZWUgdGhhdCB0aGUgcGxhbmUgaXMgZW5hYmxlZCBieSBjYWxsaW5nIGlu dGVsX2VuYWJsZV9pcHMKLQkgKiBvbmx5IGFmdGVyIGludGVsX2VuYWJsZV9wbGFuZS4gQW5kIGlu dGVsX2VuYWJsZV9wbGFuZSBhbHJlYWR5IHdhaXRzCi0JICogZm9yIGEgdmJsYW5rLCBzbyBhbGwg d2UgbmVlZCB0byBkbyBoZXJlIGlzIHRvIGVuYWJsZSB0aGUgSVBTIGJpdC4gKi8KKwkvKiBXZSBj YW4gb25seSBlbmFibGUgSVBTIGFmdGVyIHdlIGVuYWJsZSBhIHBsYW5lIGFuZCB3YWl0IGZvciBh IHZibGFuayAqLworCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGNydGMtPnBpcGUpOworCiAJ YXNzZXJ0X3BsYW5lX2VuYWJsZWQoZGV2X3ByaXYsIGNydGMtPnBsYW5lKTsKLQlpZiAoSVNfQlJP QURXRUxMKGNydGMtPmJhc2UuZGV2KSkgeworCWlmIChJU19CUk9BRFdFTEwoZGV2KSkgewogCQlt dXRleF9sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOwogCQlXQVJOX09OKHNhbmR5YnJpZGdl X3Bjb2RlX3dyaXRlKGRldl9wcml2LCBESVNQTEFZX0lQU19DT05UUk9MLCAweGMwMDAwMDAwKSk7 CiAJCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMKaW5kZXggMzM2YWU2Yy4uNGRmNzI0NSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMKQEAgLTU0MCwxMCArNTQwLDcgQEAgaW50ZWxfZW5hYmxlX3ByaW1hcnko c3RydWN0IGRybV9jcnRjICpjcnRjKQogCSAqIHdoZW4gZ29pbmcgZnJvbSBwcmltYXJ5IG9ubHkg dG8gc3ByaXRlIG9ubHkgYW5kIHZpY2UKIAkgKiB2ZXJzYS4KIAkgKi8KLQlpZiAoaW50ZWxfY3J0 Yy0+Y29uZmlnLmlwc19lbmFibGVkKSB7Ci0JCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGlu dGVsX2NydGMtPnBpcGUpOwotCQloc3dfZW5hYmxlX2lwcyhpbnRlbF9jcnRjKTsKLQl9CisJaHN3 X2VuYWJsZV9pcHMoaW50ZWxfY3J0Yyk7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAJaW50ZWxfdXBkYXRlX2ZiYyhkZXYpOwotLSAKMS44LjMuMgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK