Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa5b62ba authored Feb 27, 2017 by Gabriel Krisman Bertazi Committed by Gerd Hoffmann Feb 28, 2017

drm: qxl: Drop device flags attribute



There are no device specific flags that we need to keep track of here.
Let it vanish.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170227204328.18761-2-krisman@collabora.co.uk


Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

parent b982dab1

drivers/gpu/drm/qxl/qxl_drv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,7 @@ qxl_pci_probe(struct pci_dev pdev, const struct pci_device_id ent)
	if (ret)		if (ret)
	goto free_dev;		goto free_dev;

	ret = qxl_device_init(qdev, &qxl_driver, pdev, ent->driver_data);		ret = qxl_device_init(qdev, &qxl_driver, pdev);
	if (ret)		if (ret)
	goto disable_pci;		goto disable_pci;

drivers/gpu/drm/qxl/qxl_drv.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -243,7 +243,6 @@ struct qxl_device;

	struct qxl_device {		struct qxl_device {
	struct drm_device ddev;		struct drm_device ddev;
	unsigned long flags;

	resource_size_t vram_base, vram_size;		resource_size_t vram_base, vram_size;
	resource_size_t surfaceram_base, surfaceram_size;		resource_size_t surfaceram_base, surfaceram_size;
	@@ -335,7 +334,7 @@ extern const struct drm_ioctl_desc qxl_ioctls[];
	extern int qxl_max_ioctl;		extern int qxl_max_ioctl;

	int qxl_device_init(struct qxl_device qdev, struct drm_driver drv,		int qxl_device_init(struct qxl_device qdev, struct drm_driver drv,
	struct pci_dev *pdev, unsigned long flags);		struct pci_dev *pdev);
	void qxl_device_fini(struct qxl_device *qdev);		void qxl_device_fini(struct qxl_device *qdev);

	int qxl_modeset_init(struct qxl_device *qdev);		int qxl_modeset_init(struct qxl_device *qdev);

drivers/gpu/drm/qxl/qxl_kms.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -117,8 +117,7 @@ static void qxl_gc_work(struct work_struct *work)

	int qxl_device_init(struct qxl_device *qdev,		int qxl_device_init(struct qxl_device *qdev,
	struct drm_driver *drv,		struct drm_driver *drv,
	struct pci_dev *pdev,		struct pci_dev *pdev)
	unsigned long flags)
	{		{
	int r, sb;		int r, sb;

	@@ -130,8 +129,6 @@ int qxl_device_init(struct qxl_device *qdev,
	pci_set_drvdata(pdev, &qdev->ddev);		pci_set_drvdata(pdev, &qdev->ddev);
	qdev->ddev.dev_private = qdev;		qdev->ddev.dev_private = qdev;

	qdev->flags = flags;

	mutex_init(&qdev->gem.mutex);		mutex_init(&qdev->gem.mutex);
	mutex_init(&qdev->update_area_mutex);		mutex_init(&qdev->update_area_mutex);
	mutex_init(&qdev->release_mutex);		mutex_init(&qdev->release_mutex);