Make radeon_ms compile.

Remove lock functions and use pci_map_rom() instead of pci_map_rom_copy().

2 files changed, 2 insertions, 13 deletions

diff --git a/shared-core/radeon_ms_crtc.c b/shared-core/radeon_ms_crtc.c
index 3586e019..d73275bb 100644
--- a/shared-core/radeon_ms_crtc.c
+++ b/shared-core/radeon_ms_crtc.c
@@ -715,21 +715,10 @@ static void radeon_ms_crtc_load_lut(struct drm_crtc *crtc)
 	}
 }
 
-static bool radeon_ms_crtc_lock(struct drm_crtc *crtc)
-{
-    return true;
-}
-
-static void radeon_ms_crtc_unlock(struct drm_crtc *crtc)
-{
-}
-
 static const struct drm_crtc_funcs radeon_ms_crtc1_funcs= {
 	.dpms = radeon_ms_crtc1_dpms,
 	.save = NULL, /* XXX */
 	.restore = NULL, /* XXX */
-	.lock = radeon_ms_crtc_lock,
-	.unlock = radeon_ms_crtc_unlock,
 	.prepare = radeon_ms_crtc_mode_prepare,
 	.commit = radeon_ms_crtc_mode_commit,
 	.mode_fixup = radeon_ms_crtc_mode_fixup,
diff --git a/shared-core/radeon_ms_rom.c b/shared-core/radeon_ms_rom.c
index 5054a390..b4db02be 100644
--- a/shared-core/radeon_ms_rom.c
+++ b/shared-core/radeon_ms_rom.c
@@ -48,8 +48,8 @@ int radeon_ms_rom_init(struct drm_device *dev)
 
 	dev_priv->rom.type = ROM_UNKNOWN;
 	/* copy rom if any */
-	rom_mapped = pci_map_rom_copy(dev->pdev, &rom->rom_size);
-	if (rom->rom_size) {
+	rom_mapped = pci_map_rom(dev->pdev, &rom->rom_size);
+	if (rom_mapped && rom->rom_size) {
 		rom->rom_image = drm_alloc(rom->rom_size, DRM_MEM_DRIVER);
 		if (rom->rom_image == NULL) {
 			return -1;