From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 01/12] drm/i915: Make the force_thru workaround atomic. Date: Mon, 27 Jul 2015 16:04:36 +0200 Message-ID: <20150727140436.GY16722@phenom.ffwll.local> References: <1438000541-3219-1-git-send-email-maarten.lankhorst@linux.intel.com> <1438000541-3219-2-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 mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id B310D6E963 for ; Mon, 27 Jul 2015 07:01:56 -0700 (PDT) Received: by wibud3 with SMTP id ud3so117386743wib.0 for ; Mon, 27 Jul 2015 07:01:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1438000541-3219-2-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: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBKdWwgMjcsIDIwMTUgYXQgMDI6MzU6MzBQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gU2V0IGFjdGl2ZV9jaGFuZ2VkIHRvIGZvcmNlIGEgbW9kZXNldCBpZiB0aGUg cGFuZWwgZml0dGVyJ3MgZm9yY2UKPiBlbmFibGVkLgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0 ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CgpIbSwgc2hv dWxkbid0IG91ciBmYW5jeSBmYXN0c2V0IGxvZ2ljIGJlIGFibGUgdG8gZGV0ZWN0IHRoYXQgd2Un dmUgY2hhbmdlZApwZml0IGNoYW5nZSBoZXJlIGFuZCBmb3JjZSBhIGZ1bGwgbW9kZXNldD8gT3Ig YW0gSSBibGluZCBhZ2Fpbj8KCkFidXNpbmcgYWN0aXZlX2NoYW5nZWQgZm9yIHRoaXMgZmVlbHMg YSBiaXQgdHJpY2tzeSB0YmgsIGNhbid0IHdlIHVzZQptb2RlX2NoYW5nZWQgZm9yIHRoaXM/IG1v ZGVfY2hhbmdlZCBpcyBraW5kYSBmb3IgImNydGMgY29uZmlndXJhdGlvbiB0aGF0Cm5lZWRzIGEg ZnVsbCBtb2Rlc2V0IGNoYW5nZWQiLCBub3QganVzdCBmb3IgbW9kZXMuIGFjdGl2ZV9jaGFuZ2Vk IGlzCiJlbmFibGUvZGlzYWJsZSBpdCwgYnV0IHN0cmljdGx5IHNwZWFraW5nIG5vIG5lZWQgdG8g cmVjb21wdXRlIHN0dWZmIi4KCkF0IGxlYXN0IHRoYXQncyBob3cgdGhlIGF0b21pYyBoZWxwZXJz IHRyZWF0IGl0LgotRGFuaWVsCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYyAgfCA4MiArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDMgKysKPiAgMiBmaWxlcyBjaGFu Z2VkLCAyNyBpbnNlcnRpb25zKCspLCA1OCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2RlYnVnZnMuYwo+IGluZGV4IDIzYTY5MzA3ZTEyZS4uMjI0NjdhZGVlOTU4IDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKPiBAQCAtMzY0NSw3NCArMzY0NSw0MCBA QCBzdGF0aWMgaW50IGlsa19waXBlX2NyY19jdGxfcmVnKGVudW0gaW50ZWxfcGlwZV9jcmNfc291 cmNlICpzb3VyY2UsCj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiAtc3RhdGljIHZvaWQgaHN3X3Ry YW5zX2VkcF9waXBlX0FfY3JjX3dhKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gK3N0YXRpYyB2 b2lkIGhzd190cmFuc19lZHBfcGlwZV9BX2NyY193YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBi b29sIGVuYWJsZSkKPiAgewo+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0KPiAgCQl0b19p bnRlbF9jcnRjKGRldl9wcml2LT5waXBlX3RvX2NydGNfbWFwcGluZ1tQSVBFX0FdKTsKPiAgCXN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZzsKPiArCXN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZTsKPiArCWludCByZXQgPSAwOwo+ICAKPiAgCWRybV9tb2Rlc2V0X2xvY2tf YWxsKGRldik7Cj4gLQlwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFz ZS5zdGF0ZSk7Cj4gLQo+IC0JLyoKPiAtCSAqIElmIHdlIHVzZSB0aGUgZURQIHRyYW5zY29kZXIg d2UgbmVlZCB0byBtYWtlIHN1cmUgdGhhdCB3ZSBkb24ndAo+IC0JICogYnlwYXNzIHRoZSBwZml0 LCBzaW5jZSBvdGhlcndpc2UgdGhlIHBpcGUgQ1JDIHNvdXJjZSB3b24ndCB3b3JrLiBPbmx5Cj4g LQkgKiByZWxldmFudCBvbiBoc3cgd2l0aCBwaXBlIEEgd2hlbiB1c2luZyB0aGUgYWx3YXlzLW9u IHBvd2VyIHdlbGwKPiAtCSAqIHJvdXRpbmcuCj4gLQkgKi8KPiAtCWlmIChwaXBlX2NvbmZpZy0+ Y3B1X3RyYW5zY29kZXIgPT0gVFJBTlNDT0RFUl9FRFAgJiYKPiAtCSAgICAhcGlwZV9jb25maWct PnBjaF9wZml0LmVuYWJsZWQpIHsKPiAtCQlib29sIGFjdGl2ZSA9IHBpcGVfY29uZmlnLT5iYXNl LmFjdGl2ZTsKPiAtCj4gLQkJaWYgKGFjdGl2ZSkgewo+IC0JCQlpbnRlbF9jcnRjX2NvbnRyb2wo JmNydGMtPmJhc2UsIGZhbHNlKTsKPiAtCQkJcGlwZV9jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0 YXRlKGNydGMtPmJhc2Uuc3RhdGUpOwo+IC0JCX0KPiAtCj4gLQkJcGlwZV9jb25maWctPnBjaF9w Zml0LmZvcmNlX3RocnUgPSB0cnVlOwo+IC0KPiAtCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChk ZXZfcHJpdiwKPiAtCQkJCQlQT1dFUl9ET01BSU5fUElQRV9QQU5FTF9GSVRURVIoUElQRV9BKSk7 Cj4gLQo+IC0JCWlmIChhY3RpdmUpCj4gLQkJCWludGVsX2NydGNfY29udHJvbCgmY3J0Yy0+YmFz ZSwgdHJ1ZSk7Cj4gKwlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKPiArCWlm ICghc3RhdGUpIHsKPiArCQlyZXQgPSAtRU5PTUVNOwo+ICsJCWdvdG8gb3V0Owo+ICAJfQo+IC0J ZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwo+IC19Cj4gIAo+IC1zdGF0aWMgdm9pZCBoc3df dW5kb190cmFuc19lZHBfcGlwZV9BX2NyY193YShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+IC17 Cj4gLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl Owo+IC0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPQo+IC0JCXRvX2ludGVsX2NydGMoZGV2X3By aXYtPnBpcGVfdG9fY3J0Y19tYXBwaW5nW1BJUEVfQV0pOwo+IC0Jc3RydWN0IGludGVsX2NydGNf c3RhdGUgKnBpcGVfY29uZmlnOwo+IC0KPiAtCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7Cj4g LQkvKgo+IC0JICogSWYgd2UgdXNlIHRoZSBlRFAgdHJhbnNjb2RlciB3ZSBuZWVkIHRvIG1ha2Ug c3VyZSB0aGF0IHdlIGRvbid0Cj4gLQkgKiBieXBhc3MgdGhlIHBmaXQsIHNpbmNlIG90aGVyd2lz ZSB0aGUgcGlwZSBDUkMgc291cmNlIHdvbid0IHdvcmsuIE9ubHkKPiAtCSAqIHJlbGV2YW50IG9u IGhzdyB3aXRoIHBpcGUgQSB3aGVuIHVzaW5nIHRoZSBhbHdheXMtb24gcG93ZXIgd2VsbAo+IC0J ICogcm91dGluZy4KPiAtCSAqLwo+IC0JcGlwZV9jb25maWcgPSB0b19pbnRlbF9jcnRjX3N0YXRl KGNydGMtPmJhc2Uuc3RhdGUpOwo+IC0JaWYgKHBpcGVfY29uZmlnLT5wY2hfcGZpdC5mb3JjZV90 aHJ1KSB7Cj4gLQkJYm9vbCBhY3RpdmUgPSBwaXBlX2NvbmZpZy0+YmFzZS5hY3RpdmU7Cj4gLQo+ IC0JCWlmIChhY3RpdmUpIHsKPiAtCQkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5iYXNlLCBm YWxzZSk7Cj4gLQkJCXBpcGVfY29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNl LnN0YXRlKTsKPiAtCQl9Cj4gLQo+IC0JCXBpcGVfY29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1 ID0gZmFsc2U7Cj4gKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSBkcm1fbW9kZXNldF9sZWdhY3lfYWNx dWlyZV9jdHgoJmNydGMtPmJhc2UpOwo+ICsJcGlwZV9jb25maWcgPSBpbnRlbF9hdG9taWNfZ2V0 X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwo+ICsJaWYgKElTX0VSUihwaXBlX2NvbmZpZykpIHsK PiArCQlyZXQgPSBQVFJfRVJSKHBpcGVfY29uZmlnKTsKPiArCQlnb3RvIG91dDsKPiArCX0KPiAg Cj4gLQkJaW50ZWxfZGlzcGxheV9wb3dlcl9wdXQoZGV2X3ByaXYsCj4gLQkJCQkJUE9XRVJfRE9N QUlOX1BJUEVfUEFORUxfRklUVEVSKFBJUEVfQSkpOwo+ICsJcGlwZV9jb25maWctPnBjaF9wZml0 LmZvcmNlX3RocnUgPSBlbmFibGU7Cj4gKwlpZiAocGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVy ID09IFRSQU5TQ09ERVJfRURQICYmCj4gKwkgICAgcGlwZV9jb25maWctPnBjaF9wZml0LmVuYWJs ZWQgIT0gZW5hYmxlKQo+ICsJCXBpcGVfY29uZmlnLT5iYXNlLmFjdGl2ZV9jaGFuZ2VkID0gdHJ1 ZTsKPiAgCj4gLQkJaWYgKGFjdGl2ZSkKPiAtCQkJaW50ZWxfY3J0Y19jb250cm9sKCZjcnRjLT5i YXNlLCB0cnVlKTsKPiAtCX0KPiArCXJldCA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKPiAr b3V0Ogo+ICAJZHJtX21vZGVzZXRfdW5sb2NrX2FsbChkZXYpOwo+ICsJV0FSTihyZXQsICJUb2dn bGluZyB3b3JrYXJvdW5kIHRvICVpIHJldHVybnMgJWlcbiIsIGVuYWJsZSwgcmV0KTsKPiArCWlm IChyZXQpCj4gKwkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKPiAgfQo+ICAKPiAgc3Rh dGljIGludCBpdmJfcGlwZV9jcmNfY3RsX3JlZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+IEBA IC0zNzMyLDcgKzM2OTgsNyBAQCBzdGF0aWMgaW50IGl2Yl9waXBlX2NyY19jdGxfcmVnKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJYnJlYWs7Cj4gIAljYXNlIElOVEVMX1BJUEVfQ1JDX1NP VVJDRV9QRjoKPiAgCQlpZiAoSVNfSEFTV0VMTChkZXYpICYmIHBpcGUgPT0gUElQRV9BKQo+IC0J CQloc3dfdHJhbnNfZWRwX3BpcGVfQV9jcmNfd2EoZGV2KTsKPiArCQkJaHN3X3RyYW5zX2VkcF9w aXBlX0FfY3JjX3dhKGRldiwgdHJ1ZSk7Cj4gIAo+ICAJCSp2YWwgPSBQSVBFX0NSQ19FTkFCTEUg fCBQSVBFX0NSQ19TT1VSQ0VfUEZfSVZCOwo+ICAJCWJyZWFrOwo+IEBAIC0zODQ0LDcgKzM4MTAs NyBAQCBzdGF0aWMgaW50IHBpcGVfY3JjX3NldF9zb3VyY2Uoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgZW51bSBwaXBlIHBpcGUsCj4gIAkJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQo+ICAJ CQl2bHZfdW5kb19waXBlX3NjcmFtYmxlX3Jlc2V0KGRldiwgcGlwZSk7Cj4gIAkJZWxzZSBpZiAo SVNfSEFTV0VMTChkZXYpICYmIHBpcGUgPT0gUElQRV9BKQo+IC0JCQloc3dfdW5kb190cmFuc19l ZHBfcGlwZV9BX2NyY193YShkZXYpOwo+ICsJCQloc3dfdHJhbnNfZWRwX3BpcGVfQV9jcmNfd2Eo ZGV2LCBmYWxzZSk7Cj4gIAo+ICAJCWhzd19lbmFibGVfaXBzKGNydGMpOwo+ICAJfQo+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA0M2IwZjE3YWQxZmEuLjc3NDc1MjBi ZjlmNiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMTIxNjAs NiArMTIxNjAsNyBAQCBjbGVhcl9pbnRlbF9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQo+ICAJc3RydWN0IGludGVsX2RwbGxfaHdfc3RhdGUgZHBsbF9od19z dGF0ZTsKPiAgCWVudW0gaW50ZWxfZHBsbF9pZCBzaGFyZWRfZHBsbDsKPiAgCXVpbnQzMl90IGRk aV9wbGxfc2VsOwo+ICsJYm9vbCBmb3JjZV90aHJ1Owo+ICAKPiAgCS8qIEZJWE1FOiBiZWZvcmUg dGhlIHN3aXRjaCB0byBhdG9taWMgc3RhcnRlZCwgYSBuZXcgcGlwZV9jb25maWcgd2FzCj4gIAkg KiBremFsbG9jJ2QuIENvZGUgdGhhdCBkZXBlbmRzIG9uIGFueSBmaWVsZCBiZWluZyB6ZXJvIHNo b3VsZCBiZQo+IEBAIC0xMjE3MSw2ICsxMjE3Miw3IEBAIGNsZWFyX2ludGVsX2NydGNfc3RhdGUo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCj4gIAlzaGFyZWRfZHBsbCA9IGNy dGNfc3RhdGUtPnNoYXJlZF9kcGxsOwo+ICAJZHBsbF9od19zdGF0ZSA9IGNydGNfc3RhdGUtPmRw bGxfaHdfc3RhdGU7Cj4gIAlkZGlfcGxsX3NlbCA9IGNydGNfc3RhdGUtPmRkaV9wbGxfc2VsOwo+ ICsJZm9yY2VfdGhydSA9IGNydGNfc3RhdGUtPnBjaF9wZml0LmZvcmNlX3RocnU7Cj4gIAo+ICAJ bWVtc2V0KGNydGNfc3RhdGUsIDAsIHNpemVvZiAqY3J0Y19zdGF0ZSk7Cj4gIAo+IEBAIC0xMjE3 OSw2ICsxMjE4MSw3IEBAIGNsZWFyX2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpCj4gIAljcnRjX3N0YXRlLT5zaGFyZWRfZHBsbCA9IHNoYXJlZF9k cGxsOwo+ICAJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZSA9IGRwbGxfaHdfc3RhdGU7Cj4gIAlj cnRjX3N0YXRlLT5kZGlfcGxsX3NlbCA9IGRkaV9wbGxfc2VsOwo+ICsJY3J0Y19zdGF0ZS0+cGNo X3BmaXQuZm9yY2VfdGhydSA9IGZvcmNlX3RocnU7Cj4gIH0KPiAgCj4gIHN0YXRpYyBpbnQKPiAt LSAKPiAyLjEuMAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29y cG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK