Am 28.07.20 um 14:55 schrieb Tian Tao: > fixed the following warning: > hibmc_drm_drv.c:296:1-18:WARNING: Assignment of 0/1 to bool variable. > hibmc_drm_drv.c:301:2-19: WARNING: Assignment of 0/1 to bool variable. > > v2: > using the pci_dev.msi_enabled instead of priv->msi_enabled. > > v3: > just call pci_enable_msi() and pci_disable_msi(), it's no need to > set dev->pdev->msi_enabled again. > > Signed-off-by: Tian Tao <[email protected]>
Thanks. Added to drm-misc-next
Best regards
Thomas
> ---
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +----
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 -
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> index 249c298..b8d839a 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
> @@ -254,9 +254,8 @@ static int hibmc_unload(struct drm_device *dev)
>
> if (dev->irq_enabled)
> drm_irq_uninstall(dev);
> - if (priv->msi_enabled)
> - pci_disable_msi(dev->pdev);
>
> + pci_disable_msi(dev->pdev);
> hibmc_kms_fini(priv);
> hibmc_mm_fini(priv);
> dev->dev_private = NULL;
> @@ -294,12 +293,10 @@ static int hibmc_load(struct drm_device *dev)
> goto err;
> }
>
> - priv->msi_enabled = 0;
> ret = pci_enable_msi(dev->pdev);
> if (ret) {
> DRM_WARN("enabling MSI failed: %d\n", ret);
> } else {
> - priv->msi_enabled = 1;
> ret = drm_irq_install(dev, dev->pdev->irq);
> if (ret)
> DRM_WARN("install irq failed: %d\n", ret);
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> index 6097687..a683763 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h
> @@ -25,7 +25,6 @@ struct hibmc_drm_private {
> void __iomem *fb_map;
> unsigned long fb_base;
> unsigned long fb_size;
> - bool msi_enabled;
>
> /* drm */
> struct drm_device *dev;
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
