moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: Move struct drm_device.hose to legacy section

Browse Source 
The field is only relevant for legacy DRM drivers. Its only non-legacy
user in the DRM core is in drm_file.c. This code is now protected by
CONFIG_DRM_LEGACY. Radeon, the only driver that used the field, has been
changed to maintain it's own copy.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112081035.6882-7-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann
2021-01-12 09:10:35 +01:00
parent 5c1736cff1
commit 14054f2afc
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_file.c
View File

@@ -367,6 +367,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
list_add(&priv->lhead, &dev->filelist); list_add(&priv->lhead, &dev->filelist);
mutex_unlock(&dev->filelist_mutex); mutex_unlock(&dev->filelist_mutex);
#ifdef CONFIG_DRM_LEGACY
#ifdef __alpha__ #ifdef __alpha__
/* /*
* Default the hose * Default the hose
@@ -386,6 +387,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor)
dev->hose = b->sysdata; dev->hose = b->sysdata;
} }
} }
#endif
#endif #endif
return 0; return 0;

9
include/drm/drm_device.h
View File

@@ -282,10 +282,6 @@ struct drm_device {
/** @pdev: PCI device structure */ /** @pdev: PCI device structure */
struct pci_dev *pdev; struct pci_dev *pdev;
#ifdef __alpha__
/** @hose: PCI hose, only used on ALPHA platforms. */
struct pci_controller *hose;
#endif
/** @num_crtcs: Number of CRTCs on this device */ /** @num_crtcs: Number of CRTCs on this device */
unsigned int num_crtcs; unsigned int num_crtcs;
@@ -328,6 +324,11 @@ struct drm_device {
/* List of devices per driver for stealth attach cleanup */ /* List of devices per driver for stealth attach cleanup */
struct list_head legacy_dev_list; struct list_head legacy_dev_list;
#ifdef __alpha__
/** @hose: PCI hose, only used on ALPHA platforms. */
struct pci_controller *hose;
#endif
/* Context handle management - linked list of context handles */ /* Context handle management - linked list of context handles */
struct list_head ctxlist; struct list_head ctxlist;