drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1
Subsystems (2)
PATCH 1/1 drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1
Bail from the pci_driver probe function instead of from the drm_driver load function.
This avoid /dev/dri/card0 temporarily getting registered and then unregistered again, sending unwanted add / remove udev events to userspace.
Specifically this avoids triggering the (userspace) bug fixed by this plymouth merge-request:
https://gitlab.freedesktop.org/plymouth/plymouth/merge_requests/59
Note that despite that being a userspace bug, not sending unnecessary udev events is a good idea in general.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 ------------------------- 2 files changed, 35 insertions(+), 35 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +35 -0
@@ -1048,6 +1048,41 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,return -ENODEV ; } +#ifdef CONFIG_DRM_AMDGPU_SI +if (!amdgpu_si_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_TAHITI : +case CHIP_PITCAIRN : +case CHIP_VERDE : +case CHIP_OLAND : +case CHIP_HAINAN : +dev_info (&pdev->dev, +"SI support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +#ifdef CONFIG_DRM_AMDGPU_CIK +if (!amdgpu_cik_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_KAVERI : +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KABINI : +case CHIP_MULLINS : +dev_info (&pdev->dev, +"CIK support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +/* Get rid of things like offb */ ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"amdgpudrmfb" );if (ret)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0 -35
@@ -144,41 +144,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)struct amdgpu_device *adev;int r, acpi_status; -#ifdef CONFIG_DRM_AMDGPU_SI -if (!amdgpu_si_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_TAHITI : -case CHIP_PITCAIRN : -case CHIP_VERDE : -case CHIP_OLAND : -case CHIP_HAINAN : -dev_info (dev->dev, -"SI support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" - ); -return -ENODEV ; - } - } -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK -if (!amdgpu_cik_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_KAVERI : -case CHIP_BONAIRE : -case CHIP_HAWAII : -case CHIP_KABINI : -case CHIP_MULLINS : -dev_info (dev->dev, -"CIK support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" - ); -return -ENODEV ; - } - } -#endif - adev =kzalloc (sizeof (struct amdgpu_device ),GFP_KERNEL );if (adev ==NULL ) {return -ENOMEM ;
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 20191010162817.55446-1-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Daniel Vetter
Reviewed-byQuoted 8 lines · Hans de Goede
Bail from the
pci_driverprobe function instead of from thedrm_driverload function.This avoid
/dev/dri/card0temporarily getting registered and then unregistered again, sending unwanted add / remove udev events to userspace.
Quoted 6 lines
Specifically this avoids triggering the (userspace) bug fixed by this plymouth merge-request:
https://gitlab.freedesktop.org/plymouth/plymouth/merge_requests/59Note that despite that being a userspace bug, not sending unnecessary udev events is a good idea in general.
I think even better would be getting rid of the load/unload callbacks, this issue here isn't the only problem with them.
I guess also cc: stable material?
-Daniel
Quoted 103 lines
Signed-off-by Hans de Goede <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 ------------------------- 2 files changed, 35 insertions(+), 35 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +35
-0@@ -1048,6 +1048,41 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,return -ENODEV ; } +#ifdef CONFIG_DRM_AMDGPU_SI +if (!amdgpu_si_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_TAHITI : +case CHIP_PITCAIRN : +case CHIP_VERDE : +case CHIP_OLAND : +case CHIP_HAINAN : +dev_info (&pdev->dev, +"SI support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +#ifdef CONFIG_DRM_AMDGPU_CIK +if (!amdgpu_cik_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_KAVERI : +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KABINI : +case CHIP_MULLINS : +dev_info (&pdev->dev, +"CIK support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +/* Get rid of things like offb */ ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"amdgpudrmfb" );if (ret)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-36@@ -144,41 +144,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)struct amdgpu_device *adev;int r, acpi_status; -#ifdef CONFIG_DRM_AMDGPU_SI -if (!amdgpu_si_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_TAHITI : -case CHIP_PITCAIRN : -case CHIP_VERDE : -case CHIP_OLAND : -case CHIP_HAINAN : -dev_info (dev->dev, -"SI support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" - ); -return -ENODEV ; - } - } -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK -if (!amdgpu_cik_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_KAVERI : -case CHIP_BONAIRE : -case CHIP_HAWAII : -case CHIP_KABINI : -case CHIP_MULLINS : -dev_info (dev->dev, -"CIK support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" - ); -return -ENODEV ; - } - } -#endif - adev =kzalloc (sizeof (struct amdgpu_device ),GFP_KERNEL );if (adev ==NULL ) {return -ENOMEM ; --2.23.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Hi,
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · Hans de Goede
Bail from the
pci_driverprobe function instead of from thedrm_driverload function.This avoid
/dev/dri/card0temporarily getting registered and then unregistered again, sending unwanted add / remove udev events to userspace.Specifically this avoids triggering the (userspace) bug fixed by this plymouth merge-request:
https://gitlab.freedesktop.org/plymouth/plymouth/merge_requests/59
Quoted 7 lines
Quoted 2 lines
Note that despite that being a userspace bug, not sending unnecessary udev events is a good idea in general.
I think even better would be getting rid of the load/unload callbacks, this issue here isn't the only problem with them.
Reviewed-by Daniel Vetter <[email protected]>
Thanks,
Quoted 1 line
I guess also cc: stable material?
Yes.
amdgpu maintainers, can you please add a Cc: stable while merging? Let me know if you want a new version with this added.
Regards,
Hans
Quoted 94 lines
Quoted 94 lines
Signed-off-by Hans de Goede <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 ------------------------- 2 files changed, 35 insertions(+), 35 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +35
-0@@ -1048,6 +1048,41 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,return -ENODEV ; } +#ifdef CONFIG_DRM_AMDGPU_SI +if (!amdgpu_si_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_TAHITI : +case CHIP_PITCAIRN : +case CHIP_VERDE : +case CHIP_OLAND : +case CHIP_HAINAN : +dev_info (&pdev->dev, +"SI support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +#ifdef CONFIG_DRM_AMDGPU_CIK +if (!amdgpu_cik_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_KAVERI : +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KABINI : +case CHIP_MULLINS : +dev_info (&pdev->dev, +"CIK support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +/* Get rid of things like offb */ ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"amdgpudrmfb" );if (ret)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-33@@ -144,41 +144,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)struct amdgpu_device *adev;int r, acpi_status; -#ifdef CONFIG_DRM_AMDGPU_SI -if (!amdgpu_si_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_TAHITI : -case CHIP_PITCAIRN : -case CHIP_VERDE : -case CHIP_OLAND : -case CHIP_HAINAN : -dev_info (dev->dev, -"SI support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" - ); -return -ENODEV ; - } - } -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK -if (!amdgpu_cik_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_KAVERI : -case CHIP_BONAIRE : -case CHIP_HAWAII : -case CHIP_KABINI : -case CHIP_MULLINS : -dev_info (dev->dev, -"CIK support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" - ); -return -ENODEV ; - } - }
Quoted 10 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-3-#endif - adev =kzalloc (sizeof (struct amdgpu_device ),GFP_KERNEL );if (adev ==NULL ) {return -ENOMEM ; --2.23.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 69b96e00-6ee7-4887-1f79-04ebd1b470c7-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Quoted 25 lines · Hans de Goede
Hi,
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · Hans de Goede
Bail from the
pci_driverprobe function instead of from thedrm_driverload function.This avoid
/dev/dri/card0temporarily getting registered and then unregistered again, sending unwanted add / remove udev events to userspace.Specifically this avoids triggering the (userspace) bug fixed by this plymouth merge-request:
https://gitlab.freedesktop.org/plymouth/plymouth/merge_requests/59Quoted 7 lines
Quoted 2 lines
Note that despite that being a userspace bug, not sending unnecessary udev events is a good idea in general.
I think even better would be getting rid of the load/unload callbacks, this issue here isn't the only problem with them.
Reviewed-by Daniel Vetter <[email protected]>
Quoted 8 lines
Thanks,
Quoted 1 line
I guess also cc: stable material?
Yes.
amdgpu maintainers, can you please add a Cc: stable while merging? Let me know if you want a new version with this added.
I'll take care of it when I merge this. Thanks!
Alex
Quoted 112 lines
Regards,
Hans
Quoted 94 lines
Quoted 94 lines
Signed-off-by Hans de Goede <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 35 ------------------------- 2 files changed, 35 insertions(+), 35 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +35
-0@@ -1048,6 +1048,41 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,return -ENODEV ; } +#ifdef CONFIG_DRM_AMDGPU_SI +if (!amdgpu_si_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_TAHITI : +case CHIP_PITCAIRN : +case CHIP_VERDE : +case CHIP_OLAND : +case CHIP_HAINAN : +dev_info (&pdev->dev, +"SI support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +#ifdef CONFIG_DRM_AMDGPU_CIK +if (!amdgpu_cik_support) { +switch (flags &AMD_ASIC_MASK ) { +case CHIP_KAVERI : +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KABINI : +case CHIP_MULLINS : +dev_info (&pdev->dev, +"CIK support provided by radeon.\n" ); +dev_info (&pdev->dev, +"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" + ); +return -ENODEV ; + } + } +#endif +/* Get rid of things like offb */ ret =drm_fb_helper_remove_conflicting_pci_framebuffers (pdev,0 ,"amdgpudrmfb" );if (ret)drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-33@@ -144,41 +144,6 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)struct amdgpu_device *adev;int r, acpi_status; -#ifdef CONFIG_DRM_AMDGPU_SI -if (!amdgpu_si_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_TAHITI : -case CHIP_PITCAIRN : -case CHIP_VERDE : -case CHIP_OLAND : -case CHIP_HAINAN : -dev_info (dev->dev, -"SI support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" - ); -return -ENODEV ; - } - } -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK -if (!amdgpu_cik_support) { -switch (flags &AMD_ASIC_MASK ) { -case CHIP_KAVERI : -case CHIP_BONAIRE : -case CHIP_HAWAII : -case CHIP_KABINI : -case CHIP_MULLINS : -dev_info (dev->dev, -"CIK support provided by radeon.\n" ); -dev_info (dev->dev, -"Use radeon.cik_support=0 amdgpu.cik_support=1 to override.\n" - ); -return -ENODEV ; - } - }Quoted 10 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +0
-3-#endif - adev =kzalloc (sizeof (struct amdgpu_device ),GFP_KERNEL );if (adev ==NULL ) {return -ENOMEM ; --2.23.0
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx