aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drm.c
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2014-02-13 03:39:50 -0500
committerBen Skeggs <bskeggs@redhat.com>2014-03-25 23:59:32 -0400
commit46941b0fb6e398e0966f1694f6463dc417af95a6 (patch)
tree4ceaa4675228809be51ee7d4bb4e5e37ca8baae2 /drivers/gpu/drm/nouveau/nouveau_drm.c
parent02f0b8c895b9bb93e02ba7dcd52a00452f9e7bef (diff)
drm/nouveau: make hdmi device finding failure prints debug level
The hdmi device is required for runtime pm. However it is not available on many esp older devices, which were all seeing these error messages. Take this opportunity to also convert to nv_debug instead of the DRM_* messages, like the rest of nouveau does. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index a9f4a8b6e95c..0f67e194df5f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -300,22 +300,21 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
300#define PCI_CLASS_MULTIMEDIA_HD_AUDIO 0x0403 300#define PCI_CLASS_MULTIMEDIA_HD_AUDIO 0x0403
301 301
302static void 302static void
303nouveau_get_hdmi_dev(struct drm_device *dev) 303nouveau_get_hdmi_dev(struct nouveau_drm *drm)
304{ 304{
305 struct nouveau_drm *drm = dev->dev_private; 305 struct pci_dev *pdev = drm->dev->pdev;
306 struct pci_dev *pdev = dev->pdev;
307 306
308 /* subfunction one is a hdmi audio device? */ 307 /* subfunction one is a hdmi audio device? */
309 drm->hdmi_device = pci_get_bus_and_slot((unsigned int)pdev->bus->number, 308 drm->hdmi_device = pci_get_bus_and_slot((unsigned int)pdev->bus->number,
310 PCI_DEVFN(PCI_SLOT(pdev->devfn), 1)); 309 PCI_DEVFN(PCI_SLOT(pdev->devfn), 1));
311 310
312 if (!drm->hdmi_device) { 311 if (!drm->hdmi_device) {
313 DRM_INFO("hdmi device not found %d %d %d\n", pdev->bus->number, PCI_SLOT(pdev->devfn), 1); 312 NV_DEBUG(drm, "hdmi device not found %d %d %d\n", pdev->bus->number, PCI_SLOT(pdev->devfn), 1);
314 return; 313 return;
315 } 314 }
316 315
317 if ((drm->hdmi_device->class >> 8) != PCI_CLASS_MULTIMEDIA_HD_AUDIO) { 316 if ((drm->hdmi_device->class >> 8) != PCI_CLASS_MULTIMEDIA_HD_AUDIO) {
318 DRM_INFO("possible hdmi device not audio %d\n", drm->hdmi_device->class); 317 NV_DEBUG(drm, "possible hdmi device not audio %d\n", drm->hdmi_device->class);
319 pci_dev_put(drm->hdmi_device); 318 pci_dev_put(drm->hdmi_device);
320 drm->hdmi_device = NULL; 319 drm->hdmi_device = NULL;
321 return; 320 return;
@@ -340,7 +339,7 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags)
340 INIT_LIST_HEAD(&drm->clients); 339 INIT_LIST_HEAD(&drm->clients);
341 spin_lock_init(&drm->tile.lock); 340 spin_lock_init(&drm->tile.lock);
342 341
343 nouveau_get_hdmi_dev(dev); 342 nouveau_get_hdmi_dev(drm);
344 343
345 /* make sure AGP controller is in a consistent state before we 344 /* make sure AGP controller is in a consistent state before we
346 * (possibly) execute vbios init tables (see nouveau_agp.h) 345 * (possibly) execute vbios init tables (see nouveau_agp.h)