diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2011-09-23 18:31:27 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-09-26 17:28:36 +0100 |
| commit | afee4cfc26429ec6087bea5d549c34b3c77e9171 (patch) | |
| tree | ce110439dcad4ed9f23618d04fbc543518ff4fa1 | |
| parent | 938e5e199137f671053d1050ccba765fd50490a3 (diff) | |
DRM: OMAP: Fixing PVR kernel module name
We currently expect it to be "pvrsrvkm" and not "omap_gpu_pvr", so
change it to load the correct driver.
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 | ||||
| -rw-r--r-- | drivers/staging/omapdrm/omap_drv.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 87b695b807ff..3141170d1943 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -729,7 +729,7 @@ static void omap_init_gpu(void) char oh_name[max_omap_drm_hwmod_name_len]; int l; struct gpu_platform_data *pdata; - char *name = "omapdrm_pvr"; + char *name = "pvrsrvkm"; l = snprintf(oh_name, max_omap_drm_hwmod_name_len, "gpu"); diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c index b569ae121da5..93810cabac07 100644 --- a/drivers/staging/omapdrm/omap_drv.c +++ b/drivers/staging/omapdrm/omap_drv.c @@ -24,6 +24,7 @@ #include "drm_fb_helper.h" #define DRIVER_NAME MODULE_NAME +#define PVR_DRIVER_NAME "pvrsrvkm" #define DRIVER_DESC "OMAP DRM" #define DRIVER_DATE "20110403" #define DRIVER_MAJOR 1 @@ -457,7 +458,7 @@ static int dev_open(struct drm_device *dev, struct drm_file *file) DBG("open: dev=%p, file=%p", dev, file); list_for_each_entry(plugin, &plugin_list, list) { - if (!strcmp(DRIVER_NAME "_pvr", plugin->name)) { + if (!strcmp(PVR_DRIVER_NAME, plugin->name)) { found_pvr = true; break; } @@ -465,7 +466,7 @@ static int dev_open(struct drm_device *dev, struct drm_file *file) if (!found_pvr) { DBG("open: PVR submodule not loaded.. let's try now"); - request_module(DRIVER_NAME "_pvr"); + request_module(PVR_DRIVER_NAME); } list_for_each_entry(plugin, &plugin_list, list) { |