Merge tag 'topic/remove-fbcon-notifiers-2019-06-26' into drm-misc-next-fixes

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_gds.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h
index f89f5734d98540a81b43a385440f24cbde1e0662..dad2186f4ed552228b6076359b39570f0e274723 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h
@@ -27,26 +27,11 @@
 struct amdgpu_ring;
 struct amdgpu_bo;
 
-struct amdgpu_gds_asic_info {
-       uint32_t        total_size;
-       uint32_t        gfx_partition_size;
-       uint32_t        cs_partition_size;
-};
-
 struct amdgpu_gds {
-       struct amdgpu_gds_asic_info     mem;
-       struct amdgpu_gds_asic_info     gws;
-       struct amdgpu_gds_asic_info     oa;
+       uint32_t gds_size;
+       uint32_t gws_size;
+       uint32_t oa_size;
        uint32_t                        gds_compute_max_wave_id;
-
-       /* At present, GDS, GWS and OA resources for gfx (graphics)
-        * is always pre-allocated and available for graphics operation.
-        * Such resource is shared between all gfx clients.
-        * TODO: move this operation to user space
-        * */
-       struct amdgpu_bo*               gds_gfx_bo;
-       struct amdgpu_bo*               gws_gfx_bo;
-       struct amdgpu_bo*               oa_gfx_bo;
 };
 
 struct amdgpu_gds_reg_offset {