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

Commit e3590096 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm/radeon/kms: remove unneeded master create/destroy functions. 



We shouldn't need these at all in radeon kms mode.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d50ba256

drivers/gpu/drm/radeon/radeon_drv.c

+0 −5
Original line number Diff line number Diff line
@@ -62,9 +62,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev); 
int radeon_driver_irq_postinstall_kms(struct drm_device *dev);

void radeon_driver_irq_uninstall_kms(struct drm_device *dev);

irqreturn_t radeon_driver_irq_handler_kms(DRM_IRQ_ARGS);

int radeon_master_create_kms(struct drm_device *dev, struct drm_master *master);

void radeon_master_destroy_kms(struct drm_device *dev,

			       struct drm_master *master);

int radeon_dma_ioctl_kms(struct drm_device *dev, void *data,

			 struct drm_file *file_priv);

int radeon_gem_object_init(struct drm_gem_object *obj);
@@ -260,8 +257,6 @@ static struct drm_driver kms_driver = { 
	.get_vblank_counter = radeon_get_vblank_counter_kms,

	.enable_vblank = radeon_enable_vblank_kms,

	.disable_vblank = radeon_disable_vblank_kms,

	.master_create = radeon_master_create_kms,

	.master_destroy = radeon_master_destroy_kms,

#if defined(CONFIG_DEBUG_FS)

	.debugfs_init = radeon_debugfs_init,

	.debugfs_cleanup = radeon_debugfs_cleanup,

drivers/gpu/drm/radeon/radeon_kms.c

+0 −49
Original line number Diff line number Diff line
@@ -200,55 +200,6 @@ void radeon_disable_vblank_kms(struct drm_device *dev, int crtc) 
}





/*

 * For multiple master (like multiple X).

 */

struct drm_radeon_master_private {

	drm_local_map_t *sarea;

	drm_radeon_sarea_t *sarea_priv;

};



int radeon_master_create_kms(struct drm_device *dev, struct drm_master *master)

{

	struct drm_radeon_master_private *master_priv;

	unsigned long sareapage;

	int ret;



	master_priv = kzalloc(sizeof(*master_priv), GFP_KERNEL);

	if (master_priv == NULL) {

		return -ENOMEM;

	}

	/* prebuild the SAREA */

	sareapage = max_t(unsigned long, SAREA_MAX, PAGE_SIZE);

	ret = drm_addmap(dev, 0, sareapage, _DRM_SHM,

			 _DRM_CONTAINS_LOCK,

			 &master_priv->sarea);

	if (ret) {

		DRM_ERROR("SAREA setup failed\n");

		return ret;

	}

	master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);

	master_priv->sarea_priv->pfCurrentPage = 0;

	master->driver_priv = master_priv;

	return 0;

}



void radeon_master_destroy_kms(struct drm_device *dev,

			       struct drm_master *master)

{

	struct drm_radeon_master_private *master_priv = master->driver_priv;



	if (master_priv == NULL) {

		return;

	}

	if (master_priv->sarea) {

		drm_rmmap_locked(dev, master_priv->sarea);

	}

	kfree(master_priv);

	master->driver_priv = NULL;

}





/*

 * IOCTL.

 */