From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open() Date: Thu, 15 Sep 2016 12:46:17 +0300 Message-ID: <87twdhpkba.fsf@intel.com> References: <1473863952-7658-1-git-send-email-yamada.masahiro@socionext.com> <1473863952-7658-6-git-send-email-yamada.masahiro@socionext.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1473863952-7658-6-git-send-email-yamada.masahiro@socionext.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie , dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Alexander Deucher , Daniel Vetter , Christian K?nig List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAxNCBTZXAgMjAxNiwgTWFzYWhpcm8gWWFtYWRhIDx5YW1hZGEubWFzYWhpcm9Ac29j aW9uZXh0LmNvbT4gd3JvdGU6Cj4gaTkxNV9kcml2ZXJfb3BlbigpIGlzIGVxdWl2YWxlbnQgdG8g aTkxNV9nZW1fb3BlbigpLiAgUmVwbGFjZSB0aGUKPiBpOTE1X2RyaXZlcl9vcGVuIHdpdGggdGhl IGRpcmVjdCB1c2Ugb2YgaTkxNV9nZW1fb3BlbigpLgoKU29ycnkgSSBrbm93IEkgYXNrZWQgZm9y IHRoaXMsIGJ1dCB0aGVyZSB3YXMgb3Bwb3NpdGlvbiB0byBkb2luZwp0aGlzLiBQbGVhc2UganVz dCBkbyB0aGUgcmV0dXJuIGk5MTVfZ2VtX29wZW4oZGV2LCBmaWxlKSB2ZXJzaW9uIGxpa2UKeW91 IGhhZCBvcmlnaW5hbGx5LgoKVGhhbmtzLApKYW5pLgoKCj4KPiBTaWduZWQtb2ZmLWJ5OiBNYXNh aGlybyBZYW1hZGEgPHlhbWFkYS5tYXNhaGlyb0Bzb2Npb25leHQuY29tPgo+IC0tLQo+Cj4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAxMyArLS0tLS0tLS0tLS0tCj4gIDEgZmls ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMTIgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKPiBpbmRleCA3ZjRlOGFkLi5kM2EzM2M0IDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jCj4gQEAgLTEzMjIsMTcgKzEzMjIsNiBAQCB2b2lkIGk5MTVfZHJpdmVyX3VubG9h ZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJaTkxNV9kcml2ZXJfY2xlYW51cF9lYXJseShk ZXZfcHJpdik7Cj4gIH0KPiAgCj4gLXN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfb3BlbihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCj4gLXsKPiAtCWludCByZXQ7 Cj4gLQo+IC0JcmV0ID0gaTkxNV9nZW1fb3BlbihkZXYsIGZpbGUpOwo+IC0JaWYgKHJldCkKPiAt CQlyZXR1cm4gcmV0Owo+IC0KPiAtCXJldHVybiAwOwo+IC19Cj4gLQo+ICAvKioKPiAgICogaTkx NV9kcml2ZXJfbGFzdGNsb3NlIC0gY2xlYW4gdXAgYWZ0ZXIgYWxsIERSTSBjbGllbnRzIGhhdmUg ZXhpdGVkCj4gICAqIEBkZXY6IERSTSBkZXZpY2UKPiBAQCAtMjU2OSw3ICsyNTU4LDcgQEAgc3Rh dGljIGludCBpbnRlbF9ydW50aW1lX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICprZGV2KQo+ICAJLmRy aXZlcl9mZWF0dXJlcyA9Cj4gIAkgICAgRFJJVkVSX0hBVkVfSVJRIHwgRFJJVkVSX0lSUV9TSEFS RUQgfCBEUklWRVJfR0VNIHwgRFJJVkVSX1BSSU1FIHwKPiAgCSAgICBEUklWRVJfUkVOREVSIHwg RFJJVkVSX01PREVTRVQsCj4gLQkub3BlbiA9IGk5MTVfZHJpdmVyX29wZW4sCj4gKwkub3BlbiA9 IGk5MTVfZ2VtX29wZW4sCj4gIAkubGFzdGNsb3NlID0gaTkxNV9kcml2ZXJfbGFzdGNsb3NlLAo+ ICAJLnByZWNsb3NlID0gaTkxNV9kcml2ZXJfcHJlY2xvc2UsCj4gIAkucG9zdGNsb3NlID0gaTkx NV9kcml2ZXJfcG9zdGNsb3NlLAoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBU ZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761904AbcIOJqX (ORCPT ); Thu, 15 Sep 2016 05:46:23 -0400 Received: from mga04.intel.com ([192.55.52.120]:57937 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbcIOJqV (ORCPT ); Thu, 15 Sep 2016 05:46:21 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,338,1470726000"; d="scan'208";a="1056348271" From: Jani Nikula To: Masahiro Yamada , David Airlie , dri-devel@lists.freedesktop.org Cc: "Christian K\?nig" , Alexander Deucher , Masahiro Yamada , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open() In-Reply-To: <1473863952-7658-6-git-send-email-yamada.masahiro@socionext.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1473863952-7658-1-git-send-email-yamada.masahiro@socionext.com> <1473863952-7658-6-git-send-email-yamada.masahiro@socionext.com> User-Agent: Notmuch/0.22.1+63~g648dcc7 (https://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 15 Sep 2016 12:46:17 +0300 Message-ID: <87twdhpkba.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 14 Sep 2016, Masahiro Yamada wrote: > i915_driver_open() is equivalent to i915_gem_open(). Replace the > i915_driver_open with the direct use of i915_gem_open(). Sorry I know I asked for this, but there was opposition to doing this. Please just do the return i915_gem_open(dev, file) version like you had originally. Thanks, Jani. > > Signed-off-by: Masahiro Yamada > --- > > drivers/gpu/drm/i915/i915_drv.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 7f4e8ad..d3a33c4 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1322,17 +1322,6 @@ void i915_driver_unload(struct drm_device *dev) > i915_driver_cleanup_early(dev_priv); > } > > -static int i915_driver_open(struct drm_device *dev, struct drm_file *file) > -{ > - int ret; > - > - ret = i915_gem_open(dev, file); > - if (ret) > - return ret; > - > - return 0; > -} > - > /** > * i915_driver_lastclose - clean up after all DRM clients have exited > * @dev: DRM device > @@ -2569,7 +2558,7 @@ static int intel_runtime_resume(struct device *kdev) > .driver_features = > DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME | > DRIVER_RENDER | DRIVER_MODESET, > - .open = i915_driver_open, > + .open = i915_gem_open, > .lastclose = i915_driver_lastclose, > .preclose = i915_driver_preclose, > .postclose = i915_driver_postclose, -- Jani Nikula, Intel Open Source Technology Center