geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make radeon_ms compile. 

Remove lock functions and use pci_map_rom() instead of pci_map_rom_copy().
main
Kristian Høgsberg 2008-04-23 12:42:26 -04:00
parent 8dc4d4fa1f
commit 33fa02f2d8
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux-core/radeon_ms_drv.h
View File

@ -39,6 +39,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-id.h> #include <linux/i2c-id.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <linux/pci.h>
#include "drm.h" #include "drm.h"
#include "drmP.h" #include "drmP.h"

11
shared-core/radeon_ms_crtc.c
View File

@ -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= { static const struct drm_crtc_funcs radeon_ms_crtc1_funcs= {
.dpms = radeon_ms_crtc1_dpms, .dpms = radeon_ms_crtc1_dpms,
.save = NULL, /* XXX */ .save = NULL, /* XXX */
.restore = NULL, /* XXX */ .restore = NULL, /* XXX */
.lock = radeon_ms_crtc_lock,
.unlock = radeon_ms_crtc_unlock,
.prepare = radeon_ms_crtc_mode_prepare, .prepare = radeon_ms_crtc_mode_prepare,
.commit = radeon_ms_crtc_mode_commit, .commit = radeon_ms_crtc_mode_commit,
.mode_fixup = radeon_ms_crtc_mode_fixup, .mode_fixup = radeon_ms_crtc_mode_fixup,

4
shared-core/radeon_ms_rom.c
View File

@ -48,8 +48,8 @@ int radeon_ms_rom_init(struct drm_device *dev)
dev_priv->rom.type = ROM_UNKNOWN; dev_priv->rom.type = ROM_UNKNOWN;
/* copy rom if any */ /* copy rom if any */
rom_mapped = pci_map_rom_copy(dev->pdev, &rom->rom_size); rom_mapped = pci_map_rom(dev->pdev, &rom->rom_size);
if (rom->rom_size) { if (rom_mapped && rom->rom_size) {
rom->rom_image = drm_alloc(rom->rom_size, DRM_MEM_DRIVER); rom->rom_image = drm_alloc(rom->rom_size, DRM_MEM_DRIVER);
if (rom->rom_image == NULL) { if (rom->rom_image == NULL) {
return -1; return -1;