]> git.baikalelectronics.ru Git - kernel.git/commitdiff
media: atomisp: disable the dynamic and reserved pools
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 20 May 2020 04:53:08 +0000 (06:53 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 20 May 2020 12:51:29 +0000 (14:51 +0200)
The memory management code for atomisp is complex: it has 2
extra pools (plus some ION-specific code).

The code for those extra pools are complex, and there are even
some parts of code over there that were forked from some
mm/ code, probably from Kernel 3.10.

Let's just use a single one, in order to make the driver
simpler.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/atomisp/pci/hmm/hmm.c

index 0ff81ea06241fed894513389950b259a8031ec14..cd70307ffd57c771f57c0e87db55db8301494127 100644 (file)
@@ -641,6 +641,7 @@ void hmm_vunmap(ia_css_ptr virt)
 
 int hmm_pool_register(unsigned int pool_size, enum hmm_pool_type pool_type)
 {
+#if 0  // Just use the "normal" pool
        switch (pool_type) {
        case HMM_POOL_TYPE_RESERVED:
                reserved_pool.pops = &reserved_pops;
@@ -654,10 +655,14 @@ int hmm_pool_register(unsigned int pool_size, enum hmm_pool_type pool_type)
                dev_err(atomisp_dev, "invalid pool type.\n");
                return -EINVAL;
        }
+#else
+       return 0;
+#endif
 }
 
 void hmm_pool_unregister(enum hmm_pool_type pool_type)
 {
+#if 0  // Just use the "normal" pool
        switch (pool_type) {
        case HMM_POOL_TYPE_RESERVED:
                if (reserved_pool.pops && reserved_pool.pops->pool_exit)
@@ -671,6 +676,7 @@ void hmm_pool_unregister(enum hmm_pool_type pool_type)
                dev_err(atomisp_dev, "invalid pool type.\n");
                break;
        }
+#endif
 
        return;
 }