diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-02-13 15:19:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-02-13 15:19:42 +1000 |
| commit | 0fbee62ec14d08714dbc558dd20cc00b9a79c042 (patch) | |
| tree | 95d631c4a6d1bc0b42a4094c1340095d36b0cf96 /linux-core/drm_proc.c | |
| parent | db85ed25afc616acfaadb21facf6066354f9d490 (diff) | |
major port of multi-master ideas into modesetting
Diffstat (limited to 'linux-core/drm_proc.c')
| -rw-r--r-- | linux-core/drm_proc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/drm_proc.c b/linux-core/drm_proc.c index b28d8238..12c08c86 100644 --- a/linux-core/drm_proc.c +++ b/linux-core/drm_proc.c @@ -166,6 +166,7 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request, int *eof, void *data) { struct drm_device *dev = (struct drm_device *) data; + struct drm_master *master = dev->primary->master; int len = 0; if (offset > DRM_PROC_LIMIT) { @@ -176,10 +177,10 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request, *start = &buf[offset]; *eof = 0; - if (dev->unique) { + if (master->unique) { DRM_PROC_PRINT("%s %s %s\n", dev->driver->pci_driver.name, - pci_name(dev->pdev), dev->unique); + pci_name(dev->pdev), master->unique); } else { DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name, pci_name(dev->pdev)); |