Commit 14054f2a authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm: Move struct drm_device.hose to legacy section 



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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210112081035.6882-7-tzimmermann@suse.de
parent 5c1736cf

drivers/gpu/drm/drm_file.c

+2 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor) 
	list_add(&priv->lhead, &dev->filelist);

	mutex_unlock(&dev->filelist_mutex);



#ifdef CONFIG_DRM_LEGACY

#ifdef __alpha__

	/*

	 * Default the hose
@@ -386,6 +387,7 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor) 
				dev->hose = b->sysdata;

		}

	}

#endif

#endif



	return 0;

include/drm/drm_device.h

+5 −4
Original line number Diff line number Diff line
@@ -282,10 +282,6 @@ struct drm_device { 
	/** @pdev: PCI device structure */

	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 */

	unsigned int num_crtcs;
@@ -328,6 +324,11 @@ struct drm_device { 
	/* List of devices per driver for stealth attach cleanup */

	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 */

	struct list_head ctxlist;