Commit be143124 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/r128: make ATI PCI GART part of its only user, r128 



The ATI Rage 128 driver has been the only user of ATI PCI GART code
since Radeon dropped UMS support in commit 8333f607 ("drm/radeon:
remove UMS support"). Clean up the drm top level directory, Kconfig and
Makefile by making ati_pcigart.[ch] part of r128. Drop the
CONFIG_DRM_ATI_PCIGART config option made redundant by the change.

This reduces drm.ko module size slightly when legacy drivers are
enabled, and moves the baggage to r128.ko instead.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191119100536.12024-1-jani.nikula@intel.com
parent 544c521d

drivers/gpu/drm/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -272,9 +272,6 @@ config DRM_VKMS 


	  If M is selected the module will be called vkms.



config DRM_ATI_PCIGART

        bool



source "drivers/gpu/drm/exynos/Kconfig"



source "drivers/gpu/drm/rockchip/Kconfig"
@@ -371,7 +368,6 @@ menuconfig DRM_LEGACY 
	bool "Enable legacy drivers (DANGEROUS)"

	depends on DRM && MMU

	select DRM_VM

	select DRM_ATI_PCIGART if PCI

	help

	  Enable legacy DRI1 drivers. Those drivers expose unsafe and dangerous

	  APIs to user-space, which can be used to circumvent access

drivers/gpu/drm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ drm-$(CONFIG_DRM_VM) += drm_vm.o 
drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o

drm-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_gem_shmem_helper.o

drm-$(CONFIG_DRM_ATI_PCIGART) += ati_pcigart.o

drm-$(CONFIG_DRM_PANEL) += drm_panel.o

drm-$(CONFIG_OF) += drm_of.o

drm-$(CONFIG_AGP) += drm_agpsupport.o

drivers/gpu/drm/r128/Makefile

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

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



r128-y   := r128_drv.o r128_cce.o r128_state.o r128_irq.o

r128-y   := r128_drv.o r128_cce.o r128_state.o r128_irq.o ati_pcigart.o



r128-$(CONFIG_COMPAT)   += r128_ioc32.o

drivers/gpu/drm/ati_pcigart.c→drivers/gpu/drm/r128/ati_pcigart.c

+2 −3
Original line number Diff line number Diff line
@@ -33,11 +33,12 @@ 


#include <linux/export.h>



#include <drm/ati_pcigart.h>

#include <drm/drm_device.h>

#include <drm/drm_pci.h>

#include <drm/drm_print.h>



#include "ati_pcigart.h"



# define ATI_PCIGART_PAGE_SIZE		4096	/**< PCI GART page size */



static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
@@ -95,7 +96,6 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info 


	return 1;

}

EXPORT_SYMBOL(drm_ati_pcigart_cleanup);



int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info)

{
@@ -207,4 +207,3 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga 
	gart_info->bus_addr = bus_address;

	return ret;

}
 
EXPORT_SYMBOL(drm_ati_pcigart_init);