gpu: nvgpu: Always do full buffer compbits allocs

Remove parameter 'lines' from gk20a_alloc_or_get_comptags() and
nvgpu_ctag_buffer_info. We're always doing full buffer allocs
anyways. This simplifies the code a bit.

Bug 1902982

Change-Id: Iacfc9cdba8cb75b31a7d44b175660252e09d605d
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1597131
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/comptags.c b/drivers/gpu/nvgpu/common/linux/comptags.c
index 4a96e07b..7d095793 100644
--- a/drivers/gpu/nvgpu/common/linux/comptags.c
+++ b/drivers/gpu/nvgpu/common/linux/comptags.c
@@ -20,6 +20,7 @@
 
 #include <nvgpu/linux/vm.h>
 
+#include "gk20a/gk20a.h"
 #include "dmabuf.h"
 
 void gk20a_get_comptags(struct nvgpu_os_buffer *buf,
@@ -42,26 +43,33 @@ void gk20a_get_comptags(struct nvgpu_os_buffer *buf,
 int gk20a_alloc_or_get_comptags(struct gk20a *g,
                                 struct nvgpu_os_buffer *buf,
                                 struct gk20a_comptag_allocator *allocator,
-                                u32 lines,
                                 struct gk20a_comptags *comptags)
 {
         struct gk20a_dmabuf_priv *priv = dma_buf_get_drvdata(buf->dmabuf,
                                                              buf->dev);
         u32 offset;
         int err;
+        unsigned int ctag_granularity;
+        u32 lines;
 
         if (!priv)
                 return -ENOSYS;
 
-        if (!lines)
-                return -EINVAL;
-
         if (priv->comptags.allocated) {
-                /* already allocated */
+                /*
+                 * already allocated
+                 */
                 *comptags = priv->comptags;
                 return 0;
         }
 
+        ctag_granularity = g->ops.fb.compression_page_size(g);
+        lines = DIV_ROUND_UP_ULL(buf->dmabuf->size, ctag_granularity);
+
+        /* 0-sized buffer? Shouldn't occur, but let's check anyways. */
+        if (lines < 1)
+                return -EINVAL;
+
         /* store the allocator so we can use it when we free the ctags */
         priv->comptag_allocator = allocator;
         err = gk20a_comptaglines_alloc(allocator, &offset, lines);