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

Commit 3f188453 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: handle domain mask checking v2 



if domain is illegal, we should return error.
v2:
  remove duplicated domain checking.

Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aa2b2e28

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+1 −6
Original line number Diff line number Diff line
@@ -229,12 +229,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
		return -EINVAL;



	/* reject invalid gem domains */

	if (args->in.domains & ~(AMDGPU_GEM_DOMAIN_CPU |

				 AMDGPU_GEM_DOMAIN_GTT |

				 AMDGPU_GEM_DOMAIN_VRAM |

				 AMDGPU_GEM_DOMAIN_GDS |

				 AMDGPU_GEM_DOMAIN_GWS |

				 AMDGPU_GEM_DOMAIN_OA))

	if (args->in.domains & ~AMDGPU_GEM_DOMAIN_MASK)

		return -EINVAL;



	/* create a gem object to contain this object in */

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+1 −8
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 
	};

	struct amdgpu_bo *bo;

	unsigned long page_align, size = bp->size;

	u32 preferred_domains;

	size_t acc_size;

	int r;
@@ -381,14 +380,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, 
	drm_gem_private_object_init(adev->ddev, &bo->gem_base, size);

	INIT_LIST_HEAD(&bo->shadow_list);

	INIT_LIST_HEAD(&bo->va);

	preferred_domains = bp->preferred_domain ? bp->preferred_domain :

	bo->preferred_domains = bp->preferred_domain ? bp->preferred_domain :

		bp->domain;

	bo->preferred_domains = preferred_domains & (AMDGPU_GEM_DOMAIN_VRAM |

						     AMDGPU_GEM_DOMAIN_GTT |

						     AMDGPU_GEM_DOMAIN_CPU |

						     AMDGPU_GEM_DOMAIN_GDS |

						     AMDGPU_GEM_DOMAIN_GWS |

						     AMDGPU_GEM_DOMAIN_OA);

	bo->allowed_domains = bo->preferred_domains;

	if (bp->type != ttm_bo_type_kernel &&

	    bo->allowed_domains == AMDGPU_GEM_DOMAIN_VRAM)

include/uapi/drm/amdgpu_drm.h

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ extern "C" { 
#define AMDGPU_GEM_DOMAIN_GDS		0x8

#define AMDGPU_GEM_DOMAIN_GWS		0x10

#define AMDGPU_GEM_DOMAIN_OA		0x20

#define AMDGPU_GEM_DOMAIN_MASK		(AMDGPU_GEM_DOMAIN_CPU | \

					 AMDGPU_GEM_DOMAIN_GTT | \

					 AMDGPU_GEM_DOMAIN_VRAM | \

					 AMDGPU_GEM_DOMAIN_GDS | \

					 AMDGPU_GEM_DOMAIN_GWS | \

					 AMDGPU_GEM_DOMAIN_OA)



/* Flag that CPU access will be required for the case of VRAM domain */

#define AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED	(1 << 0)