Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/vmwgfx: Replace "vmw_num_pages" with "PFN_UP"

we counld use PFN_UP instead of vmw_num_pages()

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: Zack Rusin <zackr@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210802033552.990-1-caihuoqing@baidu.com

authored by

Cai Huoqing and committed by
Zack Rusin
5f50b765 bc65754c

+9 -10
+6 -7
drivers/gpu/drm/vmwgfx/device_include/vm_basic_types.h
··· 97 97 } MKSGuestStatInfoEntry; 98 98 99 99 #define INVALID_PPN64 ((PPN64)0x000fffffffffffffULL) 100 - #define vmw_num_pages(size) (PAGE_ALIGN(size) >> PAGE_SHIFT) 101 100 102 101 #define MKS_GUEST_STAT_INSTANCE_DESC_LENGTH 1024 103 102 #define MKS_GUEST_STAT_INSTANCE_MAX_STATS 4096 104 - #define MKS_GUEST_STAT_INSTANCE_MAX_STAT_PPNS \ 105 - (vmw_num_pages(MKS_GUEST_STAT_INSTANCE_MAX_STATS * \ 103 + #define MKS_GUEST_STAT_INSTANCE_MAX_STAT_PPNS \ 104 + (PFN_UP(MKS_GUEST_STAT_INSTANCE_MAX_STATS * \ 106 105 sizeof(MKSGuestStatCounterTime))) 107 - #define MKS_GUEST_STAT_INSTANCE_MAX_INFO_PPNS \ 108 - (vmw_num_pages(MKS_GUEST_STAT_INSTANCE_MAX_STATS * \ 106 + #define MKS_GUEST_STAT_INSTANCE_MAX_INFO_PPNS \ 107 + (PFN_UP(MKS_GUEST_STAT_INSTANCE_MAX_STATS * \ 109 108 sizeof(MKSGuestStatInfoEntry))) 110 109 #define MKS_GUEST_STAT_AVERAGE_NAME_LENGTH 40 111 - #define MKS_GUEST_STAT_INSTANCE_MAX_STRS_PPNS \ 112 - (vmw_num_pages(MKS_GUEST_STAT_INSTANCE_MAX_STATS * \ 110 + #define MKS_GUEST_STAT_INSTANCE_MAX_STRS_PPNS \ 111 + (PFN_UP(MKS_GUEST_STAT_INSTANCE_MAX_STATS * \ 113 112 MKS_GUEST_STAT_AVERAGE_NAME_LENGTH)) 114 113 115 114 /*
+3 -3
drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
··· 1016 1016 1017 1017 struct page *page; 1018 1018 MKSGuestStatInstanceDescriptor *pdesc; 1019 - const size_t num_pages_stat = vmw_num_pages(arg->stat_len); 1020 - const size_t num_pages_info = vmw_num_pages(arg->info_len); 1021 - const size_t num_pages_strs = vmw_num_pages(arg->strs_len); 1019 + const size_t num_pages_stat = PFN_UP(arg->stat_len); 1020 + const size_t num_pages_info = PFN_UP(arg->info_len); 1021 + const size_t num_pages_strs = PFN_UP(arg->strs_len); 1022 1022 long desc_len; 1023 1023 long nr_pinned_stat; 1024 1024 long nr_pinned_info;