[PATCH] efifb: Check efifb_pci_dev before using it

Subsystems: efifb framebuffer driver, framebuffer layer, the rest

STALE1941d

5 messages, 4 authors, 2021-04-22 · open the first message on its own page

[PATCH] efifb: Check efifb_pci_dev before using it

From: Kai-Heng Feng <hidden>
Date: 2021-04-13 17:05:22 

On some platforms like Hyper-V and RPi4 with UEFI firmware, efifb is not
a PCI device.

So make sure efifb_pci_dev is found before using it.

Fixes: a6c0fd3d5a8b ("efifb: Ensure graphics device for efifb stays at PCI D0")
BugLink: https://bugs.launchpad.net/bugs/1922403
Signed-off-by: Kai-Heng Feng <redacted>
---
 drivers/video/fbdev/efifb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index f58a545b3bf3..8ea8f079cde2 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -575,7 +575,8 @@ static int efifb_probe(struct platform_device *dev)
 		goto err_fb_dealoc;
 	}
 	fb_info(info, "%s frame buffer device\n", info->fix.id);
-	pm_runtime_get_sync(&efifb_pci_dev->dev);
+	if (efifb_pci_dev)
+		pm_runtime_get_sync(&efifb_pci_dev->dev);
 	return 0;
 
 err_fb_dealoc:
@@ -602,7 +603,8 @@ static int efifb_remove(struct platform_device *pdev)
 	unregister_framebuffer(info);
 	sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
 	framebuffer_release(info);
-	pm_runtime_put(&efifb_pci_dev->dev);
+	if (efifb_pci_dev)
+		pm_runtime_put(&efifb_pci_dev->dev);
 
 	return 0;
 }
-- 
2.30.2

Re: [PATCH] efifb: Check efifb_pci_dev before using it

From: Alex Deucher <hidden>
Date: 2021-04-13 18:02:12 

On Tue, Apr 13, 2021 at 1:05 PM Kai-Heng Feng
[off-list ref] wrote:
On some platforms like Hyper-V and RPi4 with UEFI firmware, efifb is not
a PCI device.

So make sure efifb_pci_dev is found before using it.

Fixes: a6c0fd3d5a8b ("efifb: Ensure graphics device for efifb stays at PCI D0")
BugLink: https://bugs.launchpad.net/bugs/1922403
Signed-off-by: Kai-Heng Feng <redacted>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
quoted hunk
---
 drivers/video/fbdev/efifb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index f58a545b3bf3..8ea8f079cde2 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -575,7 +575,8 @@ static int efifb_probe(struct platform_device *dev)
                goto err_fb_dealoc;
        }
        fb_info(info, "%s frame buffer device\n", info->fix.id);
-       pm_runtime_get_sync(&efifb_pci_dev->dev);
+       if (efifb_pci_dev)
+               pm_runtime_get_sync(&efifb_pci_dev->dev);
        return 0;

 err_fb_dealoc:
@@ -602,7 +603,8 @@ static int efifb_remove(struct platform_device *pdev)
        unregister_framebuffer(info);
        sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
        framebuffer_release(info);
-       pm_runtime_put(&efifb_pci_dev->dev);
+       if (efifb_pci_dev)
+               pm_runtime_put(&efifb_pci_dev->dev);

        return 0;
 }
--
2.30.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] efifb: Check efifb_pci_dev before using it

From: Daniel Vetter <hidden>
Date: 2021-04-13 18:37:46 

On Tue, Apr 13, 2021 at 8:02 PM Alex Deucher [off-list ref] wrote:
On Tue, Apr 13, 2021 at 1:05 PM Kai-Heng Feng
[off-list ref] wrote:
quoted
On some platforms like Hyper-V and RPi4 with UEFI firmware, efifb is not
a PCI device.

So make sure efifb_pci_dev is found before using it.

Fixes: a6c0fd3d5a8b ("efifb: Ensure graphics device for efifb stays at PCI D0")
BugLink: https://bugs.launchpad.net/bugs/1922403
Signed-off-by: Kai-Heng Feng <redacted>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
fbdev is in drm-misc, so maybe you can push this one too?
-Daniel

quoted
---
 drivers/video/fbdev/efifb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index f58a545b3bf3..8ea8f079cde2 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -575,7 +575,8 @@ static int efifb_probe(struct platform_device *dev)
                goto err_fb_dealoc;
        }
        fb_info(info, "%s frame buffer device\n", info->fix.id);
-       pm_runtime_get_sync(&efifb_pci_dev->dev);
+       if (efifb_pci_dev)
+               pm_runtime_get_sync(&efifb_pci_dev->dev);
        return 0;

 err_fb_dealoc:
@@ -602,7 +603,8 @@ static int efifb_remove(struct platform_device *pdev)
        unregister_framebuffer(info);
        sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
        framebuffer_release(info);
-       pm_runtime_put(&efifb_pci_dev->dev);
+       if (efifb_pci_dev)
+               pm_runtime_put(&efifb_pci_dev->dev);

        return 0;
 }
--
2.30.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch





  

    
Re: [PATCH] efifb: Check efifb_pci_dev before using it

    

      From: Alex Deucher <hidden>

      Date: 2021-04-13 22:36:35 
    

  

  
On Tue, Apr 13, 2021 at 2:37 PM Daniel Vetter [off-list ref] wrote:
On Tue, Apr 13, 2021 at 8:02 PM Alex Deucher [off-list ref] wrote:
quoted
On Tue, Apr 13, 2021 at 1:05 PM Kai-Heng Feng
[off-list ref] wrote:
quoted
On some platforms like Hyper-V and RPi4 with UEFI firmware, efifb is not
a PCI device.

So make sure efifb_pci_dev is found before using it.

Fixes: a6c0fd3d5a8b ("efifb: Ensure graphics device for efifb stays at PCI D0")
BugLink: https://bugs.launchpad.net/bugs/1922403
Signed-off-by: Kai-Heng Feng <redacted>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
fbdev is in drm-misc, so maybe you can push this one too?
Yes, pushed.  Thanks!

Alex

-Daniel

quoted
quoted
---
 drivers/video/fbdev/efifb.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index f58a545b3bf3..8ea8f079cde2 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -575,7 +575,8 @@ static int efifb_probe(struct platform_device *dev)
                goto err_fb_dealoc;
        }
        fb_info(info, "%s frame buffer device\n", info->fix.id);
-       pm_runtime_get_sync(&efifb_pci_dev->dev);
+       if (efifb_pci_dev)
+               pm_runtime_get_sync(&efifb_pci_dev->dev);
        return 0;

 err_fb_dealoc:
@@ -602,7 +603,8 @@ static int efifb_remove(struct platform_device *pdev)
        unregister_framebuffer(info);
        sysfs_remove_groups(&pdev->dev.kobj, efifb_groups);
        framebuffer_release(info);
-       pm_runtime_put(&efifb_pci_dev->dev);
+       if (efifb_pci_dev)
+               pm_runtime_put(&efifb_pci_dev->dev);

        return 0;
 }
--
2.30.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel


--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch





  

    
Re: [PATCH] efifb: Check efifb_pci_dev before using it

    

      From: Sudeep Holla <hidden>

      Date: 2021-04-22 10:41:26 
    

  

  
On Wed, Apr 14, 2021 at 8:20 AM Alex Deucher [off-list ref] wrote:
On Tue, Apr 13, 2021 at 2:37 PM Daniel Vetter [off-list ref] wrote:
quoted
On Tue, Apr 13, 2021 at 8:02 PM Alex Deucher [off-list ref] wrote:
quoted
On Tue, Apr 13, 2021 at 1:05 PM Kai-Heng Feng
[off-list ref] wrote:
quoted
On some platforms like Hyper-V and RPi4 with UEFI firmware, efifb is not
a PCI device.

So make sure efifb_pci_dev is found before using it.

Fixes: a6c0fd3d5a8b ("efifb: Ensure graphics device for efifb stays at PCI D0")
BugLink: https://bugs.launchpad.net/bugs/1922403
Signed-off-by: Kai-Heng Feng <redacted>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
fbdev is in drm-misc, so maybe you can push this one too?
Yes, pushed.  Thanks!
Can we have this pushed into the branch that gets merged into linux-next.
I still don't see this fix in -next and we are unable to do testing on our
platform as we hit a boot crash without this as reported in [1]. We prefer
running tests on -next without any additional patches or reverts, hence
the nagging, sorry for that.

Regards,
Sudeep

[1] https://lore.kernel.org/dri-devel/20210415102224.2764054-1-sudeep.holla@arm.com/




    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread

          
kprevious message in thread

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help