From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/2] drm/atomic: Cleanup on error properly in the atomic ioctl. Date: Tue, 7 Jul 2015 08:56:12 +0200 Message-ID: <20150707065612.GR7568@phenom.ffwll.local> References: <1435129165-21537-1-git-send-email-maarten.lankhorst@linux.intel.com> <1435129165-21537-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-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03D056E0C8 for ; Mon, 6 Jul 2015 23:53:28 -0700 (PDT) Received: by wiga1 with SMTP id a1so247435731wig.0 for ; Mon, 06 Jul 2015 23:53:26 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1435129165-21537-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, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBKdW4gMjQsIDIwMTUgYXQgMDg6NTk6MjVBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gSXQncyBwcm9iYWJseSBhbGxvd2VkIHRvIGxlYXZlIG9sZF9mYiBzZXQgdG8g Z2FyYmFnZSB3aGVuIHVubG9ja2luZywKPiBidXQgdG8gcHJldmVudCB1bmRlZmluZWQgYmVoYXZp b3IgdW5zZXQgaXQganVzdCBpbiBjYXNlLgo+IAo+IEFsc28gY3J0Y19zdGF0ZS0+ZXZlbnQgY291 bGQgYmUgTlVMTCBvbiBtZW1vcnkgYWxsb2NhdGlvbiBmYWlsdXJlLAo+IGluIHdoaWNoIGNhc2Ug ZXZlbnRfc3BhY2UgaXMgaW5jcmVhc2VkIGZvciBubyByZWFzb24uCj4gCj4gU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K CkdydW1weSByZXZpZXdlciBjb21tZW50OiBZb3UndmUgZmFpbGVkIHRvIG1lbnRpb24gdGhhdCB5 b3UgcmV3b3JrIGEgZmV3CnRoaW5ncyBqdXN0IGJlY2F1c2UsIG1ha2VzIGl0IGhhcmRlciB0byBz cG90IHRoZSBhY3R1YWwgY2hhbmdlcy4gQW55d2F5LAphcHBsaWVkIHRvIGRybS1taXNjLgotRGFu aWVsCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jIHwgNjMgKysrKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDI5 IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+IGlu ZGV4IGJkN2Y3MjNjNzA4ZS4uYTg5ZjczZjFkY2ExIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9kcm1fYXRvbWljLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCj4g QEAgLTE0NjMsMTggKzE0NjMsMTggQEAgcmV0cnk6Cj4gIAo+ICAJCWlmIChnZXRfdXNlcihvYmpf aWQsIG9ianNfcHRyICsgY29waWVkX29ianMpKSB7Cj4gIAkJCXJldCA9IC1FRkFVTFQ7Cj4gLQkJ CWdvdG8gZmFpbDsKPiArCQkJZ290byBvdXQ7Cj4gIAkJfQo+ICAKPiAgCQlvYmogPSBkcm1fbW9k ZV9vYmplY3RfZmluZChkZXYsIG9ial9pZCwgRFJNX01PREVfT0JKRUNUX0FOWSk7Cj4gIAkJaWYg KCFvYmogfHwgIW9iai0+cHJvcGVydGllcykgewo+ICAJCQlyZXQgPSAtRU5PRU5UOwo+IC0JCQln b3RvIGZhaWw7Cj4gKwkJCWdvdG8gb3V0Owo+ICAJCX0KPiAgCj4gIAkJaWYgKGdldF91c2VyKGNv dW50X3Byb3BzLCBjb3VudF9wcm9wc19wdHIgKyBjb3BpZWRfb2JqcykpIHsKPiAgCQkJcmV0ID0g LUVGQVVMVDsKPiAtCQkJZ290byBmYWlsOwo+ICsJCQlnb3RvIG91dDsKPiAgCQl9Cj4gIAo+ICAJ CWNvcGllZF9vYmpzKys7Cj4gQEAgLTE0ODYsMjUgKzE0ODYsMjUgQEAgcmV0cnk6Cj4gIAo+ICAJ CQlpZiAoZ2V0X3VzZXIocHJvcF9pZCwgcHJvcHNfcHRyICsgY29waWVkX3Byb3BzKSkgewo+ICAJ CQkJcmV0ID0gLUVGQVVMVDsKPiAtCQkJCWdvdG8gZmFpbDsKPiArCQkJCWdvdG8gb3V0Owo+ICAJ CQl9Cj4gIAo+ICAJCQlwcm9wID0gZHJtX3Byb3BlcnR5X2ZpbmQoZGV2LCBwcm9wX2lkKTsKPiAg CQkJaWYgKCFwcm9wKSB7Cj4gIAkJCQlyZXQgPSAtRU5PRU5UOwo+IC0JCQkJZ290byBmYWlsOwo+ ICsJCQkJZ290byBvdXQ7Cj4gIAkJCX0KPiAgCj4gIAkJCWlmIChjb3B5X2Zyb21fdXNlcigmcHJv cF92YWx1ZSwKPiAgCQkJCQkgICBwcm9wX3ZhbHVlc19wdHIgKyBjb3BpZWRfcHJvcHMsCj4gIAkJ CQkJICAgc2l6ZW9mKHByb3BfdmFsdWUpKSkgewo+ICAJCQkJcmV0ID0gLUVGQVVMVDsKPiAtCQkJ CWdvdG8gZmFpbDsKPiArCQkJCWdvdG8gb3V0Owo+ICAJCQl9Cj4gIAo+ICAJCQlyZXQgPSBhdG9t aWNfc2V0X3Byb3Aoc3RhdGUsIG9iaiwgcHJvcCwgcHJvcF92YWx1ZSk7Cj4gIAkJCWlmIChyZXQp Cj4gLQkJCQlnb3RvIGZhaWw7Cj4gKwkJCQlnb3RvIG91dDsKPiAgCj4gIAkJCWNvcGllZF9wcm9w cysrOwo+ICAJCX0KPiBAQCAtMTUyMyw3ICsxNTIzLDcgQEAgcmV0cnk6Cj4gIAkJCWUgPSBjcmVh dGVfdmJsYW5rX2V2ZW50KGRldiwgZmlsZV9wcml2LCBhcmctPnVzZXJfZGF0YSk7Cj4gIAkJCWlm ICghZSkgewo+ICAJCQkJcmV0ID0gLUVOT01FTTsKPiAtCQkJCWdvdG8gZmFpbDsKPiArCQkJCWdv dG8gb3V0Owo+ICAJCQl9Cj4gIAo+ICAJCQljcnRjX3N0YXRlLT5ldmVudCA9IGU7Cj4gQEAgLTE1 MzMsMTMgKzE1MzMsMTUgQEAgcmV0cnk6Cj4gIAlpZiAoYXJnLT5mbGFncyAmIERSTV9NT0RFX0FU T01JQ19URVNUX09OTFkpIHsKPiAgCQlyZXQgPSBkcm1fYXRvbWljX2NoZWNrX29ubHkoc3RhdGUp Owo+ICAJCS8qIF9jaGVja19vbmx5KCkgZG9lcyBub3QgZnJlZSBzdGF0ZSwgdW5saWtlIF9jb21t aXQoKSAqLwo+IC0JCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4gKwkJaWYgKCFyZXQp Cj4gKwkJCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4gIAl9IGVsc2UgaWYgKGFyZy0+ ZmxhZ3MgJiBEUk1fTU9ERV9BVE9NSUNfTk9OQkxPQ0spIHsKPiAgCQlyZXQgPSBkcm1fYXRvbWlj X2FzeW5jX2NvbW1pdChzdGF0ZSk7Cj4gIAl9IGVsc2Ugewo+ICAJCXJldCA9IGRybV9hdG9taWNf Y29tbWl0KHN0YXRlKTsKPiAgCX0KPiAgCj4gK291dDoKPiAgCS8qIGlmIHN1Y2NlZWRlZCwgZml4 dXAgbGVnYWN5IHBsYW5lIGNydGMvZmIgcHRycyBiZWZvcmUgZHJvcHBpbmcKPiAgCSAqIGxvY2tz IChpZS4gd2hpbGUgaXQgaXMgc3RpbGwgc2FmZSB0byBkZXJlZiBwbGFuZS0+c3RhdGUpLiAgV2UK PiAgCSAqIG5lZWQgdG8gZG8gdGhpcyBoZXJlIGJlY2F1c2UgdGhlIGRyaXZlciBlbnRyeSBwb2lu dHMgY2Fubm90Cj4gQEAgLTE1NTIsNDEgKzE1NTQsMzQgQEAgcmV0cnk6Cj4gIAkJCQlkcm1fZnJh bWVidWZmZXJfcmVmZXJlbmNlKG5ld19mYik7Cj4gIAkJCXBsYW5lLT5mYiA9IG5ld19mYjsKPiAg CQkJcGxhbmUtPmNydGMgPSBwbGFuZS0+c3RhdGUtPmNydGM7Cj4gLQkJfSBlbHNlIHsKPiAtCQkJ cGxhbmUtPm9sZF9mYiA9IE5VTEw7Cj4gLQkJfQo+IC0JCWlmIChwbGFuZS0+b2xkX2ZiKSB7Cj4g LQkJCWRybV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZShwbGFuZS0+b2xkX2ZiKTsKPiAtCQkJcGxh bmUtPm9sZF9mYiA9IE5VTEw7Cj4gKwo+ICsJCQlpZiAocGxhbmUtPm9sZF9mYikKPiArCQkJCWRy bV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZShwbGFuZS0+b2xkX2ZiKTsKPiAgCQl9Cj4gKwkJcGxh bmUtPm9sZF9mYiA9IE5VTEw7Cj4gIAl9Cj4gIAo+IC0JZHJtX21vZGVzZXRfZHJvcF9sb2Nrcygm Y3R4KTsKPiAtCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKPiAtCj4gLQlyZXR1cm4g cmV0Owo+ICsJaWYgKHJldCA9PSAtRURFQURMSykgewo+ICsJCWRybV9hdG9taWNfc3RhdGVfY2xl YXIoc3RhdGUpOwo+ICsJCWRybV9tb2Rlc2V0X2JhY2tvZmYoJmN0eCk7Cj4gKwkJZ290byByZXRy eTsKPiArCX0KPiAgCj4gLWZhaWw6Cj4gLQlpZiAocmV0ID09IC1FREVBRExLKQo+IC0JCWdvdG8g YmFja29mZjsKPiArCWlmIChyZXQpIHsKPiArCQlpZiAoYXJnLT5mbGFncyAmIERSTV9NT0RFX1BB R0VfRkxJUF9FVkVOVCkgewo+ICsJCQlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRj LCBjcnRjX3N0YXRlLCBpKSB7Cj4gKwkJCQlpZiAoIWNydGNfc3RhdGUtPmV2ZW50KQo+ICsJCQkJ CWNvbnRpbnVlOwo+ICAKPiAtCWlmIChhcmctPmZsYWdzICYgRFJNX01PREVfUEFHRV9GTElQX0VW RU5UKSB7Cj4gLQkJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0Y19zdGF0 ZSwgaSkgewo+IC0JCQlkZXN0cm95X3ZibGFua19ldmVudChkZXYsIGZpbGVfcHJpdiwgY3J0Y19z dGF0ZS0+ZXZlbnQpOwo+IC0JCQljcnRjX3N0YXRlLT5ldmVudCA9IE5VTEw7Cj4gKwkJCQlkZXN0 cm95X3ZibGFua19ldmVudChkZXYsIGZpbGVfcHJpdiwgY3J0Y19zdGF0ZS0+ZXZlbnQpOwo+ICsJ CQl9Cj4gIAkJfQo+IC0JfQo+ICAKPiAtCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4g KwkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKPiArCX0KPiAgCj4gIAlkcm1fbW9kZXNl dF9kcm9wX2xvY2tzKCZjdHgpOwo+ICAJZHJtX21vZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOwo+ ICAKPiAgCXJldHVybiByZXQ7Cj4gLQo+IC1iYWNrb2ZmOgo+IC0JZHJtX2F0b21pY19zdGF0ZV9j bGVhcihzdGF0ZSk7Cj4gLQlkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgpOwo+IC0KPiAtCWdvdG8g cmV0cnk7Cj4gIH0KPiAtLSAKPiAyLjEuMAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdp bmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK