Skip to content

Commit 784e27f

Browse files
committed
fbdev/efifb: Do not track parent device status
There will be no EFI framebuffer device for disabled parent devices and thus we never probe efifb in that case. Hence remove the tracking code from efifb. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240212090736.11464-7-tzimmermann@suse.de
1 parent 4e75459 commit 784e27f

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

drivers/video/fbdev/efifb.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,6 @@ static struct attribute *efifb_attrs[] = {
348348
};
349349
ATTRIBUTE_GROUPS(efifb);
350350

351-
static bool pci_dev_disabled; /* FB base matches BAR of a disabled device */
352-
353351
static struct resource *bar_resource;
354352
static u64 bar_offset;
355353

@@ -377,7 +375,7 @@ static int efifb_probe(struct platform_device *dev)
377375
if (!si)
378376
return -ENOMEM;
379377

380-
if (si->orig_video_isVGA != VIDEO_TYPE_EFI || pci_dev_disabled)
378+
if (si->orig_video_isVGA != VIDEO_TYPE_EFI)
381379
return -ENODEV;
382380

383381
if (fb_get_options("efifb", &option))
@@ -653,7 +651,6 @@ static void record_efifb_bar_resource(struct pci_dev *dev, int idx, u64 offset)
653651

654652
pci_read_config_word(dev, PCI_COMMAND, &word);
655653
if (!(word & PCI_COMMAND_MEMORY)) {
656-
pci_dev_disabled = true;
657654
dev_err(&dev->dev,
658655
"BAR %d: assigned to efifb but device is disabled!\n",
659656
idx);

0 commit comments

Comments
 (0)