[PATCH 3/6] PCI/VGA: drop the inline of vga_update_device_decodes() function
suijingfeng
suijingfeng at loongson.cn
Mon Jul 24 13:02:31 UTC 2023
PING, please !
On 2023/7/11 21:43, Sui Jingfeng wrote:
> From: Sui Jingfeng <suijingfeng at loongson.cn>
>
> The vga_update_device_decodes() function is NOT a trivial function, It is
> not performance critical either. So, drop the inline.
>
> This patch also make the parameter and argument consistent, use unsigned
> int type instead of the signed type to store the decode. Change the second
> argument of vga_update_device_decodes() function as 'unsigned int' type.
>
> Signed-off-by: Sui Jingfeng <suijingfeng at loongson.cn>
> ---
> drivers/pci/vgaarb.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
> index 021116ed61cb..668139f7c247 100644
> --- a/drivers/pci/vgaarb.c
> +++ b/drivers/pci/vgaarb.c
> @@ -860,24 +860,24 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
> return ret;
> }
>
> -/* this is called with the lock */
> -static inline void vga_update_device_decodes(struct vga_device *vgadev,
> - int new_decodes)
> +/* This is called with the lock */
> +static void vga_update_device_decodes(struct vga_device *vgadev,
> + unsigned int new_decodes)
> {
> struct device *dev = &vgadev->pdev->dev;
> - int old_decodes, decodes_removed, decodes_unlocked;
> + unsigned int old_decodes = vgadev->decodes;
> + unsigned int decodes_removed = ~new_decodes & old_decodes;
> + unsigned int decodes_unlocked = vgadev->locks & decodes_removed;
>
> - old_decodes = vgadev->decodes;
> - decodes_removed = ~new_decodes & old_decodes;
> - decodes_unlocked = vgadev->locks & decodes_removed;
> vgadev->decodes = new_decodes;
>
> - vgaarb_info(dev, "changed VGA decodes: olddecodes=%s,decodes=%s:owns=%s\n",
> - vga_iostate_to_str(old_decodes),
> - vga_iostate_to_str(vgadev->decodes),
> - vga_iostate_to_str(vgadev->owns));
> + vgaarb_info(dev,
> + "VGA decodes changed: olddecodes=%s,decodes=%s:owns=%s\n",
> + vga_iostate_to_str(old_decodes),
> + vga_iostate_to_str(vgadev->decodes),
> + vga_iostate_to_str(vgadev->owns));
>
> - /* if we removed locked decodes, lock count goes to zero, and release */
> + /* If we removed locked decodes, lock count goes to zero, and release */
> if (decodes_unlocked) {
> if (decodes_unlocked & VGA_RSRC_LEGACY_IO)
> vgadev->io_lock_cnt = 0;
More information about the dri-devel
mailing list