From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com ([134.134.136.65]:27978 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933604AbcJZNfz (ORCPT ); Wed, 26 Oct 2016 09:35:55 -0400 Date: Wed, 26 Oct 2016 16:35:50 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: dri-devel@lists.freedesktop.org Cc: "Kirill A . Shutemov" , stable@vger.kernel.org, Carlos Santa Subject: Re: [PATCH v2 3/4] drm/dp/mst: Clear port->pdt when tearing down the i2c adapter Message-ID: <20161026133550.GF4617@intel.com> References: <1477472755-15288-4-git-send-email-ville.syrjala@linux.intel.com> <1477488633-16544-1-git-send-email-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1477488633-16544-1-git-send-email-ville.syrjala@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Oct 26, 2016 at 04:30:33PM +0300, ville.syrjala@linux.intel.com wrote: > From: Ville Syrj�l� > > The i2c adapter is only relevant for some peer device types, so > let's clear the pdt if it's still the same as the old_pdt when we > tear down the i2c adapter. > > I don't really like this design pattern of updating port->whatever > before doing the accompanying changes and passing around old_whatever > to figure stuff out. Would make much more sense to me to the pass the > new value around and only update the port->whatever when things are > consistent. But let's try to work with what we have right now. > > v2: Clear port->pdt in the caller, if needed (Daniel) > > Cc: Daniel Vetter > Cc: stable@vger.kernel.org > Cc: Carlos Santa > Cc: Kirill A. Shutemov > Tested-by: Carlos Santa (v1) > Tested-by: Kirill A. Shutemov (v1) > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97666 > Signed-off-by: Ville Syrj�l� > --- > drivers/gpu/drm/drm_dp_mst_topology.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index 04e457117980..ba13f9d8720b 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -914,6 +914,7 @@ static void drm_dp_destroy_port(struct kref *kref) > /* no need to clean up vcpi > * as if we have no connector we never setup a vcpi */ > drm_dp_port_teardown_pdt(port, port->pdt); > + port->pdt = DP_PEER_DEVICE_NONE; And naturally I forgot to amend the commit message w.r.t. this guy. We don't really need to do this here, but I figured I'd try to be a bit more consistent by having it, just to avoid accidental mistakes if/when someone changes this stuff again later. > } > kfree(port); > } > @@ -2919,6 +2920,7 @@ static void drm_dp_destroy_connector_work(struct work_struct *work) > mgr->cbs->destroy_connector(mgr, port->connector); > > drm_dp_port_teardown_pdt(port, port->pdt); > + port->pdt = DP_PEER_DEVICE_NONE; > > if (!port->input && port->vcpi.vcpi > 0) { > drm_dp_mst_reset_vcpi_slots(mgr, port); > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrj�l� Intel OTC From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2 3/4] drm/dp/mst: Clear port->pdt when tearing down the i2c adapter Date: Wed, 26 Oct 2016 16:35:50 +0300 Message-ID: <20161026133550.GF4617@intel.com> References: <1477472755-15288-4-git-send-email-ville.syrjala@linux.intel.com> <1477488633-16544-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 419C06E046 for ; Wed, 26 Oct 2016 13:35:54 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1477488633-16544-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: "Kirill A . Shutemov" , Carlos Santa , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBPY3QgMjYsIDIwMTYgYXQgMDQ6MzA6MzNQTSArMDMwMCwgdmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KPiAKPiBUaGUgaTJjIGFkYXB0ZXIgaXMgb25seSByZWxldmFu dCBmb3Igc29tZSBwZWVyIGRldmljZSB0eXBlcywgc28KPiBsZXQncyBjbGVhciB0aGUgcGR0IGlm IGl0J3Mgc3RpbGwgdGhlIHNhbWUgYXMgdGhlIG9sZF9wZHQgd2hlbiB3ZQo+IHRlYXIgZG93biB0 aGUgaTJjIGFkYXB0ZXIuCj4gCj4gSSBkb24ndCByZWFsbHkgbGlrZSB0aGlzIGRlc2lnbiBwYXR0 ZXJuIG9mIHVwZGF0aW5nIHBvcnQtPndoYXRldmVyCj4gYmVmb3JlIGRvaW5nIHRoZSBhY2NvbXBh bnlpbmcgY2hhbmdlcyBhbmQgcGFzc2luZyBhcm91bmQgb2xkX3doYXRldmVyCj4gdG8gZmlndXJl IHN0dWZmIG91dC4gV291bGQgbWFrZSBtdWNoIG1vcmUgc2Vuc2UgdG8gbWUgdG8gdGhlIHBhc3Mg dGhlCj4gbmV3IHZhbHVlIGFyb3VuZCBhbmQgb25seSB1cGRhdGUgdGhlIHBvcnQtPndoYXRldmVy IHdoZW4gdGhpbmdzIGFyZQo+IGNvbnNpc3RlbnQuIEJ1dCBsZXQncyB0cnkgdG8gd29yayB3aXRo IHdoYXQgd2UgaGF2ZSByaWdodCBub3cuCj4gCj4gdjI6IENsZWFyIHBvcnQtPnBkdCBpbiB0aGUg Y2FsbGVyLCBpZiBuZWVkZWQgKERhbmllbCkKPiAKPiBDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVs QGZmd2xsLmNoPgo+IENjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCj4gQ2M6IENhcmxvcyBTYW50 YSA8Y2FybG9zLnNhbnRhQGludGVsLmNvbT4KPiBDYzogS2lyaWxsIEEuIFNodXRlbW92IDxraXJp bGxAc2h1dGVtb3YubmFtZT4KPiBUZXN0ZWQtYnk6IENhcmxvcyBTYW50YSA8Y2FybG9zLnNhbnRh QGludGVsLmNvbT4gKHYxKQo+IFRlc3RlZC1ieTogS2lyaWxsIEEuIFNodXRlbW92IDxraXJpbGxA c2h1dGVtb3YubmFtZT4gKHYxKQo+IEJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Au b3JnL3Nob3dfYnVnLmNnaT9pZD05NzY2Ngo+IFNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzD pCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2Ry bS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMgfCAyICsrCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2Vy dGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9kcF9tc3RfdG9w b2xvZ3kuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMKPiBpbmRleCAw NGU0NTcxMTc5ODAuLmJhMTNmOWQ4NzIwYiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX2RwX21zdF90b3BvbG9neS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9kcF9tc3Rf dG9wb2xvZ3kuYwo+IEBAIC05MTQsNiArOTE0LDcgQEAgc3RhdGljIHZvaWQgZHJtX2RwX2Rlc3Ry b3lfcG9ydChzdHJ1Y3Qga3JlZiAqa3JlZikKPiAgCQkvKiBubyBuZWVkIHRvIGNsZWFuIHVwIHZj cGkKPiAgCQkgKiBhcyBpZiB3ZSBoYXZlIG5vIGNvbm5lY3RvciB3ZSBuZXZlciBzZXR1cCBhIHZj cGkgKi8KPiAgCQlkcm1fZHBfcG9ydF90ZWFyZG93bl9wZHQocG9ydCwgcG9ydC0+cGR0KTsKPiAr CQlwb3J0LT5wZHQgPSBEUF9QRUVSX0RFVklDRV9OT05FOwoKQW5kIG5hdHVyYWxseSBJIGZvcmdv dCB0byBhbWVuZCB0aGUgY29tbWl0IG1lc3NhZ2Ugdy5yLnQuIHRoaXMgZ3V5LgpXZSBkb24ndCBy ZWFsbHkgbmVlZCB0byBkbyB0aGlzIGhlcmUsIGJ1dCBJIGZpZ3VyZWQgSSdkIHRyeSB0byBiZSBh CmJpdCBtb3JlIGNvbnNpc3RlbnQgYnkgaGF2aW5nIGl0LCBqdXN0IHRvIGF2b2lkIGFjY2lkZW50 YWwgbWlzdGFrZXMKaWYvd2hlbiBzb21lb25lIGNoYW5nZXMgdGhpcyBzdHVmZiBhZ2FpbiBsYXRl ci4KCj4gIAl9Cj4gIAlrZnJlZShwb3J0KTsKPiAgfQo+IEBAIC0yOTE5LDYgKzI5MjAsNyBAQCBz dGF0aWMgdm9pZCBkcm1fZHBfZGVzdHJveV9jb25uZWN0b3Jfd29yayhzdHJ1Y3Qgd29ya19zdHJ1 Y3QgKndvcmspCj4gIAkJbWdyLT5jYnMtPmRlc3Ryb3lfY29ubmVjdG9yKG1nciwgcG9ydC0+Y29u bmVjdG9yKTsKPiAgCj4gIAkJZHJtX2RwX3BvcnRfdGVhcmRvd25fcGR0KHBvcnQsIHBvcnQtPnBk dCk7Cj4gKwkJcG9ydC0+cGR0ID0gRFBfUEVFUl9ERVZJQ0VfTk9ORTsKPiAgCj4gIAkJaWYgKCFw b3J0LT5pbnB1dCAmJiBwb3J0LT52Y3BpLnZjcGkgPiAwKSB7Cj4gIAkJCWRybV9kcF9tc3RfcmVz ZXRfdmNwaV9zbG90cyhtZ3IsIHBvcnQpOwo+IC0tIAo+IDIuNy40Cj4gCj4gX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFpbGluZyBs aXN0Cj4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKVmlsbGUgU3lyasOk bMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK