From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH] drm: remove unnecessary fault wrappers Date: Mon, 30 Jan 2017 15:30:35 -0500 Message-ID: <20170130203035.GS20076@art_vandelay> References: <1485804002-27363-1-git-send-email-ross.zwisler@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x22c.google.com (mail-qk0-x22c.google.com [IPv6:2607:f8b0:400d:c09::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id DAAFB6E144 for ; Mon, 30 Jan 2017 20:30:38 +0000 (UTC) Received: by mail-qk0-x22c.google.com with SMTP id u25so142004277qki.2 for ; Mon, 30 Jan 2017 12:30:38 -0800 (PST) Content-Disposition: inline In-Reply-To: <1485804002-27363-1-git-send-email-ross.zwisler@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: Ross Zwisler Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBKYW4gMzAsIDIwMTcgYXQgMTI6MjA6MDJQTSAtMDcwMCwgUm9zcyBad2lzbGVyIHdy b3RlOgo+IFRoZSBmYXVsdCB3cmFwcGVycyBkcm1fdm1fZmF1bHQoKSwgZHJtX3ZtX3NobV9mYXVs dCgpLCBkcm1fdm1fZG1hX2ZhdWx0KCkKPiBhbmQgZHJtX3ZtX3NnX2ZhdWx0KCkgdXNlZCB0byBw cm92aWRlIGV4dHJhIGxvZ2ljIGJleW9uZCB3aGF0IHdhcyBpbiB0aGUKPiAiZHJtX2RvXyoiIHZl cnNpb25zIG9mIHRoZXNlIGZ1bmN0aW9ucywgYnV0IGFzIG9mIHRoaXMgY29tbWl0Ogo+IAo+IGNv bW1pdCBjYTBiMDdkOWE5NjkgKCJkcm06IGNvbnZlcnQgZHJtIGZyb20gbm9wYWdlIHRvIGZhdWx0 LiIpCj4gCj4gVGhleSBhcmUganVzdCB1bm5lY2Vzc2FyeSB3cmFwcGVycyB0aGF0IGRvIG5vdGhp bmcuICBSZW1vdmUgdGhlbS4KCkNhbiB3ZSByZW5hbWUgdGhlIGRybV9kb18qIGZ1bmN0aW9ucyB0 byByZW1vdmUgImRvXyIgaW5zdGVhZD8gSSBkb24ndCB0aGluayBpdAphZGRzIGFueXRoaW5nIGFu ZCB0aGlzIHNlZW1zIGxpa2UgYSBnb29kIHRpbWUgdG8gZml4IHRoYXQuCgpTZWFuCgo+IAo+IFNp Z25lZC1vZmYtYnk6IFJvc3MgWndpc2xlciA8cm9zcy56d2lzbGVyQGxpbnV4LmludGVsLmNvbT4K PiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV92bS5jIHwgMjggKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV92bS5jIGIvZHJpdmVy cy9ncHUvZHJtL2RybV92bS5jCj4gaW5kZXggYmFlNmUyNi4uZTY3N2IxMSAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3Zt LmMKPiBAQCAtMzQ5LDUwICszNDksMzAgQEAgc3RhdGljIGludCBkcm1fZG9fdm1fc2dfZmF1bHQo c3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gIAlyZXR1cm4gMDsKPiAgfQo+ICAKPiAtc3RhdGljIGlu dCBkcm1fdm1fZmF1bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gLXsKPiAtCXJldHVybiBkcm1f ZG9fdm1fZmF1bHQodm1mKTsKPiAtfQo+IC0KPiAtc3RhdGljIGludCBkcm1fdm1fc2htX2ZhdWx0 KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+IC17Cj4gLQlyZXR1cm4gZHJtX2RvX3ZtX3NobV9mYXVs dCh2bWYpOwo+IC19Cj4gLQo+IC1zdGF0aWMgaW50IGRybV92bV9kbWFfZmF1bHQoc3RydWN0IHZt X2ZhdWx0ICp2bWYpCj4gLXsKPiAtCXJldHVybiBkcm1fZG9fdm1fZG1hX2ZhdWx0KHZtZik7Cj4g LX0KPiAtCj4gLXN0YXRpYyBpbnQgZHJtX3ZtX3NnX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1m KQo+IC17Cj4gLQlyZXR1cm4gZHJtX2RvX3ZtX3NnX2ZhdWx0KHZtZik7Cj4gLX0KPiAtCj4gIC8q KiBBR1AgdmlydHVhbCBtZW1vcnkgb3BlcmF0aW9ucyAqLwo+ICBzdGF0aWMgY29uc3Qgc3RydWN0 IHZtX29wZXJhdGlvbnNfc3RydWN0IGRybV92bV9vcHMgPSB7Cj4gLQkuZmF1bHQgPSBkcm1fdm1f ZmF1bHQsCj4gKwkuZmF1bHQgPSBkcm1fZG9fdm1fZmF1bHQsCj4gIAkub3BlbiA9IGRybV92bV9v cGVuLAo+ICAJLmNsb3NlID0gZHJtX3ZtX2Nsb3NlLAo+ICB9Owo+ICAKPiAgLyoqIFNoYXJlZCB2 aXJ0dWFsIG1lbW9yeSBvcGVyYXRpb25zICovCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgdm1fb3Bl cmF0aW9uc19zdHJ1Y3QgZHJtX3ZtX3NobV9vcHMgPSB7Cj4gLQkuZmF1bHQgPSBkcm1fdm1fc2ht X2ZhdWx0LAo+ICsJLmZhdWx0ID0gZHJtX2RvX3ZtX3NobV9mYXVsdCwKPiAgCS5vcGVuID0gZHJt X3ZtX29wZW4sCj4gIAkuY2xvc2UgPSBkcm1fdm1fc2htX2Nsb3NlLAo+ICB9Owo+ICAKPiAgLyoq IERNQSB2aXJ0dWFsIG1lbW9yeSBvcGVyYXRpb25zICovCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg dm1fb3BlcmF0aW9uc19zdHJ1Y3QgZHJtX3ZtX2RtYV9vcHMgPSB7Cj4gLQkuZmF1bHQgPSBkcm1f dm1fZG1hX2ZhdWx0LAo+ICsJLmZhdWx0ID0gZHJtX2RvX3ZtX2RtYV9mYXVsdCwKPiAgCS5vcGVu ID0gZHJtX3ZtX29wZW4sCj4gIAkuY2xvc2UgPSBkcm1fdm1fY2xvc2UsCj4gIH07Cj4gIAo+ICAv KiogU2NhdHRlci1nYXRoZXIgdmlydHVhbCBtZW1vcnkgb3BlcmF0aW9ucyAqLwo+ICBzdGF0aWMg Y29uc3Qgc3RydWN0IHZtX29wZXJhdGlvbnNfc3RydWN0IGRybV92bV9zZ19vcHMgPSB7Cj4gLQku ZmF1bHQgPSBkcm1fdm1fc2dfZmF1bHQsCj4gKwkuZmF1bHQgPSBkcm1fZG9fdm1fc2dfZmF1bHQs Cj4gIAkub3BlbiA9IGRybV92bV9vcGVuLAo+ICAJLmNsb3NlID0gZHJtX3ZtX2Nsb3NlLAo+ICB9 Owo+IC0tIAo+IDIuNy40CgotLSAKU2VhbiBQYXVsLCBTb2Z0d2FyZSBFbmdpbmVlciwgR29vZ2xl IC8gQ2hyb21pdW0gT1MKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754343AbdA3Ubr (ORCPT ); Mon, 30 Jan 2017 15:31:47 -0500 Received: from mail-qk0-f169.google.com ([209.85.220.169]:36317 "EHLO mail-qk0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbdA3Ubm (ORCPT ); Mon, 30 Jan 2017 15:31:42 -0500 Date: Mon, 30 Jan 2017 15:30:35 -0500 From: Sean Paul To: Ross Zwisler Cc: linux-kernel@vger.kernel.org, Daniel Vetter , David Airlie , Jani Nikula , dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm: remove unnecessary fault wrappers Message-ID: <20170130203035.GS20076@art_vandelay> References: <1485804002-27363-1-git-send-email-ross.zwisler@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1485804002-27363-1-git-send-email-ross.zwisler@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 30, 2017 at 12:20:02PM -0700, Ross Zwisler wrote: > The fault wrappers drm_vm_fault(), drm_vm_shm_fault(), drm_vm_dma_fault() > and drm_vm_sg_fault() used to provide extra logic beyond what was in the > "drm_do_*" versions of these functions, but as of this commit: > > commit ca0b07d9a969 ("drm: convert drm from nopage to fault.") > > They are just unnecessary wrappers that do nothing. Remove them. Can we rename the drm_do_* functions to remove "do_" instead? I don't think it adds anything and this seems like a good time to fix that. Sean > > Signed-off-by: Ross Zwisler > --- > drivers/gpu/drm/drm_vm.c | 28 ++++------------------------ > 1 file changed, 4 insertions(+), 24 deletions(-) > > diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c > index bae6e26..e677b11 100644 > --- a/drivers/gpu/drm/drm_vm.c > +++ b/drivers/gpu/drm/drm_vm.c > @@ -349,50 +349,30 @@ static int drm_do_vm_sg_fault(struct vm_fault *vmf) > return 0; > } > > -static int drm_vm_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_fault(vmf); > -} > - > -static int drm_vm_shm_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_shm_fault(vmf); > -} > - > -static int drm_vm_dma_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_dma_fault(vmf); > -} > - > -static int drm_vm_sg_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_sg_fault(vmf); > -} > - > /** AGP virtual memory operations */ > static const struct vm_operations_struct drm_vm_ops = { > - .fault = drm_vm_fault, > + .fault = drm_do_vm_fault, > .open = drm_vm_open, > .close = drm_vm_close, > }; > > /** Shared virtual memory operations */ > static const struct vm_operations_struct drm_vm_shm_ops = { > - .fault = drm_vm_shm_fault, > + .fault = drm_do_vm_shm_fault, > .open = drm_vm_open, > .close = drm_vm_shm_close, > }; > > /** DMA virtual memory operations */ > static const struct vm_operations_struct drm_vm_dma_ops = { > - .fault = drm_vm_dma_fault, > + .fault = drm_do_vm_dma_fault, > .open = drm_vm_open, > .close = drm_vm_close, > }; > > /** Scatter-gather virtual memory operations */ > static const struct vm_operations_struct drm_vm_sg_ops = { > - .fault = drm_vm_sg_fault, > + .fault = drm_do_vm_sg_fault, > .open = drm_vm_open, > .close = drm_vm_close, > }; > -- > 2.7.4 -- Sean Paul, Software Engineer, Google / Chromium OS