From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 1/4] drm/atomic: integrate modeset lock with private objects Date: Wed, 21 Feb 2018 17:54:10 +0200 Message-ID: <20180221155410.GQ5453@intel.com> References: <20180221143730.30285-1-robdclark@gmail.com> <20180221143730.30285-2-robdclark@gmail.com> <20180221144919.GN5453@intel.com> <20180221150727.GO5453@intel.com> <20180221152720.GP5453@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Rob Clark Cc: David Airlie , linux-arm-msm , Linux Kernel Mailing List , dri-devel List-Id: linux-arm-msm@vger.kernel.org T24gV2VkLCBGZWIgMjEsIDIwMTggYXQgMTA6MzY6MDZBTSAtMDUwMCwgUm9iIENsYXJrIHdyb3Rl Ogo+IE9uIFdlZCwgRmViIDIxLCAyMDE4IGF0IDEwOjI3IEFNLCBWaWxsZSBTeXJqw6Rsw6QKPiA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+IHdyb3RlOgo+ID4gT24gV2VkLCBGZWIgMjEs IDIwMTggYXQgMTA6MjA6MDNBTSAtMDUwMCwgUm9iIENsYXJrIHdyb3RlOgo+ID4+IE9uIFdlZCwg RmViIDIxLCAyMDE4IGF0IDEwOjA3IEFNLCBWaWxsZSBTeXJqw6Rsw6QKPiA+PiA8dmlsbGUuc3ly amFsYUBsaW51eC5pbnRlbC5jb20+IHdyb3RlOgo+ID4+ID4gT24gV2VkLCBGZWIgMjEsIDIwMTgg YXQgMDk6NTQ6NDlBTSAtMDUwMCwgUm9iIENsYXJrIHdyb3RlOgo+ID4+ID4+IE9uIFdlZCwgRmVi IDIxLCAyMDE4IGF0IDk6NDkgQU0sIFZpbGxlIFN5cmrDpGzDpAo+ID4+ID4+IDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4gPj4gPj4gPiBPbiBXZWQsIEZlYiAyMSwgMjAx OCBhdCAwOTozNzoyMUFNIC0wNTAwLCBSb2IgQ2xhcmsgd3JvdGU6Cj4gPj4gPj4gPj4gRm9sbG93 IHRoZSBzYW1lIHBhdHRlcm4gb2YgbG9ja2luZyBhcyB3aXRoIG90aGVyIHN0YXRlIG9iamVjdHMu ICBUaGlzCj4gPj4gPj4gPj4gYXZvaWRzIGJvaWxlcnBsYXRlIGluIHRoZSBkcml2ZXIuCj4gPj4g Pj4gPgo+ID4+ID4+ID4gSSdtIG5vdCBzdXJlIHdlIHJlYWxseSB3YW50IHRvIGRvIHRoaXMuIFdo YXQgaWYgdGhlIGRyaXZlciB3YW50cyBhCj4gPj4gPj4gPiBjdXN0b20gbG9ja2luZyBzY2hlbWUg Zm9yIHRoaXMgc3RhdGU/Cj4gPj4gPj4KPiA+PiA+PiBUaGF0IHNlZW1zIGxpa2Ugc29tZXRoaW5n IHdlIHdhbnQgdG8gZGlzY291cmFnZSwgaWUuIGFsbCB0aGUgbW9yZQo+ID4+ID4+IHJlYXNvbiBm b3IgdGhpcyBwYXRjaC4KPiA+PiA+Pgo+ID4+ID4+IFRoZXJlIGlzIG5vIHJlYXNvbiBkcml2ZXJz IGNvdWxkIG5vdCBzcGxpdCB0aGVpciBnbG9iYWwgc3RhdGUgaW50bwo+ID4+ID4+IG11bHRpcGxl IHByaXZhdGUgb2JqcydzLCBlYWNoIHdpdGggdGhlaXIgb3duIGxvY2ssIGZvciBtb3JlIGZpbmUK PiA+PiA+PiBncmFpbmVkIGxvY2tpbmcuICBUaGF0IGlzIGJhc2ljYWxseSB0aGUgb25seSB2YWxp ZCByZWFzb24gSSBjYW4gdGhpbmsKPiA+PiA+PiBvZiBmb3IgImN1c3RvbSBsb2NraW5nIi4KPiA+ PiA+Cj4gPj4gPiBJbiBpOTE1IHdlIGhhdmUgYXQgbGVhc3Qgb25lIGNhc2UgdGhhdCB3b3VsZCB3 YW50IHNvbWV0aGluZyBjbG9zZSB0byBhbgo+ID4+ID4gcndsb2NrLiBBbnkgY3J0YyBsb2NrIGlz IGVub3VnaCBmb3IgcmVhZCwgbmVlZCBhbGwgb2YgdGhlbSBmb3Igd3JpdGUuCj4gPj4gPiBUaG91 Z2ggaWYgd2Ugd2FudGVkIHRvIHVzZSBwcml2YXRlIG9ianMgZm9yIHRoYXQgd2UgbWlnaHQgbmVl ZCB0bwo+ID4+ID4gYWN0dWFsbHkgbWFrZSB0aGUgc3RhdGVzIHJlZmNvdW50ZWQgYXMgd2VsbCwg b3RoZXJ3aXNlIEkgY2FuIGltYWdpbmUKPiA+PiA+IHdlIG1pZ2h0IGxhbmQgaW4gc29tZSB1c2Ut YWZ0ZXItZnJlZSBpc3N1ZXMgb25jZSBhZ2Fpbi4KPiA+PiA+Cj4gPj4gPiBNYXliZSB3ZSBjb3Vs ZCBkdXBsaWNhdGUgdGhlIHN0YXRlIGludG8gcGVyLWNydGMgYW5kIGdsb2JhbCBjb3BpZXMsIGJ1 dAo+ID4+ID4gdGhlbiB3ZSBoYXZlIHRvIGtlZXAgYWxsIG9mIHRob3NlIGluIHN5bmMgc29tZWhv dyB3aGljaCBkb2Vzbid0IHNvdW5kCj4gPj4gPiBwYXJ0aWN1bGFybHkgcGxlYXNhbnQuCj4gPj4K PiA+PiBPciBqdXN0IGtlZXAgeW91ciBvd24gZHJpdmVyIGxvY2sgZm9yIHJlYWQsIGFuZCB1c2Ug dGhhdCBwbHVzIHRoZSBjb3JlCj4gPj4gbW9kZXNldCBsb2NrIGZvciB3cml0ZT8KPiA+Cj4gPiBJ ZiB3ZSBjYW4ndCBhZGQgdGhlIHByaXZhdGUgb2JqIHRvIHRoZSBzdGF0ZSB3ZSBjYW4ndCByZWFs bHkgdXNlIGl0Lgo+ID4KPiAKPiBJJ20gbm90IHN1cmUgd2h5IHRoYXQgaXMgc3RyaWN0bHkgdHJ1 ZSAodGhhdCB5b3UgbmVlZCB0byBhZGQgaXQgdG8gdGhlCj4gc3RhdGUgaWYgZm9yIHJlYWQtb25s eSksIHNpbmNlIHlvdSdkIGJlIGd1YXJkaW5nIGl0IHdpdGggeW91ciBvd24KPiBkcml2ZXIgcmVh ZC1sb2NrIHlvdSBjYW4ganVzdCBwcml2LT5mb29fc3RhdGUtPmJhci4KPiAKPiBTaW5jZSBpdCBp cyByZWFkLW9ubHkgYWNjZXNzLCB0aGVyZSBpcyBubyByb2xsLWJhY2sgdG8gd29ycnkgYWJvdXQg Zm9yCj4gdGVzdC1vbmx5IG9yIGZhaWxlZCBhdG9taWNfY2hlY2soKXMuLgoKVGhhdCB3b3VsZCBi ZSBzdXBlciB1Z2x5LiBXZSB3YW50IHRvIGFjY2VzcyB0aGUgaW5mb3JtYXRpb24gdGhlIHNhbWUK d2F5IHdoZXRoZXIgaXQgaGFzIGJlZW4gbW9kaWZpZWQgb3Igbm90LgoKPiAKPiBCUiwKPiAtUgo+ IAo+IAo+ID4+Cj4gPj4gQlIsCj4gPj4gLVIKPiA+Pgo+ID4+ID4KPiA+PiA+Pgo+ID4+ID4+IChB bmQgb2ZjIGRyaXZlcnMgY291bGQgYWRkIHRoZXJlIG93biBsb2NrcyBpbiBhZGRpdGlvbiB0byB3 aGF0IGlzIGRvbmUKPiA+PiA+PiBieSBjb3JlLCBidXQgSSdkIHJhdGhlciBsb29rIGF0IHRoYXQg b24gYSBjYXNlIGJ5IGNhc2UgYmFzaXMsIHJhdGhlcgo+ID4+ID4+IHRoYW4gaXQgYmVpbmcgcGFy dCBvZiB0aGUgYm9pbGVycGxhdGUgaW4gZWFjaCBkcml2ZXIuKQo+ID4+ID4+Cj4gPj4gPj4gQlIs Cj4gPj4gPj4gLVIKPiA+PiA+Pgo+ID4+ID4+ID4+Cj4gPj4gPj4gPj4gU2lnbmVkLW9mZi1ieTog Um9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwuY29tPgo+ID4+ID4+ID4+IC0tLQo+ID4+ID4+ID4+ ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jIHwgOSArKysrKysrKy0KPiA+PiA+PiA+PiAg aW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oICAgICB8IDUgKysrKysKPiA+PiA+PiA+PiAgMiBmaWxl cyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCj4gPj4gPj4gPj4KPiA+ PiA+PiA+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiA+PiA+PiA+PiBpbmRleCBmYzhjNGRhNDA5ZmYuLjAw NGU2MjFhYjMwNyAxMDA2NDQKPiA+PiA+PiA+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pYy5jCj4gPj4gPj4gPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+ID4+ ID4+ID4+IEBAIC0xMDc4LDYgKzEwNzgsOCBAQCBkcm1fYXRvbWljX3ByaXZhdGVfb2JqX2luaXQo c3RydWN0IGRybV9wcml2YXRlX29iaiAqb2JqLAo+ID4+ID4+ID4+ICB7Cj4gPj4gPj4gPj4gICAg ICAgbWVtc2V0KG9iaiwgMCwgc2l6ZW9mKCpvYmopKTsKPiA+PiA+PiA+Pgo+ID4+ID4+ID4+ICsg ICAgIGRybV9tb2Rlc2V0X2xvY2tfaW5pdCgmb2JqLT5sb2NrKTsKPiA+PiA+PiA+PiArCj4gPj4g Pj4gPj4gICAgICAgb2JqLT5zdGF0ZSA9IHN0YXRlOwo+ID4+ID4+ID4+ICAgICAgIG9iai0+ZnVu Y3MgPSBmdW5jczsKPiA+PiA+PiA+PiAgfQo+ID4+ID4+ID4+IEBAIC0xMDkzLDYgKzEwOTUsNyBA QCB2b2lkCj4gPj4gPj4gPj4gIGRybV9hdG9taWNfcHJpdmF0ZV9vYmpfZmluaShzdHJ1Y3QgZHJt X3ByaXZhdGVfb2JqICpvYmopCj4gPj4gPj4gPj4gIHsKPiA+PiA+PiA+PiAgICAgICBvYmotPmZ1 bmNzLT5hdG9taWNfZGVzdHJveV9zdGF0ZShvYmosIG9iai0+c3RhdGUpOwo+ID4+ID4+ID4+ICsg ICAgIGRybV9tb2Rlc2V0X2xvY2tfZmluaSgmb2JqLT5sb2NrKTsKPiA+PiA+PiA+PiAgfQo+ID4+ ID4+ID4+ICBFWFBPUlRfU1lNQk9MKGRybV9hdG9taWNfcHJpdmF0ZV9vYmpfZmluaSk7Cj4gPj4g Pj4gPj4KPiA+PiA+PiA+PiBAQCAtMTExMyw3ICsxMTE2LDcgQEAgc3RydWN0IGRybV9wcml2YXRl X3N0YXRlICoKPiA+PiA+PiA+PiAgZHJtX2F0b21pY19nZXRfcHJpdmF0ZV9vYmpfc3RhdGUoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ID4+ID4+ID4+ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzdHJ1Y3QgZHJtX3ByaXZhdGVfb2JqICpvYmopCj4gPj4gPj4gPj4gIHsK PiA+PiA+PiA+PiAtICAgICBpbnQgaW5kZXgsIG51bV9vYmpzLCBpOwo+ID4+ID4+ID4+ICsgICAg IGludCBpbmRleCwgbnVtX29ianMsIGksIHJldDsKPiA+PiA+PiA+PiAgICAgICBzaXplX3Qgc2l6 ZTsKPiA+PiA+PiA+PiAgICAgICBzdHJ1Y3QgX19kcm1fcHJpdmF0ZV9vYmpzX3N0YXRlICphcnI7 Cj4gPj4gPj4gPj4gICAgICAgc3RydWN0IGRybV9wcml2YXRlX3N0YXRlICpvYmpfc3RhdGU7Cj4g Pj4gPj4gPj4gQEAgLTExMjIsNiArMTEyNSwxMCBAQCBkcm1fYXRvbWljX2dldF9wcml2YXRlX29i al9zdGF0ZShzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCj4gPj4gPj4gPj4gICAgICAg ICAgICAgICBpZiAob2JqID09IHN0YXRlLT5wcml2YXRlX29ianNbaV0ucHRyKQo+ID4+ID4+ID4+ ICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gc3RhdGUtPnByaXZhdGVfb2Jqc1tpXS5zdGF0 ZTsKPiA+PiA+PiA+Pgo+ID4+ID4+ID4+ICsgICAgIHJldCA9IGRybV9tb2Rlc2V0X2xvY2soJm9i ai0+bG9jaywgc3RhdGUtPmFjcXVpcmVfY3R4KTsKPiA+PiA+PiA+PiArICAgICBpZiAocmV0KQo+ ID4+ID4+ID4+ICsgICAgICAgICAgICAgcmV0dXJuIEVSUl9QVFIocmV0KTsKPiA+PiA+PiA+PiAr Cj4gPj4gPj4gPj4gICAgICAgbnVtX29ianMgPSBzdGF0ZS0+bnVtX3ByaXZhdGVfb2JqcyArIDE7 Cj4gPj4gPj4gPj4gICAgICAgc2l6ZSA9IHNpemVvZigqc3RhdGUtPnByaXZhdGVfb2JqcykgKiBu dW1fb2JqczsKPiA+PiA+PiA+PiAgICAgICBhcnIgPSBrcmVhbGxvYyhzdGF0ZS0+cHJpdmF0ZV9v YmpzLCBzaXplLCBHRlBfS0VSTkVMKTsKPiA+PiA+PiA+PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9k cm0vZHJtX2F0b21pYy5oIGIvaW5jbHVkZS9kcm0vZHJtX2F0b21pYy5oCj4gPj4gPj4gPj4gaW5k ZXggMDkwNzZhNjI1NjM3Li45YWU1M2I3M2M5ZDIgMTAwNjQ0Cj4gPj4gPj4gPj4gLS0tIGEvaW5j bHVkZS9kcm0vZHJtX2F0b21pYy5oCj4gPj4gPj4gPj4gKysrIGIvaW5jbHVkZS9kcm0vZHJtX2F0 b21pYy5oCj4gPj4gPj4gPj4gQEAgLTIxOCw2ICsyMTgsMTEgQEAgc3RydWN0IGRybV9wcml2YXRl X3N0YXRlX2Z1bmNzIHsKPiA+PiA+PiA+PiAgICogJmRybV9tb2Rlc2V0X2xvY2sgaXMgcmVxdWly ZWQgdG8gZHVwbGljYXRlIGFuZCB1cGRhdGUgdGhpcyBvYmplY3QncyBzdGF0ZS4KPiA+PiA+PiA+ PiAgICovCj4gPj4gPj4gPj4gIHN0cnVjdCBkcm1fcHJpdmF0ZV9vYmogewo+ID4+ID4+ID4+ICsg ICAgIC8qKgo+ID4+ID4+ID4+ICsgICAgICAqIEBsb2NrOiBNb2Rlc2V0IGxvY2sgdG8gcHJvdGVj dCB0aGUgc3RhdGUgb2JqZWN0Lgo+ID4+ID4+ID4+ICsgICAgICAqLwo+ID4+ID4+ID4+ICsgICAg IHN0cnVjdCBkcm1fbW9kZXNldF9sb2NrIGxvY2s7Cj4gPj4gPj4gPj4gKwo+ID4+ID4+ID4+ICAg ICAgIC8qKgo+ID4+ID4+ID4+ICAgICAgICAqIEBzdGF0ZTogQ3VycmVudCBhdG9taWMgc3RhdGUg Zm9yIHRoaXMgZHJpdmVyIHByaXZhdGUgb2JqZWN0Lgo+ID4+ID4+ID4+ICAgICAgICAqLwo+ID4+ ID4+ID4+IC0tCj4gPj4gPj4gPj4gMi4xNC4zCj4gPj4gPj4gPj4KPiA+PiA+PiA+PiBfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+ID4+ID4+ID4+IGRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKPiA+PiA+PiA+PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCj4gPj4gPj4gPj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwKPiA+PiA+PiA+Cj4gPj4gPj4gPiAtLQo+ID4+ID4+ID4gVmlsbGUgU3ly asOkbMOkCj4gPj4gPj4gPiBJbnRlbCBPVEMKPiA+PiA+Cj4gPj4gPiAtLQo+ID4+ID4gVmlsbGUg U3lyasOkbMOkCj4gPj4gPiBJbnRlbCBPVEMKPiA+Cj4gPiAtLQo+ID4gVmlsbGUgU3lyasOkbMOk Cj4gPiBJbnRlbCBPVEMKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938427AbeBUPyP (ORCPT ); Wed, 21 Feb 2018 10:54:15 -0500 Received: from mga05.intel.com ([192.55.52.43]:64848 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937781AbeBUPyO (ORCPT ); Wed, 21 Feb 2018 10:54:14 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,543,1511856000"; d="scan'208";a="28781441" Date: Wed, 21 Feb 2018 17:54:10 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Rob Clark Cc: dri-devel , David Airlie , linux-arm-msm , Linux Kernel Mailing List Subject: Re: [PATCH 1/4] drm/atomic: integrate modeset lock with private objects Message-ID: <20180221155410.GQ5453@intel.com> References: <20180221143730.30285-1-robdclark@gmail.com> <20180221143730.30285-2-robdclark@gmail.com> <20180221144919.GN5453@intel.com> <20180221150727.GO5453@intel.com> <20180221152720.GP5453@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.7.2 (2016-11-26) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 21, 2018 at 10:36:06AM -0500, Rob Clark wrote: > On Wed, Feb 21, 2018 at 10:27 AM, Ville Syrjälä > wrote: > > On Wed, Feb 21, 2018 at 10:20:03AM -0500, Rob Clark wrote: > >> On Wed, Feb 21, 2018 at 10:07 AM, Ville Syrjälä > >> wrote: > >> > On Wed, Feb 21, 2018 at 09:54:49AM -0500, Rob Clark wrote: > >> >> On Wed, Feb 21, 2018 at 9:49 AM, Ville Syrjälä > >> >> wrote: > >> >> > On Wed, Feb 21, 2018 at 09:37:21AM -0500, Rob Clark wrote: > >> >> >> Follow the same pattern of locking as with other state objects. This > >> >> >> avoids boilerplate in the driver. > >> >> > > >> >> > I'm not sure we really want to do this. What if the driver wants a > >> >> > custom locking scheme for this state? > >> >> > >> >> That seems like something we want to discourage, ie. all the more > >> >> reason for this patch. > >> >> > >> >> There is no reason drivers could not split their global state into > >> >> multiple private objs's, each with their own lock, for more fine > >> >> grained locking. That is basically the only valid reason I can think > >> >> of for "custom locking". > >> > > >> > In i915 we have at least one case that would want something close to an > >> > rwlock. Any crtc lock is enough for read, need all of them for write. > >> > Though if we wanted to use private objs for that we might need to > >> > actually make the states refcounted as well, otherwise I can imagine > >> > we might land in some use-after-free issues once again. > >> > > >> > Maybe we could duplicate the state into per-crtc and global copies, but > >> > then we have to keep all of those in sync somehow which doesn't sound > >> > particularly pleasant. > >> > >> Or just keep your own driver lock for read, and use that plus the core > >> modeset lock for write? > > > > If we can't add the private obj to the state we can't really use it. > > > > I'm not sure why that is strictly true (that you need to add it to the > state if for read-only), since you'd be guarding it with your own > driver read-lock you can just priv->foo_state->bar. > > Since it is read-only access, there is no roll-back to worry about for > test-only or failed atomic_check()s.. That would be super ugly. We want to access the information the same way whether it has been modified or not. > > BR, > -R > > > >> > >> BR, > >> -R > >> > >> > > >> >> > >> >> (And ofc drivers could add there own locks in addition to what is done > >> >> by core, but I'd rather look at that on a case by case basis, rather > >> >> than it being part of the boilerplate in each driver.) > >> >> > >> >> BR, > >> >> -R > >> >> > >> >> >> > >> >> >> Signed-off-by: Rob Clark > >> >> >> --- > >> >> >> drivers/gpu/drm/drm_atomic.c | 9 ++++++++- > >> >> >> include/drm/drm_atomic.h | 5 +++++ > >> >> >> 2 files changed, 13 insertions(+), 1 deletion(-) > >> >> >> > >> >> >> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > >> >> >> index fc8c4da409ff..004e621ab307 100644 > >> >> >> --- a/drivers/gpu/drm/drm_atomic.c > >> >> >> +++ b/drivers/gpu/drm/drm_atomic.c > >> >> >> @@ -1078,6 +1078,8 @@ drm_atomic_private_obj_init(struct drm_private_obj *obj, > >> >> >> { > >> >> >> memset(obj, 0, sizeof(*obj)); > >> >> >> > >> >> >> + drm_modeset_lock_init(&obj->lock); > >> >> >> + > >> >> >> obj->state = state; > >> >> >> obj->funcs = funcs; > >> >> >> } > >> >> >> @@ -1093,6 +1095,7 @@ void > >> >> >> drm_atomic_private_obj_fini(struct drm_private_obj *obj) > >> >> >> { > >> >> >> obj->funcs->atomic_destroy_state(obj, obj->state); > >> >> >> + drm_modeset_lock_fini(&obj->lock); > >> >> >> } > >> >> >> EXPORT_SYMBOL(drm_atomic_private_obj_fini); > >> >> >> > >> >> >> @@ -1113,7 +1116,7 @@ struct drm_private_state * > >> >> >> drm_atomic_get_private_obj_state(struct drm_atomic_state *state, > >> >> >> struct drm_private_obj *obj) > >> >> >> { > >> >> >> - int index, num_objs, i; > >> >> >> + int index, num_objs, i, ret; > >> >> >> size_t size; > >> >> >> struct __drm_private_objs_state *arr; > >> >> >> struct drm_private_state *obj_state; > >> >> >> @@ -1122,6 +1125,10 @@ drm_atomic_get_private_obj_state(struct drm_atomic_state *state, > >> >> >> if (obj == state->private_objs[i].ptr) > >> >> >> return state->private_objs[i].state; > >> >> >> > >> >> >> + ret = drm_modeset_lock(&obj->lock, state->acquire_ctx); > >> >> >> + if (ret) > >> >> >> + return ERR_PTR(ret); > >> >> >> + > >> >> >> num_objs = state->num_private_objs + 1; > >> >> >> size = sizeof(*state->private_objs) * num_objs; > >> >> >> arr = krealloc(state->private_objs, size, GFP_KERNEL); > >> >> >> diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h > >> >> >> index 09076a625637..9ae53b73c9d2 100644 > >> >> >> --- a/include/drm/drm_atomic.h > >> >> >> +++ b/include/drm/drm_atomic.h > >> >> >> @@ -218,6 +218,11 @@ struct drm_private_state_funcs { > >> >> >> * &drm_modeset_lock is required to duplicate and update this object's state. > >> >> >> */ > >> >> >> struct drm_private_obj { > >> >> >> + /** > >> >> >> + * @lock: Modeset lock to protect the state object. > >> >> >> + */ > >> >> >> + struct drm_modeset_lock lock; > >> >> >> + > >> >> >> /** > >> >> >> * @state: Current atomic state for this driver private object. > >> >> >> */ > >> >> >> -- > >> >> >> 2.14.3 > >> >> >> > >> >> >> _______________________________________________ > >> >> >> dri-devel mailing list > >> >> >> dri-devel@lists.freedesktop.org > >> >> >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >> >> > > >> >> > -- > >> >> > Ville Syrjälä > >> >> > Intel OTC > >> > > >> > -- > >> > Ville Syrjälä > >> > Intel OTC > > > > -- > > Ville Syrjälä > > Intel OTC -- Ville Syrjälä Intel OTC