| Message ID | 1473863952-7658-6-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 14 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> 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 <yamada.masahiro@socionext.com> > --- > > 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,
2016-09-15 18:46 GMT+09:00 Jani Nikula <jani.nikula@linux.intel.com>: > On Wed, 14 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> 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. Sure. (I was also wondering if it is the right thing to do.) I will send v3.
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,
i915_driver_open() is equivalent to i915_gem_open(). Replace the i915_driver_open with the direct use of i915_gem_open(). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/gpu/drm/i915/i915_drv.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)