UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: atomisp: drop hmm_page_type 

Since the hmm-pool code has been removed this now always gets set
to HMM_PAGE_TYPE_GENERAL, so just remove it.

Link: https://lore.kernel.org/linux-media/20220615205037.16549-16-hdegoede@redhat.com
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Hans de Goede 2022-06-15 21:50:12 +01:00 committed by Mauro Carvalho Chehab
parent 4be4504e9d
commit 2c9974955f
2 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/media/atomisp/include/hmm/hmm_bo.h
View File

@ -81,12 +81,6 @@ enum hmm_bo_type {
HMM_BO_LAST, HMM_BO_LAST,
}; };
enum hmm_page_type {
HMM_PAGE_TYPE_RESERVED,
HMM_PAGE_TYPE_DYNAMIC,
HMM_PAGE_TYPE_GENERAL,
};
#define HMM_BO_MASK 0x1 #define HMM_BO_MASK 0x1
#define HMM_BO_FREE 0x0 #define HMM_BO_FREE 0x0
#define HMM_BO_ALLOCED 0x1 #define HMM_BO_ALLOCED 0x1
@ -123,7 +117,6 @@ struct hmm_bo_device {
struct hmm_page_object { struct hmm_page_object {
struct page *page; struct page *page;
enum hmm_page_type type;
}; };
struct hmm_buffer_object { struct hmm_buffer_object {

42
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
View File

@ -631,32 +631,22 @@ static void free_private_bo_pages(struct hmm_buffer_object *bo,
int i, ret; int i, ret;
for (i = 0; i < free_pgnr; i++) { for (i = 0; i < free_pgnr; i++) {
switch (bo->page_obj[i].type) { ret = set_pages_wb(bo->page_obj[i].page, 1);
case HMM_PAGE_TYPE_RESERVED: if (ret)
break; dev_err(atomisp_dev,
case HMM_PAGE_TYPE_DYNAMIC: "set page to WB err ...ret = %d\n",
case HMM_PAGE_TYPE_GENERAL: ret);
default: /*
ret = set_pages_wb(bo->page_obj[i].page, 1); W/A: set_pages_wb seldom return value = -EFAULT
if (ret) indicate that address of page is not in valid
dev_err(atomisp_dev, range(0xffff880000000000~0xffffc7ffffffffff)
"set page to WB err ...ret = %d\n", then, _free_pages would panic; Do not know why page
ret); address be valid,it maybe memory corruption by lowmemory
/* */
W/A: set_pages_wb seldom return value = -EFAULT if (!ret) {
indicate that address of page is not in valid __free_pages(bo->page_obj[i].page, 0);
range(0xffff880000000000~0xffffc7ffffffffff)
then, _free_pages would panic; Do not know why page
address be valid,it maybe memory corruption by lowmemory
*/
if (!ret) {
__free_pages(bo->page_obj[i].page, 0);
}
break;
} }
} }
return;
} }
/*Allocate pages which will be used only by ISP*/ /*Allocate pages which will be used only by ISP*/
@ -755,9 +745,8 @@ retry:
} }
} }
for (j = 0; j < blk_pgnr; j++) { for (j = 0; j < blk_pgnr; j++, i++) {
bo->page_obj[i].page = pages + j; bo->page_obj[i].page = pages + j;
bo->page_obj[i++].type = HMM_PAGE_TYPE_GENERAL;
} }
pgnr -= blk_pgnr; pgnr -= blk_pgnr;
@ -878,7 +867,6 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,
for (i = 0; i < bo->pgnr; i++) { for (i = 0; i < bo->pgnr; i++) {
bo->page_obj[i].page = pages[i]; bo->page_obj[i].page = pages[i];
bo->page_obj[i].type = HMM_PAGE_TYPE_GENERAL;
} }
return 0; return 0;