emgd: changes needed for 2.6.37
Subsystems (2)
PATCH 3/3 emgd: changes needed for 2.6.37
From: Tom Zanussi <[email protected]>
- change MUTEX_init()s to explicit sema_init()s
- remove get_map_ofs/get_reg_ofs from struct drm_driver - removed as there was only one user, the others were cut-and-paste remnants
- fb_changed() was removed, move emgd_fb_probe() to init
- emgd_crtc_gamma_set() param changes
- change DECLARE_MUTEX() to DEFINE_SEMAPHORE
- remove fbdev for now, a later patch will re-add it
Signed-off-by Tom Zanussi <[email protected]>
--- .../drm/emgd/emgd/core/init/plb/micro_init_plb.c | 2 +- .../drm/emgd/emgd/core/init/tnc/micro_init_tnc.c | 2 +- drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c | 2 -- drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c | 20 ++++++-------------- drivers/gpu/drm/emgd/emgd/gmm/gtt.c | 4 ++-- .../drm/emgd/pvr/services4/srvkm/common/resman.c | 2 +- 6 files changed, 11 insertions(+), 21 deletions(-)
drivers/gpu/drm/emgd/emgd/core/init/plb/micro_init_plb.c +1 -1
@@ -348,7 +348,7 @@ static int query_plb( context->platform_context = (void *)&platform_context_plb; -OS_PTHREAD_MUTEX_INIT (&platform_context_plb.flip_mutex,NULL ); +sema_init (&platform_context_plb.flip_mutex,1 );/* * Current specs indicate that PLB has only one PCI function.
drivers/gpu/drm/emgd/emgd/core/init/tnc/micro_init_tnc.c +1 -1
@@ -440,7 +440,7 @@ static int query_tnc( platform_context->did = context->device_context.did; context->platform_context = (void *)&platform_context_tnc; -OS_PTHREAD_MUTEX_INIT (&platform_context_tnc.flip_mutex,NULL ); +sema_init (&platform_context_tnc.flip_mutex,1 );/* find and store the bridge dev since we will be using it a lot * in the init modules */
drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c +0 -2
@@ -1920,8 +1920,6 @@ static struct drm_driver driver = { .irq_uninstall = emgd_driver_irq_uninstall, .irq_handler = emgd_driver_irq_handler, .reclaim_buffers = drm_core_reclaim_buffers, - .get_map_ofs = drm_core_get_map_ofs, - .get_reg_ofs = drm_core_get_reg_ofs, .ioctls = emgd_ioctl, .fops = { .owner = THIS_MODULE,
drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c +6 -14
@@ -80,7 +80,6 @@ static int emgd_fb_blank(int blank, struct fb_info *info);static const struct drm_mode_config_funcs emgd_mode_funcs = { .fb_create = emgd_fb_create, - .fb_changed = emgd_fb_probe, };static const struct drm_framebuffer_funcs emgd_fb_funcs = {
@@ -120,8 +119,8 @@ static int emgd_crtc_cursor_set(struct drm_crtc *crtc, uint32_t width, uint32_t height);static int emgd_crtc_cursor_move (struct drm_crtc *crtc,int x,int y);static void emgd_crtc_gamma_set (struct drm_crtc *crtc, -unsigned short *red,unsigned short *green,unsigned short *blue, -uint32_t size); +u16 *red,u16 *green,u16 *blue, +uint32_t start,uint32_t size);static void emgd_crtc_destroy (struct drm_crtc *crtc);
@@ -270,6 +269,7 @@ void emgd_ms_init(struct drm_device *dev)* This is a lot of the code that impliments KMS. */ +emgd_fb_probe (dev); }
@@ -298,9 +298,7 @@ EXPORT_SYMBOL(emgd_fb_probe);*/ int emgd_fb_remove (struct drm_device *dev,struct drm_framebuffer *fb) { -struct fb_info *info; - - info = fb->fbdev; +struct fb_info *info =NULL ;if (info) {unregister_framebuffer (info);
@@ -371,7 +369,6 @@ static struct drm_framebuffer *emgd_fb_create(struct drm_device *dev, info->fbops = (struct fb_ops *)&emgd_fb_ops; info->screen_base =0 ;/* FIXME: This is kernel memory address */ info->screen_size = emgd_fb->size; - info->pseudo_palette = emgd_fb->base.pseudo_palette; info->var.xres_virtual = emgd_fb->base.width; info->var.yres_virtual = emgd_fb->base.height;
@@ -447,7 +444,6 @@ static struct drm_framebuffer *emgd_fb_create(struct drm_device *dev,register_framebuffer (info); - emgd_fb->base.fbdev = info; par->emgd_fb = emgd_fb; par->dev = dev;
@@ -467,10 +463,6 @@ static void emgd_fb_destroy (struct drm_framebuffer *fb)/* TODO: Unmap any pages mapped to the GTT */ -if (fb->fbdev) { -emgd_fb_remove (dev, fb); - } -drm_framebuffer_cleanup (fb);kfree (fb);
@@ -614,8 +606,8 @@ static int emgd_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) }static void emgd_crtc_gamma_set (struct drm_crtc *crtc, -unsigned short *red,unsigned short *green,unsigned short *blue, -uint32_t size) +u16 *red,u16 *green,u16 *blue, +uint32_t start,uint32_t size) {printk (KERN_ALERT "emgd_crtc_gamma_set: STUB\n" ); }
drivers/gpu/drm/emgd/emgd/gmm/gtt.c +2 -2
@@ -38,8 +38,8 @@#define ST_BIT 0x00000004/* bit2- stolen memory bit */ #define PSB_PTE_VALID 0x0001 -static DECLARE_MUTEX (client_sem); -static DECLARE_MUTEX (gtt_sem); +static DEFINE_SEMAPHORE (client_sem); +static DEFINE_SEMAPHORE (gtt_sem);struct client_list_struct {struct list_head list;
drivers/gpu/drm/emgd/pvr/services4/srvkm/common/resman.c +1 -1
@@ -46,7 +46,7 @@#include <asm/semaphore.h> #endif -static DECLARE_MUTEX (lock); +static DEFINE_SEMAPHORE (lock);#define ACQUIRE_SYNC_OBJ do { \ if (in_interrupt()) { \
Signature · 1 line
1.7.0.4