Skip to content

Commit

Permalink
drm/core: use helper to check driver features
Browse files Browse the repository at this point in the history
The patch replaces direct access to driver_features field
by calls to helper function.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Andrzej Hajda authored and Daniel Vetter committed Oct 3, 2014
1 parent 5a11f7f commit 1bcecfa
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
goto err_ht;
}

if (driver->driver_features & DRIVER_GEM) {
if (drm_core_check_feature(dev, DRIVER_GEM)) {
ret = drm_gem_init(dev);
if (ret) {
DRM_ERROR("Cannot initialize graphics execution manager (GEM)\n");
Expand Down Expand Up @@ -625,7 +625,7 @@ static void drm_dev_release(struct kref *ref)
{
struct drm_device *dev = container_of(ref, struct drm_device, ref);

if (dev->driver->driver_features & DRIVER_GEM)
if (drm_core_check_feature(dev, DRIVER_GEM))
drm_gem_destroy(dev);

drm_legacy_ctxbitmap_cleanup(dev);
Expand Down
8 changes: 4 additions & 4 deletions drivers/gpu/drm/drm_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
init_waitqueue_head(&priv->event_wait);
priv->event_space = 4096; /* set aside 4k for event buffer */

if (dev->driver->driver_features & DRIVER_GEM)
if (drm_core_check_feature(dev, DRIVER_GEM))
drm_gem_open(dev, priv);

if (drm_core_check_feature(dev, DRIVER_PRIME))
Expand Down Expand Up @@ -256,7 +256,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
out_prime_destroy:
if (drm_core_check_feature(dev, DRIVER_PRIME))
drm_prime_destroy_file_private(&priv->prime);
if (dev->driver->driver_features & DRIVER_GEM)
if (drm_core_check_feature(dev, DRIVER_GEM))
drm_gem_release(dev, priv);
put_pid(priv->pid);
kfree(priv);
Expand Down Expand Up @@ -408,10 +408,10 @@ int drm_release(struct inode *inode, struct file *filp)

drm_events_release(file_priv);

if (dev->driver->driver_features & DRIVER_MODESET)
if (drm_core_check_feature(dev, DRIVER_MODESET))
drm_fb_release(file_priv);

if (dev->driver->driver_features & DRIVER_GEM)
if (drm_core_check_feature(dev, DRIVER_GEM))
drm_gem_release(dev, file_priv);

drm_legacy_ctxbitmap_flush(dev, file_priv);
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpu/drm/drm_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ drm_gem_close_ioctl(struct drm_device *dev, void *data,
struct drm_gem_close *args = data;
int ret;

if (!(dev->driver->driver_features & DRIVER_GEM))
if (!drm_core_check_feature(dev, DRIVER_GEM))
return -ENODEV;

ret = drm_gem_handle_delete(file_priv, args->handle);
Expand All @@ -608,7 +608,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
struct drm_gem_object *obj;
int ret;

if (!(dev->driver->driver_features & DRIVER_GEM))
if (!drm_core_check_feature(dev, DRIVER_GEM))
return -ENODEV;

obj = drm_gem_object_lookup(dev, file_priv, args->handle);
Expand Down Expand Up @@ -661,7 +661,7 @@ drm_gem_open_ioctl(struct drm_device *dev, void *data,
int ret;
u32 handle;

if (!(dev->driver->driver_features & DRIVER_GEM))
if (!drm_core_check_feature(dev, DRIVER_GEM))
return -ENODEV;

mutex_lock(&dev->object_name_lock);
Expand Down

0 comments on commit 1bcecfa

Please sign in to comment.