From: Dave Gordon Subject: [PATCH] drm/i915: avoid wait_for_atomic() in non-atomic host2guc_action() Date: Wed, 6 Jul 2016 15:30:11 +0100 Message-ID: <1467815411-21756-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id A45716E682 for ; Wed, 6 Jul 2016 14:30:15 +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 List-Id: intel-gfx@lists.freedesktop.org UmF0aGVyIHRoYW4gdXNpbmcgd2FpdF9mb3JfYXRvbWljKCkgd2hlbiBjaGFja2luZyBmb3IgYSBy ZXNwb25zZSBmcm9tCnRoZSBHdUMsIHdlIGNhbiBnZXQgdGhlIGVmZmVjdCBvZiBhIGh5YnJpZCBz cGluL3NsZWVwIHdhaXQgYnkgYnJlYWtpbmcKaXQgaW50byB0d28gc3RhZ2VzLiBGaXJzdCwgc3Bp bi13YWl0IGZvciB1cCB0byAxMHVzIHRvIG1pbmltaXNlIGxhdGVuY3kKZm9yICJxdWljayIgY29t bWFuZHM7IHRoZW4sIGlmIHRoYXQgdGltZXMgb3V0LCBzbGVlcC13YWl0IGZvciB1cCAxMG1zCih0 aGUgbWF4aW11bSBhbGxvd2VkIGZvciBhICJzbG93IiBjb21tYW5kKS4KCkJlaW5nIGFibGUgdG8g ZG8gdGhpcyBkZXBlbmRzIG9uIHRoZSByZWNlbnQgcGF0Y2gKMThmNGI4NCBkcm0vaTkxNTogVXNl IGF0b21pYyB3YWl0cyBmb3Igc2hvcnQgbm9uLWF0b21pYyBvbmVzCmFuZCBpcyBzaW1pbGFyIHRv IHRoZSBoeWJyaWQgYXBwcm9hY2ggaW4KMTc1OGI5MCBkcm0vaTkxNTogVXNlIGEgaHlicmlkIHNj aGVtZSBmb3IgZmFzdCByZWdpc3RlciB3YWl0cwooYWx0aG91Z2ggd2UgY2FuJ3QgdXNlIHRoYXQg YXMtaXMsIGJlY2F1c2UgdGhhdCBpbnRlcmZhY2UgZG9lc24ndCBxdWl0ZQptYXRjaCB3aGF0IHdl IG5lZWQgaGVyZSkuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25A aW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDEwICsrKysrKysrLS0KIDEgZmls ZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGJmYzhiZjYuLjIxMTJlMDIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTk3LDggKzk3 LDE0IEBAIHN0YXRpYyBpbnQgaG9zdDJndWNfYWN0aW9uKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yywg dTMyICpkYXRhLCB1MzIgbGVuKQogCiAJSTkxNV9XUklURShIT1NUMkdVQ19JTlRFUlJVUFQsIEhP U1QyR1VDX1RSSUdHRVIpOwogCi0JLyogTm8gSE9TVDJHVUMgY29tbWFuZCBzaG91bGQgdGFrZSBs b25nZXIgdGhhbiAxMG1zICovCi0JcmV0ID0gd2FpdF9mb3JfYXRvbWljKGhvc3QyZ3VjX2FjdGlv bl9yZXNwb25zZShkZXZfcHJpdiwgJnN0YXR1cyksIDEwKTsKKwkvKgorCSAqIEZhc3QgY29tbWFu ZHMgc2hvdWxkIGNvbXBsZXRlIGluIGxlc3MgdGhhbiAxMHVzLCBzbyBzYW1wbGUgcXVpY2tseQor CSAqIHVwIHRvIHRoYXQgbGVuZ3RoIG9mIHRpbWUsIHRoZW4gc3dpdGNoIHRvIGEgc2xvd2VyIHNs ZWVwLXdhaXQgbG9vcC4KKwkgKiBObyBIT1NUMkdVQyBjb21tYW5kIHNob3VsZCBldmVyIHRha2Ug bG9uZ2VyIHRoYW4gMTBtcy4KKwkgKi8KKwlyZXQgPSB3YWl0X2Zvcl91cyhob3N0Mmd1Y19hY3Rp b25fcmVzcG9uc2UoZGV2X3ByaXYsICZzdGF0dXMpLCAxMCk7CisJaWYgKHJldCkKKwkJcmV0ID0g d2FpdF9mb3IoaG9zdDJndWNfYWN0aW9uX3Jlc3BvbnNlKGRldl9wcml2LCAmc3RhdHVzKSwgMTAp OwogCWlmIChzdGF0dXMgIT0gR1VDMkhPU1RfU1RBVFVTX1NVQ0NFU1MpIHsKIAkJLyoKIAkJICog RWl0aGVyIHRoZSBHdUMgZXhwbGljaXRseSByZXR1cm5lZCBhbiBlcnJvciAod2hpY2gKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK