From aa7254afa9caa3061c86641faeb082485b46d378 Mon Sep 17 00:00:00 2001
From: Nicolin Chen <nicolinc@nvidia.com>
Date: Fri, 22 Jul 2022 19:02:48 -0700
Subject: drm/i915/gvt: Replace roundup with DIV_ROUND_UP
Git-commit: 2c9e8c01109fb65a63b6830adeb5d7c79ccf26d6
Patch-mainline: v6.0-rc1
References: jsc#PED-1166 jsc#PED-1168 jsc#PED-1170 jsc#PED-1218 jsc#PED-1220 jsc#PED-1222 jsc#PED-1223 jsc#PED-1225 jsc#PED-2849
It's a bit redundant for the maths here using roundup.
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Tested-by: Terrence Xu <terrence.xu@intel.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Link: https://lore.kernel.org/r/20220723020256.30081-3-nicolinc@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Patrik Jakobsson <pjakobsson@suse.de>
[mkoutny: Refresh context after jroedel's changes]
---
drivers/gpu/drm/i915/gvt/kvmgt.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -231,11 +231,9 @@ static void intel_gvt_cleanup_vgpu_type_
static void gvt_unpin_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,
unsigned long size)
{
- int total_pages;
+ int total_pages = DIV_ROUND_UP(size, PAGE_SIZE);
int npage;
- total_pages = roundup(size, PAGE_SIZE) / PAGE_SIZE;
-
for (npage = 0; npage < total_pages; npage++) {
unsigned long cur_gfn = gfn + npage;
@@ -247,12 +245,11 @@ static void gvt_unpin_guest_page(struct
static int gvt_pin_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,
unsigned long size, struct page **page)
{
+ int total_pages = DIV_ROUND_UP(size, PAGE_SIZE);
unsigned long base_pfn = 0;
- int total_pages;
int npage;
int ret;
- total_pages = roundup(size, PAGE_SIZE) / PAGE_SIZE;
/*
* We pin the pages one-by-one to avoid allocating a big arrary
* on stack to hold pfns.