| Message ID | 20241004152429.4329-1-gonzalo.silvalde@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] fbdev: sstfb: Make CONFIG_FB_DEVICE optional | expand |
Hi Am 04.10.24 um 17:24 schrieb Gonzalo Silvalde Blanco: > The sstfb driver currently depends on CONFIG_FB_DEVICE to create sysfs > entries and access info->dev. This patch wraps the relevant code blocks > with #ifdef CONFIG_FB_DEVICE, allowing the driver to be built and used > even if CONFIG_FB_DEVICE is not selected. > > The sysfs setting only controls the VGA pass-through state and is not > required for the display to work correctly. > (See: http://vogonswiki.com/index.php/VGA_passthrough_cable > for more information.) > > Tested by building with and without CONFIG_FB_DEVICE, both of which > compiled without issues. > > Signed-off-by: Gonzalo Silvalde Blanco <gonzalo.silvalde@gmail.com> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> One thing I forgot, is that you also have to remove the dependency from the Kconfig option. [1] Otherwise, it won't be possible to select the driver. Best regards Thomas [1] https://elixir.bootlin.com/linux/v6.11.2/source/drivers/video/fbdev/Kconfig#L1239 > --- > drivers/video/fbdev/sstfb.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/video/fbdev/sstfb.c b/drivers/video/fbdev/sstfb.c > index f8ae54ca0cc3..8d2e9d1f8d80 100644 > --- a/drivers/video/fbdev/sstfb.c > +++ b/drivers/video/fbdev/sstfb.c > @@ -716,6 +716,7 @@ static void sstfb_setvgapass( struct fb_info *info, int enable ) > pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp); > } > > +#ifdef CONFIG_FB_DEVICE > static ssize_t store_vgapass(struct device *device, struct device_attribute *attr, > const char *buf, size_t count) > { > @@ -736,10 +737,10 @@ static ssize_t show_vgapass(struct device *device, struct device_attribute *attr > struct sstfb_par *par = info->par; > return sprintf(buf, "%d\n", par->vgapass); > } > - > static struct device_attribute device_attrs[] = { > __ATTR(vgapass, S_IRUGO|S_IWUSR, show_vgapass, store_vgapass) > }; > +#endif > > static int sstfb_ioctl(struct fb_info *info, unsigned int cmd, > unsigned long arg) > @@ -1435,10 +1436,10 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) > } > > sstfb_clear_screen(info); > - > +#fdef CONFIG_FB_DEVICE > if (device_create_file(info->dev, &device_attrs[0])) > printk(KERN_WARNING "sstfb: can't create sysfs entry.\n"); > - > +#endif > > fb_info(info, "%s frame buffer device at 0x%p\n", > fix->id, info->screen_base); > @@ -1467,8 +1468,9 @@ static void sstfb_remove(struct pci_dev *pdev) > > info = pci_get_drvdata(pdev); > par = info->par; > - > +#ifdef CONFIG_FB_DEVICE > device_remove_file(info->dev, &device_attrs[0]); > +#endif > sst_shutdown(info); > iounmap(info->screen_base); > iounmap(par->mmio_vbase);
Hi Gonzalo, kernel test robot noticed the following build errors: [auto build test ERROR on drm-misc/drm-misc-next] [also build test ERROR on drm-tip/drm-tip linus/master v6.12-rc2 next-20241004] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Gonzalo-Silvalde-Blanco/fbdev-sstfb-Make-CONFIG_FB_DEVICE-optional/20241004-232658 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20241004152429.4329-1-gonzalo.silvalde%40gmail.com patch subject: [PATCH v2] fbdev: sstfb: Make CONFIG_FB_DEVICE optional config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20241007/202410071957.gJryKfOF-lkp@intel.com/config) compiler: clang version 18.1.8 (https://github.com/llvm/llvm-project 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241007/202410071957.gJryKfOF-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202410071957.gJryKfOF-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/video/fbdev/sstfb.c:1439:2: error: invalid preprocessing directive 1439 | #fdef CONFIG_FB_DEVICE | ^ >> drivers/video/fbdev/sstfb.c:1442:2: error: #endif without #if 1442 | #endif | ^ 2 errors generated. Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for MODVERSIONS Depends on [n]: MODULES [=y] && !COMPILE_TEST [=y] Selected by [y]: - RANDSTRUCT_FULL [=y] && (CC_HAS_RANDSTRUCT [=y] || GCC_PLUGINS [=n]) && MODULES [=y] vim +1439 drivers/video/fbdev/sstfb.c 1320 1321 static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 1322 { 1323 struct fb_info *info; 1324 struct fb_fix_screeninfo *fix; 1325 struct sstfb_par *par; 1326 struct sst_spec *spec; 1327 int err; 1328 1329 err = aperture_remove_conflicting_pci_devices(pdev, "sstfb"); 1330 if (err) 1331 return err; 1332 1333 /* Enable device in PCI config. */ 1334 if ((err=pci_enable_device(pdev))) { 1335 printk(KERN_ERR "cannot enable device\n"); 1336 return err; 1337 } 1338 1339 /* Allocate the fb and par structures. */ 1340 info = framebuffer_alloc(sizeof(struct sstfb_par), &pdev->dev); 1341 if (!info) 1342 return -ENOMEM; 1343 1344 pci_set_drvdata(pdev, info); 1345 1346 par = info->par; 1347 fix = &info->fix; 1348 1349 par->type = id->driver_data; 1350 spec = &voodoo_spec[par->type]; 1351 f_ddprintk("found device : %s\n", spec->name); 1352 1353 par->dev = pdev; 1354 par->revision = pdev->revision; 1355 1356 fix->mmio_start = pci_resource_start(pdev,0); 1357 fix->mmio_len = 0x400000; 1358 fix->smem_start = fix->mmio_start + 0x400000; 1359 1360 if (!request_mem_region(fix->mmio_start, fix->mmio_len, "sstfb MMIO")) { 1361 printk(KERN_ERR "sstfb: cannot reserve mmio memory\n"); 1362 goto fail_mmio_mem; 1363 } 1364 1365 if (!request_mem_region(fix->smem_start, 0x400000,"sstfb FB")) { 1366 printk(KERN_ERR "sstfb: cannot reserve fb memory\n"); 1367 goto fail_fb_mem; 1368 } 1369 1370 par->mmio_vbase = ioremap(fix->mmio_start, 1371 fix->mmio_len); 1372 if (!par->mmio_vbase) { 1373 printk(KERN_ERR "sstfb: cannot remap register area %#lx\n", 1374 fix->mmio_start); 1375 goto fail_mmio_remap; 1376 } 1377 info->screen_base = ioremap(fix->smem_start, 0x400000); 1378 if (!info->screen_base) { 1379 printk(KERN_ERR "sstfb: cannot remap framebuffer %#lx\n", 1380 fix->smem_start); 1381 goto fail_fb_remap; 1382 } 1383 1384 if (!sst_init(info, par)) { 1385 printk(KERN_ERR "sstfb: Init failed\n"); 1386 goto fail; 1387 } 1388 sst_get_memsize(info, &fix->smem_len); 1389 strscpy(fix->id, spec->name, sizeof(fix->id)); 1390 1391 printk(KERN_INFO "%s (revision %d) with %s dac\n", 1392 fix->id, par->revision, par->dac_sw.name); 1393 printk(KERN_INFO "framebuffer at %#lx, mapped to 0x%p, size %dMB\n", 1394 fix->smem_start, info->screen_base, 1395 fix->smem_len >> 20); 1396 1397 f_ddprintk("regbase_virt: %p\n", par->mmio_vbase); 1398 f_ddprintk("membase_phys: %#lx\n", fix->smem_start); 1399 f_ddprintk("fbbase_virt: %p\n", info->screen_base); 1400 1401 info->fbops = &sstfb_ops; 1402 info->pseudo_palette = par->palette; 1403 1404 fix->type = FB_TYPE_PACKED_PIXELS; 1405 fix->visual = FB_VISUAL_TRUECOLOR; 1406 fix->accel = FB_ACCEL_NONE; /* FIXME */ 1407 /* 1408 * According to the specs, the linelength must be of 1024 *pixels* 1409 * and the 24bpp mode is in fact a 32 bpp mode (and both are in 1410 * fact dithered to 16bit). 1411 */ 1412 fix->line_length = 2048; /* default value, for 24 or 32bit: 4096 */ 1413 1414 fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16); 1415 1416 if (sstfb_check_var(&info->var, info)) { 1417 printk(KERN_ERR "sstfb: invalid video mode.\n"); 1418 goto fail; 1419 } 1420 1421 if (sstfb_set_par(info)) { 1422 printk(KERN_ERR "sstfb: can't set default video mode.\n"); 1423 goto fail; 1424 } 1425 1426 if (fb_alloc_cmap(&info->cmap, 256, 0)) { 1427 printk(KERN_ERR "sstfb: can't alloc cmap memory.\n"); 1428 goto fail; 1429 } 1430 1431 /* register fb */ 1432 info->device = &pdev->dev; 1433 if (register_framebuffer(info) < 0) { 1434 printk(KERN_ERR "sstfb: can't register framebuffer.\n"); 1435 goto fail_register; 1436 } 1437 1438 sstfb_clear_screen(info); > 1439 #fdef CONFIG_FB_DEVICE 1440 if (device_create_file(info->dev, &device_attrs[0])) 1441 printk(KERN_WARNING "sstfb: can't create sysfs entry.\n"); > 1442 #endif 1443 1444 fb_info(info, "%s frame buffer device at 0x%p\n", 1445 fix->id, info->screen_base); 1446 1447 return 0; 1448 1449 fail_register: 1450 fb_dealloc_cmap(&info->cmap); 1451 fail: 1452 iounmap(info->screen_base); 1453 fail_fb_remap: 1454 iounmap(par->mmio_vbase); 1455 fail_mmio_remap: 1456 release_mem_region(fix->smem_start, 0x400000); 1457 fail_fb_mem: 1458 release_mem_region(fix->mmio_start, info->fix.mmio_len); 1459 fail_mmio_mem: 1460 framebuffer_release(info); 1461 return -ENXIO; /* no voodoo detected */ 1462 } 1463
Hi Gonzalo, kernel test robot noticed the following build errors: [auto build test ERROR on drm-misc/drm-misc-next] [also build test ERROR on linus/master v6.12-rc2 next-20241004] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Gonzalo-Silvalde-Blanco/fbdev-sstfb-Make-CONFIG_FB_DEVICE-optional/20241004-232658 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20241004152429.4329-1-gonzalo.silvalde%40gmail.com patch subject: [PATCH v2] fbdev: sstfb: Make CONFIG_FB_DEVICE optional config: i386-allyesconfig (https://download.01.org/0day-ci/archive/20241007/202410072022.oRqUf7DT-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241007/202410072022.oRqUf7DT-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202410072022.oRqUf7DT-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/video/fbdev/sstfb.c: In function 'sstfb_probe': >> drivers/video/fbdev/sstfb.c:1439:2: error: invalid preprocessing directive #fdef; did you mean #ifdef? 1439 | #fdef CONFIG_FB_DEVICE | ^~~~ | ifdef drivers/video/fbdev/sstfb.c:1442:2: error: #endif without #if 1442 | #endif | ^~~~~ Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for MODVERSIONS Depends on [n]: MODULES [=y] && !COMPILE_TEST [=y] Selected by [y]: - RANDSTRUCT_FULL [=y] && (CC_HAS_RANDSTRUCT [=n] || GCC_PLUGINS [=y]) && MODULES [=y] WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [y]: - RESOURCE_KUNIT_TEST [=y] && RUNTIME_TESTING_MENU [=y] && KUNIT [=y] vim +1439 drivers/video/fbdev/sstfb.c 1320 1321 static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 1322 { 1323 struct fb_info *info; 1324 struct fb_fix_screeninfo *fix; 1325 struct sstfb_par *par; 1326 struct sst_spec *spec; 1327 int err; 1328 1329 err = aperture_remove_conflicting_pci_devices(pdev, "sstfb"); 1330 if (err) 1331 return err; 1332 1333 /* Enable device in PCI config. */ 1334 if ((err=pci_enable_device(pdev))) { 1335 printk(KERN_ERR "cannot enable device\n"); 1336 return err; 1337 } 1338 1339 /* Allocate the fb and par structures. */ 1340 info = framebuffer_alloc(sizeof(struct sstfb_par), &pdev->dev); 1341 if (!info) 1342 return -ENOMEM; 1343 1344 pci_set_drvdata(pdev, info); 1345 1346 par = info->par; 1347 fix = &info->fix; 1348 1349 par->type = id->driver_data; 1350 spec = &voodoo_spec[par->type]; 1351 f_ddprintk("found device : %s\n", spec->name); 1352 1353 par->dev = pdev; 1354 par->revision = pdev->revision; 1355 1356 fix->mmio_start = pci_resource_start(pdev,0); 1357 fix->mmio_len = 0x400000; 1358 fix->smem_start = fix->mmio_start + 0x400000; 1359 1360 if (!request_mem_region(fix->mmio_start, fix->mmio_len, "sstfb MMIO")) { 1361 printk(KERN_ERR "sstfb: cannot reserve mmio memory\n"); 1362 goto fail_mmio_mem; 1363 } 1364 1365 if (!request_mem_region(fix->smem_start, 0x400000,"sstfb FB")) { 1366 printk(KERN_ERR "sstfb: cannot reserve fb memory\n"); 1367 goto fail_fb_mem; 1368 } 1369 1370 par->mmio_vbase = ioremap(fix->mmio_start, 1371 fix->mmio_len); 1372 if (!par->mmio_vbase) { 1373 printk(KERN_ERR "sstfb: cannot remap register area %#lx\n", 1374 fix->mmio_start); 1375 goto fail_mmio_remap; 1376 } 1377 info->screen_base = ioremap(fix->smem_start, 0x400000); 1378 if (!info->screen_base) { 1379 printk(KERN_ERR "sstfb: cannot remap framebuffer %#lx\n", 1380 fix->smem_start); 1381 goto fail_fb_remap; 1382 } 1383 1384 if (!sst_init(info, par)) { 1385 printk(KERN_ERR "sstfb: Init failed\n"); 1386 goto fail; 1387 } 1388 sst_get_memsize(info, &fix->smem_len); 1389 strscpy(fix->id, spec->name, sizeof(fix->id)); 1390 1391 printk(KERN_INFO "%s (revision %d) with %s dac\n", 1392 fix->id, par->revision, par->dac_sw.name); 1393 printk(KERN_INFO "framebuffer at %#lx, mapped to 0x%p, size %dMB\n", 1394 fix->smem_start, info->screen_base, 1395 fix->smem_len >> 20); 1396 1397 f_ddprintk("regbase_virt: %p\n", par->mmio_vbase); 1398 f_ddprintk("membase_phys: %#lx\n", fix->smem_start); 1399 f_ddprintk("fbbase_virt: %p\n", info->screen_base); 1400 1401 info->fbops = &sstfb_ops; 1402 info->pseudo_palette = par->palette; 1403 1404 fix->type = FB_TYPE_PACKED_PIXELS; 1405 fix->visual = FB_VISUAL_TRUECOLOR; 1406 fix->accel = FB_ACCEL_NONE; /* FIXME */ 1407 /* 1408 * According to the specs, the linelength must be of 1024 *pixels* 1409 * and the 24bpp mode is in fact a 32 bpp mode (and both are in 1410 * fact dithered to 16bit). 1411 */ 1412 fix->line_length = 2048; /* default value, for 24 or 32bit: 4096 */ 1413 1414 fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16); 1415 1416 if (sstfb_check_var(&info->var, info)) { 1417 printk(KERN_ERR "sstfb: invalid video mode.\n"); 1418 goto fail; 1419 } 1420 1421 if (sstfb_set_par(info)) { 1422 printk(KERN_ERR "sstfb: can't set default video mode.\n"); 1423 goto fail; 1424 } 1425 1426 if (fb_alloc_cmap(&info->cmap, 256, 0)) { 1427 printk(KERN_ERR "sstfb: can't alloc cmap memory.\n"); 1428 goto fail; 1429 } 1430 1431 /* register fb */ 1432 info->device = &pdev->dev; 1433 if (register_framebuffer(info) < 0) { 1434 printk(KERN_ERR "sstfb: can't register framebuffer.\n"); 1435 goto fail_register; 1436 } 1437 1438 sstfb_clear_screen(info); > 1439 #fdef CONFIG_FB_DEVICE 1440 if (device_create_file(info->dev, &device_attrs[0])) 1441 printk(KERN_WARNING "sstfb: can't create sysfs entry.\n"); 1442 #endif 1443 1444 fb_info(info, "%s frame buffer device at 0x%p\n", 1445 fix->id, info->screen_base); 1446 1447 return 0; 1448 1449 fail_register: 1450 fb_dealloc_cmap(&info->cmap); 1451 fail: 1452 iounmap(info->screen_base); 1453 fail_fb_remap: 1454 iounmap(par->mmio_vbase); 1455 fail_mmio_remap: 1456 release_mem_region(fix->smem_start, 0x400000); 1457 fail_fb_mem: 1458 release_mem_region(fix->mmio_start, info->fix.mmio_len); 1459 fail_mmio_mem: 1460 framebuffer_release(info); 1461 return -ENXIO; /* no voodoo detected */ 1462 } 1463
diff --git a/drivers/video/fbdev/sstfb.c b/drivers/video/fbdev/sstfb.c index f8ae54ca0cc3..8d2e9d1f8d80 100644 --- a/drivers/video/fbdev/sstfb.c +++ b/drivers/video/fbdev/sstfb.c @@ -716,6 +716,7 @@ static void sstfb_setvgapass( struct fb_info *info, int enable ) pci_write_config_dword(sst_dev, PCI_INIT_ENABLE, tmp); } +#ifdef CONFIG_FB_DEVICE static ssize_t store_vgapass(struct device *device, struct device_attribute *attr, const char *buf, size_t count) { @@ -736,10 +737,10 @@ static ssize_t show_vgapass(struct device *device, struct device_attribute *attr struct sstfb_par *par = info->par; return sprintf(buf, "%d\n", par->vgapass); } - static struct device_attribute device_attrs[] = { __ATTR(vgapass, S_IRUGO|S_IWUSR, show_vgapass, store_vgapass) }; +#endif static int sstfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) @@ -1435,10 +1436,10 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) } sstfb_clear_screen(info); - +#fdef CONFIG_FB_DEVICE if (device_create_file(info->dev, &device_attrs[0])) printk(KERN_WARNING "sstfb: can't create sysfs entry.\n"); - +#endif fb_info(info, "%s frame buffer device at 0x%p\n", fix->id, info->screen_base); @@ -1467,8 +1468,9 @@ static void sstfb_remove(struct pci_dev *pdev) info = pci_get_drvdata(pdev); par = info->par; - +#ifdef CONFIG_FB_DEVICE device_remove_file(info->dev, &device_attrs[0]); +#endif sst_shutdown(info); iounmap(info->screen_base); iounmap(par->mmio_vbase);
The sstfb driver currently depends on CONFIG_FB_DEVICE to create sysfs entries and access info->dev. This patch wraps the relevant code blocks with #ifdef CONFIG_FB_DEVICE, allowing the driver to be built and used even if CONFIG_FB_DEVICE is not selected. The sysfs setting only controls the VGA pass-through state and is not required for the display to work correctly. (See: http://vogonswiki.com/index.php/VGA_passthrough_cable for more information.) Tested by building with and without CONFIG_FB_DEVICE, both of which compiled without issues. Signed-off-by: Gonzalo Silvalde Blanco <gonzalo.silvalde@gmail.com> --- drivers/video/fbdev/sstfb.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)