Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 862f6157 authored by Markus Elfring's avatar Markus Elfring Committed by Sinclair Yeh
Browse files

drm/vmwgfx: Adjust checks for null pointers in 13 functions 



The script "checkpatch.pl" can point information out like the following.

Comparison to NULL could be written !…

Thus fix the affected source code places.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
Signed-off-by: default avatarSinclair Yeh <syeh@vmware.com>
parent c138d03f

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

+15 −16
Original line number Original line Diff line number Diff line
@@ -324,7 +324,7 @@ static void vmw_hw_surface_destroy(struct vmw_resource *res) 
	if (res->id != -1) {

	if (res->id != -1) {





		cmd = vmw_fifo_reserve(dev_priv, vmw_surface_destroy_size());

		cmd = vmw_fifo_reserve(dev_priv, vmw_surface_destroy_size());

		if (unlikely(cmd == NULL)) {

		if (unlikely(!cmd)) {

			DRM_ERROR("Failed reserving FIFO space for surface "

			DRM_ERROR("Failed reserving FIFO space for surface "

				  "destruction.\n");

				  "destruction.\n");

			return;

			return;
@@ -397,7 +397,7 @@ static int vmw_legacy_srf_create(struct vmw_resource *res) 




	submit_size = vmw_surface_define_size(srf);

	submit_size = vmw_surface_define_size(srf);

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	if (unlikely(cmd == NULL)) {

	if (unlikely(!cmd)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "creation.\n");

			  "creation.\n");

		ret = -ENOMEM;

		ret = -ENOMEM;
@@ -446,11 +446,10 @@ static int vmw_legacy_srf_dma(struct vmw_resource *res, 
	uint8_t *cmd;

	uint8_t *cmd;

	struct vmw_private *dev_priv = res->dev_priv;

	struct vmw_private *dev_priv = res->dev_priv;





	BUG_ON(val_buf->bo == NULL);

	BUG_ON(!val_buf->bo);



	submit_size = vmw_surface_dma_size(srf);

	submit_size = vmw_surface_dma_size(srf);

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	if (unlikely(cmd == NULL)) {

	if (unlikely(!cmd)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "DMA.\n");

			  "DMA.\n");

		return -ENOMEM;

		return -ENOMEM;
@@ -538,7 +537,7 @@ static int vmw_legacy_srf_destroy(struct vmw_resource *res) 




	submit_size = vmw_surface_destroy_size();

	submit_size = vmw_surface_destroy_size();

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	if (unlikely(cmd == NULL)) {

	if (unlikely(!cmd)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "eviction.\n");

			  "eviction.\n");

		return -ENOMEM;

		return -ENOMEM;
@@ -578,7 +577,7 @@ static int vmw_surface_init(struct vmw_private *dev_priv, 
	int ret;

	int ret;

	struct vmw_resource *res = &srf->res;

	struct vmw_resource *res = &srf->res;





	BUG_ON(res_free == NULL);

	BUG_ON(!res_free);

	if (!dev_priv->has_mob)

	if (!dev_priv->has_mob)

		vmw_fifo_resource_inc(dev_priv);

		vmw_fifo_resource_inc(dev_priv);

	ret = vmw_resource_init(dev_priv, res, true, res_free,

	ret = vmw_resource_init(dev_priv, res, true, res_free,
@@ -747,7 +746,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, 
	}

	}





	user_srf = kzalloc(sizeof(*user_srf), GFP_KERNEL);

	user_srf = kzalloc(sizeof(*user_srf), GFP_KERNEL);

	if (unlikely(user_srf == NULL)) {

	if (unlikely(!user_srf)) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out_no_user_srf;

		goto out_no_user_srf;

	}

	}
@@ -772,7 +771,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, 
	srf->offsets = kmalloc_array(srf->num_sizes,

	srf->offsets = kmalloc_array(srf->num_sizes,

				     sizeof(*srf->offsets),

				     sizeof(*srf->offsets),

				     GFP_KERNEL);

				     GFP_KERNEL);

	if (unlikely(srf->offsets == NULL)) {

	if (unlikely(!srf->offsets)) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out_no_offsets;

		goto out_no_offsets;

	}

	}
@@ -914,7 +913,7 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, 




	ret = -EINVAL;

	ret = -EINVAL;

	base = ttm_base_object_lookup_for_ref(dev_priv->tdev, handle);

	base = ttm_base_object_lookup_for_ref(dev_priv->tdev, handle);

	if (unlikely(base == NULL)) {

	if (unlikely(!base)) {

		DRM_ERROR("Could not find surface to reference.\n");

		DRM_ERROR("Could not find surface to reference.\n");

		goto out_no_lookup;

		goto out_no_lookup;

	}

	}
@@ -1060,7 +1059,7 @@ static int vmw_gb_surface_create(struct vmw_resource *res) 




	cmd = vmw_fifo_reserve(dev_priv, submit_len);

	cmd = vmw_fifo_reserve(dev_priv, submit_len);

	cmd2 = (typeof(cmd2))cmd;

	cmd2 = (typeof(cmd2))cmd;

	if (unlikely(cmd == NULL)) {

	if (unlikely(!cmd)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "creation.\n");

			  "creation.\n");

		ret = -ENOMEM;

		ret = -ENOMEM;
@@ -1126,7 +1125,7 @@ static int vmw_gb_surface_bind(struct vmw_resource *res, 
	submit_size = sizeof(*cmd1) + (res->backup_dirty ? sizeof(*cmd2) : 0);

	submit_size = sizeof(*cmd1) + (res->backup_dirty ? sizeof(*cmd2) : 0);





	cmd1 = vmw_fifo_reserve(dev_priv, submit_size);

	cmd1 = vmw_fifo_reserve(dev_priv, submit_size);

	if (unlikely(cmd1 == NULL)) {

	if (unlikely(!cmd1)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "binding.\n");

			  "binding.\n");

		return -ENOMEM;

		return -ENOMEM;
@@ -1176,7 +1175,7 @@ static int vmw_gb_surface_unbind(struct vmw_resource *res, 




	submit_size = sizeof(*cmd3) + (readback ? sizeof(*cmd1) : sizeof(*cmd2));

	submit_size = sizeof(*cmd3) + (readback ? sizeof(*cmd1) : sizeof(*cmd2));

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	cmd = vmw_fifo_reserve(dev_priv, submit_size);

	if (unlikely(cmd == NULL)) {

	if (unlikely(!cmd)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "unbinding.\n");

			  "unbinding.\n");

		return -ENOMEM;

		return -ENOMEM;
@@ -1235,7 +1234,7 @@ static int vmw_gb_surface_destroy(struct vmw_resource *res) 
	vmw_binding_res_list_scrub(&res->binding_head);

	vmw_binding_res_list_scrub(&res->binding_head);





	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	cmd = vmw_fifo_reserve(dev_priv, sizeof(*cmd));

	if (unlikely(cmd == NULL)) {

	if (unlikely(!cmd)) {

		DRM_ERROR("Failed reserving FIFO space for surface "

		DRM_ERROR("Failed reserving FIFO space for surface "

			  "destruction.\n");

			  "destruction.\n");

		mutex_unlock(&dev_priv->binding_mutex);

		mutex_unlock(&dev_priv->binding_mutex);
@@ -1401,7 +1400,7 @@ int vmw_gb_surface_reference_ioctl(struct drm_device *dev, void *data, 




	user_srf = container_of(base, struct vmw_user_surface, prime.base);

	user_srf = container_of(base, struct vmw_user_surface, prime.base);

	srf = &user_srf->srf;

	srf = &user_srf->srf;

	if (srf->res.backup == NULL) {

	if (!srf->res.backup) {

		DRM_ERROR("Shared GB surface is missing a backup buffer.\n");

		DRM_ERROR("Shared GB surface is missing a backup buffer.\n");

		goto out_bad_resource;

		goto out_bad_resource;

	}

	}
@@ -1515,7 +1514,7 @@ int vmw_surface_gb_priv_define(struct drm_device *dev, 
	}

	}





	user_srf = kzalloc(sizeof(*user_srf), GFP_KERNEL);

	user_srf = kzalloc(sizeof(*user_srf), GFP_KERNEL);

	if (unlikely(user_srf == NULL)) {

	if (unlikely(!user_srf)) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto out_no_user_srf;

		goto out_no_user_srf;

	}

	}