* [PATCH] This patch replaces all the instances of dev_info with drm_info
@ 2021-06-22 7:15 Aman Jain
2021-06-22 18:34 ` kernel test robot
0 siblings, 1 reply; 2+ messages in thread
From: Aman Jain @ 2021-06-22 7:15 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, daniel, amd-gfx,
linux-kernel
When a driver has multiple instances it is necessary to differentiate
between them in the logs. This was done with dev_info/warn/err since
DRM_INFO/WARN/ERROR don't do this. We now have drm_info/warn/err for
printing the relevant debug messages. Hence, this patch uses
drm_* macros to achieve drm-formatted logging
Signed-off-by: Aman Jain <ahjain2706@gmail.com>
---
drivers/gpu/drm/radeon/radeon_drv.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index efeb115ae70e..639c447d9a1f 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -49,6 +49,7 @@
#include <drm/drm_probe_helper.h>
#include <drm/drm_vblank.h>
#include <drm/radeon_drm.h>
+#include <drm/drm_print.h>
#include "radeon_drv.h"
#include "radeon.h"
@@ -308,7 +309,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
case CHIP_VERDE:
case CHIP_OLAND:
case CHIP_HAINAN:
- dev_info(&pdev->dev,
+ drm_info(&pdev->dev,
"SI support disabled by module param\n");
return -ENODEV;
}
@@ -320,7 +321,7 @@ static int radeon_pci_probe(struct pci_dev *pdev,
case CHIP_HAWAII:
case CHIP_KABINI:
case CHIP_MULLINS:
- dev_info(&pdev->dev,
+ drm_info(&pdev->dev,
"CIK support disabled by module param\n");
return -ENODEV;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] This patch replaces all the instances of dev_info with drm_info
2021-06-22 7:15 [PATCH] This patch replaces all the instances of dev_info with drm_info Aman Jain
@ 2021-06-22 18:34 ` kernel test robot
0 siblings, 0 replies; 2+ messages in thread
From: kernel test robot @ 2021-06-22 18:34 UTC (permalink / raw)
To: Aman Jain, alexander.deucher, christian.koenig, airlied, daniel,
amd-gfx, linux-kernel
Cc: kbuild-all, clang-built-linux
[-- Attachment #1: Type: text/plain, Size: 6514 bytes --]
Hi Aman,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.13-rc7 next-20210622]
[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]
url: https://github.com/0day-ci/linux/commits/Aman-Jain/This-patch-replaces-all-the-instances-of-dev_info-with-drm_info/20210622-151557
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git a96bfed64c8986d6404e553f18203cae1f5ac7e6
config: powerpc64-randconfig-r001-20210622 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project b3634d3e88b7f26534a5057bff182b7dced584fc)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install powerpc64 cross compiling tool for clang build
# apt-get install binutils-powerpc64-linux-gnu
# https://github.com/0day-ci/linux/commit/ca9c5b613cf15d038d10e80c402b78e5925fc31e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Aman-Jain/This-patch-replaces-all-the-instances-of-dev_info-with-drm_info/20210622-151557
git checkout ca9c5b613cf15d038d10e80c402b78e5925fc31e
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=powerpc64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from drivers/gpu/drm/radeon/radeon_drv.c:33:
In file included from include/linux/compat.h:14:
In file included from include/linux/sem.h:5:
In file included from include/uapi/linux/sem.h:5:
In file included from include/linux/ipc.h:5:
In file included from include/linux/spinlock.h:51:
In file included from include/linux/preempt.h:11:
In file included from include/linux/list.h:9:
In file included from include/linux/kernel.h:12:
In file included from include/linux/bitops.h:32:
In file included from arch/powerpc/include/asm/bitops.h:62:
arch/powerpc/include/asm/barrier.h:49:9: warning: '__lwsync' macro redefined [-Wmacro-redefined]
#define __lwsync() __asm__ __volatile__ (stringify_in_c(LWSYNC) : : :"memory")
^
<built-in>:309:9: note: previous definition is here
#define __lwsync __builtin_ppc_lwsync
^
>> drivers/gpu/drm/radeon/radeon_drv.c:312:4: error: no member named 'dev' in 'struct device'
drm_info(&pdev->dev,
^~~~~~~~~~~~~~~~~~~~
include/drm/drm_print.h:416:2: note: expanded from macro 'drm_info'
__drm_printk((drm), info,, fmt, ##__VA_ARGS__)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/drm/drm_print.h:412:27: note: expanded from macro '__drm_printk'
dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:118:12: note: expanded from macro 'dev_info'
_dev_info(dev, dev_fmt(fmt), ##__VA_ARGS__)
^~~
drivers/gpu/drm/radeon/radeon_drv.c:324:4: error: no member named 'dev' in 'struct device'
drm_info(&pdev->dev,
^~~~~~~~~~~~~~~~~~~~
include/drm/drm_print.h:416:2: note: expanded from macro 'drm_info'
__drm_printk((drm), info,, fmt, ##__VA_ARGS__)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/drm/drm_print.h:412:27: note: expanded from macro '__drm_printk'
dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/linux/dev_printk.h:118:12: note: expanded from macro 'dev_info'
_dev_info(dev, dev_fmt(fmt), ##__VA_ARGS__)
^~~
1 warning and 2 errors generated.
vim +312 drivers/gpu/drm/radeon/radeon_drv.c
292
293 static int radeon_pci_probe(struct pci_dev *pdev,
294 const struct pci_device_id *ent)
295 {
296 unsigned long flags = 0;
297 struct drm_device *dev;
298 int ret;
299
300 if (!ent)
301 return -ENODEV; /* Avoid NULL-ptr deref in drm_get_pci_dev */
302
303 flags = ent->driver_data;
304
305 if (!radeon_si_support) {
306 switch (flags & RADEON_FAMILY_MASK) {
307 case CHIP_TAHITI:
308 case CHIP_PITCAIRN:
309 case CHIP_VERDE:
310 case CHIP_OLAND:
311 case CHIP_HAINAN:
> 312 drm_info(&pdev->dev,
313 "SI support disabled by module param\n");
314 return -ENODEV;
315 }
316 }
317 if (!radeon_cik_support) {
318 switch (flags & RADEON_FAMILY_MASK) {
319 case CHIP_KAVERI:
320 case CHIP_BONAIRE:
321 case CHIP_HAWAII:
322 case CHIP_KABINI:
323 case CHIP_MULLINS:
324 drm_info(&pdev->dev,
325 "CIK support disabled by module param\n");
326 return -ENODEV;
327 }
328 }
329
330 if (vga_switcheroo_client_probe_defer(pdev))
331 return -EPROBE_DEFER;
332
333 /* Get rid of things like offb */
334 ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "radeondrmfb");
335 if (ret)
336 return ret;
337
338 dev = drm_dev_alloc(&kms_driver, &pdev->dev);
339 if (IS_ERR(dev))
340 return PTR_ERR(dev);
341
342 ret = pci_enable_device(pdev);
343 if (ret)
344 goto err_free;
345
346 pci_set_drvdata(pdev, dev);
347
348 if (pci_find_capability(pdev, PCI_CAP_ID_AGP))
349 dev->agp = drm_agp_init(dev);
350 if (dev->agp) {
351 dev->agp->agp_mtrr = arch_phys_wc_add(
352 dev->agp->agp_info.aper_base,
353 dev->agp->agp_info.aper_size *
354 1024 * 1024);
355 }
356
357 ret = drm_dev_register(dev, ent->driver_data);
358 if (ret)
359 goto err_agp;
360
361 return 0;
362
363 err_agp:
364 if (dev->agp)
365 arch_phys_wc_del(dev->agp->agp_mtrr);
366 kfree(dev->agp);
367 pci_disable_device(pdev);
368 err_free:
369 drm_dev_put(dev);
370 return ret;
371 }
372
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 30021 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-22 18:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-22 7:15 [PATCH] This patch replaces all the instances of dev_info with drm_info Aman Jain
2021-06-22 18:34 ` kernel test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).