Commit fa0cc3ca authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

drm/via: Embed via_map in via_dri1 



A few functions has no external use and are made static.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Kevin Brace <kevinbrace@bracecomputerlab.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220713170202.1798216-4-sam@ravnborg.org
parent 9a4537a7

drivers/gpu/drm/via/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
# Makefile for the drm device driver.  This driver provides support for the

# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



via-y    := via_irq.o via_dri1.o via_map.o via_mm.o via_verifier.o via_video.o via_dmablit.o

via-y    := via_irq.o via_dri1.o via_mm.o via_verifier.o via_video.o via_dmablit.o



obj-$(CONFIG_DRM_VIA)	+=via.o

drivers/gpu/drm/via/via_dri1.c

+102 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <drm/drm_drv.h>

#include <drm/drm_file.h>

#include <drm/drm_pciids.h>

#include <drm/drm_vblank.h>

#include <drm/via_drm.h>



#include "via_drv.h"
@@ -66,6 +67,107 @@ 
	dev_priv->dma_low += 8;			\

} while (0)



static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init)

{

	drm_via_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("\n");



	dev_priv->sarea = drm_legacy_getsarea(dev);

	if (!dev_priv->sarea) {

		DRM_ERROR("could not find sarea!\n");

		dev->dev_private = (void *)dev_priv;

		via_do_cleanup_map(dev);

		return -EINVAL;

	}



	dev_priv->fb = drm_legacy_findmap(dev, init->fb_offset);

	if (!dev_priv->fb) {

		DRM_ERROR("could not find framebuffer!\n");

		dev->dev_private = (void *)dev_priv;

		via_do_cleanup_map(dev);

		return -EINVAL;

	}

	dev_priv->mmio = drm_legacy_findmap(dev, init->mmio_offset);

	if (!dev_priv->mmio) {

		DRM_ERROR("could not find mmio region!\n");

		dev->dev_private = (void *)dev_priv;

		via_do_cleanup_map(dev);

		return -EINVAL;

	}



	dev_priv->sarea_priv =

	    (drm_via_sarea_t *) ((u8 *) dev_priv->sarea->handle +

				 init->sarea_priv_offset);



	dev_priv->agpAddr = init->agpAddr;



	via_init_futex(dev_priv);



	via_init_dmablit(dev);



	dev->dev_private = (void *)dev_priv;

	return 0;

}



int via_do_cleanup_map(struct drm_device *dev)

{

	via_dma_cleanup(dev);



	return 0;

}



static int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	drm_via_init_t *init = data;



	DRM_DEBUG("\n");



	switch (init->func) {

	case VIA_INIT_MAP:

		return via_do_init_map(dev, init);

	case VIA_CLEANUP_MAP:

		return via_do_cleanup_map(dev);

	}



	return -EINVAL;

}



static int via_driver_load(struct drm_device *dev, unsigned long chipset)

{

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	drm_via_private_t *dev_priv;

	int ret = 0;



	dev_priv = kzalloc(sizeof(drm_via_private_t), GFP_KERNEL);

	if (dev_priv == NULL)

		return -ENOMEM;



	idr_init(&dev_priv->object_idr);

	dev->dev_private = (void *)dev_priv;



	dev_priv->chipset = chipset;



	pci_set_master(pdev);



	ret = drm_vblank_init(dev, 1);

	if (ret) {

		kfree(dev_priv);

		return ret;

	}



	return 0;

}



static void via_driver_unload(struct drm_device *dev)

{

	drm_via_private_t *dev_priv = dev->dev_private;



	idr_destroy(&dev_priv->object_idr);



	kfree(dev_priv);

}



static void via_cmdbuf_start(drm_via_private_t *dev_priv);

static void via_cmdbuf_pause(drm_via_private_t *dev_priv);

static void via_cmdbuf_reset(drm_via_private_t *dev_priv);

drivers/gpu/drm/via/via_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -187,15 +187,11 @@ extern int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file 
extern int via_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_dma_blit_sync(struct drm_device *dev, void *data, struct drm_file *file_priv);

extern int via_dma_blit(struct drm_device *dev, void *data, struct drm_file *file_priv);



extern int via_driver_load(struct drm_device *dev, unsigned long chipset);

extern void via_driver_unload(struct drm_device *dev);



extern int via_init_context(struct drm_device *dev, int context);

extern int via_final_context(struct drm_device *dev, int context);

drivers/gpu/drm/via/via_map.c

deleted100644 → 0
+0 −132
Original line number Diff line number Diff line 
/*

 * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.

 * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sub license,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the

 * next paragraph) shall be included in all copies or substantial portions

 * of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL

 * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */



#include <linux/pci.h>



#include <drm/drm_device.h>

#include <drm/drm_vblank.h>

#include <drm/via_drm.h>



#include "via_drv.h"



static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init)

{

	drm_via_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("\n");



	dev_priv->sarea = drm_legacy_getsarea(dev);

	if (!dev_priv->sarea) {

		DRM_ERROR("could not find sarea!\n");

		dev->dev_private = (void *)dev_priv;

		via_do_cleanup_map(dev);

		return -EINVAL;

	}



	dev_priv->fb = drm_legacy_findmap(dev, init->fb_offset);

	if (!dev_priv->fb) {

		DRM_ERROR("could not find framebuffer!\n");

		dev->dev_private = (void *)dev_priv;

		via_do_cleanup_map(dev);

		return -EINVAL;

	}

	dev_priv->mmio = drm_legacy_findmap(dev, init->mmio_offset);

	if (!dev_priv->mmio) {

		DRM_ERROR("could not find mmio region!\n");

		dev->dev_private = (void *)dev_priv;

		via_do_cleanup_map(dev);

		return -EINVAL;

	}



	dev_priv->sarea_priv =

	    (drm_via_sarea_t *) ((u8 *) dev_priv->sarea->handle +

				 init->sarea_priv_offset);



	dev_priv->agpAddr = init->agpAddr;



	via_init_futex(dev_priv);



	via_init_dmablit(dev);



	dev->dev_private = (void *)dev_priv;

	return 0;

}



int via_do_cleanup_map(struct drm_device *dev)

{

	via_dma_cleanup(dev);



	return 0;

}



int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv)

{

	drm_via_init_t *init = data;



	DRM_DEBUG("\n");



	switch (init->func) {

	case VIA_INIT_MAP:

		return via_do_init_map(dev, init);

	case VIA_CLEANUP_MAP:

		return via_do_cleanup_map(dev);

	}



	return -EINVAL;

}



int via_driver_load(struct drm_device *dev, unsigned long chipset)

{

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	drm_via_private_t *dev_priv;

	int ret = 0;



	dev_priv = kzalloc(sizeof(drm_via_private_t), GFP_KERNEL);

	if (dev_priv == NULL)

		return -ENOMEM;



	idr_init(&dev_priv->object_idr);

	dev->dev_private = (void *)dev_priv;



	dev_priv->chipset = chipset;



	pci_set_master(pdev);



	ret = drm_vblank_init(dev, 1);

	if (ret) {

		kfree(dev_priv);

		return ret;

	}



	return 0;

}



void via_driver_unload(struct drm_device *dev)

{

	drm_via_private_t *dev_priv = dev->dev_private;



	idr_destroy(&dev_priv->object_idr);



	kfree(dev_priv);

}