drm : Insert blank lines after declarations. (948de842) · Commits · 戴 / test

drivers/gpu/drm/drm_atomic.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,7 @@ static int drm_atomic_plane_check(const struct drm_plane_state *old_plane_state,
		fb->modifier);
		if (ret) {
		struct drm_format_name_buf format_name;

		DRM_DEBUG_ATOMIC("[PLANE:%d:%s] invalid pixel format %s, modifier 0x%llx\n",
		plane->base.id, plane->name,
		drm_get_format_name(fb->format->format,

drivers/gpu/drm/drm_atomic_uapi.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -522,6 +522,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,

		if (property == config->prop_fb_id) {
		struct drm_framebuffer *fb;

		fb = drm_framebuffer_lookup(dev, file_priv, val);
		drm_atomic_set_fb_for_plane(state, fb);
		if (fb)
		@@ -539,6 +540,7 @@ static int drm_atomic_plane_set_property(struct drm_plane *plane,

		} else if (property == config->prop_crtc_id) {
		struct drm_crtc *crtc = drm_crtc_find(dev, file_priv, val);

		if (val && !crtc)
		return -EACCES;
		return drm_atomic_set_crtc_for_plane(state, crtc);
		@@ -681,6 +683,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,

		if (property == config->prop_crtc_id) {
		struct drm_crtc *crtc = drm_crtc_find(dev, file_priv, val);

		if (val && !crtc)
		return -EACCES;
		return drm_atomic_set_crtc_for_connector(state, crtc);
		@@ -754,6 +757,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
		} else if (property == config->writeback_fb_id_property) {
		struct drm_framebuffer *fb;
		int ret;

		fb = drm_framebuffer_lookup(dev, file_priv, val);
		ret = drm_atomic_set_writeback_fb_for_connector(state, fb);
		if (fb)
		@@ -861,6 +865,7 @@ int drm_atomic_get_property(struct drm_mode_object *obj,
		switch (obj->type) {
		case DRM_MODE_OBJECT_CONNECTOR: {
		struct drm_connector *connector = obj_to_connector(obj);

		WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
		ret = drm_atomic_connector_get_property(connector,
		connector->state, property, val);
		@@ -868,6 +873,7 @@ int drm_atomic_get_property(struct drm_mode_object *obj,
		}
		case DRM_MODE_OBJECT_CRTC: {
		struct drm_crtc *crtc = obj_to_crtc(obj);

		WARN_ON(!drm_modeset_is_locked(&crtc->mutex));
		ret = drm_atomic_crtc_get_property(crtc,
		crtc->state, property, val);
		@@ -875,6 +881,7 @@ int drm_atomic_get_property(struct drm_mode_object *obj,
		}
		case DRM_MODE_OBJECT_PLANE: {
		struct drm_plane *plane = obj_to_plane(obj);

		WARN_ON(!drm_modeset_is_locked(&plane->mutex));
		ret = drm_atomic_plane_get_property(plane,
		plane->state, property, val);

drivers/gpu/drm/drm_bufs.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ static struct drm_map_list drm_find_matching_map(struct drm_device dev,
		struct drm_local_map *map)
		{
		struct drm_map_list *entry;

		list_for_each_entry(entry, &dev->maplist, head) {
		/*
		* Because the kernel-userspace ABI is fixed at a 32-bit offset
		@@ -102,6 +103,7 @@ static int drm_map_handle(struct drm_device dev, struct drm_hash_item hash,

		if (!use_hashed_handle) {
		int ret;

		hash->key = user_token >> PAGE_SHIFT;
		ret = drm_ht_insert_item(&dev->map_hash, hash);
		if (ret != -EINVAL)
		@@ -391,6 +393,7 @@ struct drm_local_map drm_legacy_findmap(struct drm_device dev,
		unsigned int token)
		{
		struct drm_map_list *_entry;

		list_for_each_entry(_entry, &dev->maplist, head)
		if (_entry->user_token == token)
		return _entry->map;
		@@ -1323,6 +1326,7 @@ int __drm_legacy_infobufs(struct drm_device *dev,
		if (*p >= count) {
		for (i = 0, count = 0; i < DRM_MAX_ORDER + 1; i++) {
		struct drm_buf_entry *from = &dma->bufs[i];

		if (from->buf_count) {
		if (f(data, count, from) < 0)
		return -EFAULT;
		@@ -1359,6 +1363,7 @@ int drm_legacy_infobufs(struct drm_device dev, void data,
		struct drm_file *file_priv)
		{
		struct drm_buf_info *request = data;

		return __drm_legacy_infobufs(dev, data, &request->count, copy_one_buf);
		}

		@@ -1570,6 +1575,7 @@ int drm_legacy_mapbufs(struct drm_device dev, void data,
		struct drm_file *file_priv)
		{
		struct drm_buf_map *request = data;

		return __drm_legacy_mapbufs(dev, data, &request->count,
		&request->virtual, map_one_buf,
		file_priv);

drivers/gpu/drm/drm_connector.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -2409,6 +2409,7 @@ static void drm_tile_group_free(struct kref *kref)
		{
		struct drm_tile_group *tg = container_of(kref, struct drm_tile_group, refcount);
		struct drm_device *dev = tg->dev;

		mutex_lock(&dev->mode_config.idr_mutex);
		idr_remove(&dev->mode_config.tile_idr, tg->id);
		mutex_unlock(&dev->mode_config.idr_mutex);
		@@ -2444,6 +2445,7 @@ struct drm_tile_group drm_mode_get_tile_group(struct drm_device dev,
		{
		struct drm_tile_group *tg;
		int id;

		mutex_lock(&dev->mode_config.idr_mutex);
		idr_for_each_entry(&dev->mode_config.tile_idr, tg, id) {
		if (!memcmp(tg->group_data, topology, 8)) {

drivers/gpu/drm/drm_crtc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -656,6 +656,7 @@ int drm_mode_setcrtc(struct drm_device dev, void data,
		fb->modifier);
		if (ret) {
		struct drm_format_name_buf format_name;

		DRM_DEBUG_KMS("Invalid pixel format %s, modifier 0x%llx\n",
		drm_get_format_name(fb->format->format,
		&format_name),

Admin message