DRM port to 2.6.35 : other minor port fixes

6 files changed, 21 insertions, 17 deletions

diff --git a/drivers/gpu/drm/omap/omap_connector.c b/drivers/gpu/drm/omap/omap_connector.c
index fda6b7598514..84cbb5c56317 100644
--- a/drivers/gpu/drm/omap/omap_connector.c
+++ b/drivers/gpu/drm/omap/omap_connector.c
@@ -107,7 +107,7 @@ enum drm_connector_status omap_connector_detect(
 		ret = connector_status_disconnected;
 	}
 
-	VERB("%s: %d (force=%d)", omap_connector->dssdev->name, ret, force);
+	//VERB("%s: %d (force=%d)", omap_connector->dssdev->name, ret, force);
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/omap/omap_crtc.c b/drivers/gpu/drm/omap/omap_crtc.c
index b3380bbb0f73..43fb819c9246 100644
--- a/drivers/gpu/drm/omap/omap_crtc.c
+++ b/drivers/gpu/drm/omap/omap_crtc.c
@@ -178,7 +178,7 @@ static int omap_crtc_mode_set(struct drm_crtc *crtc,
 	omap_crtc->info.min_y_decim = 1;
 	omap_crtc->info.max_y_decim = 1;
 
-	omap_crtc_update_scanout(crtc);
+	update_scanout(crtc);
 
 	return 0;
 }
@@ -236,17 +236,18 @@ static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
 
 	/* wakeup userspace */
 	// TODO: this should happen *after* flip.. somehow..
-	if (event) {
-		spin_lock_irqsave(&dev->event_lock, flags);
-		event->event.sequence =
-				drm_vblank_count_and_time(dev, omap_crtc->id, &now);
-		event->event.tv_sec = now.tv_sec;
-		event->event.tv_usec = now.tv_usec;
-		list_add_tail(&event->base.link,
-				&event->base.file_priv->event_list);
-		wake_up_interruptible(&event->base.file_priv->event_wait);
-		spin_unlock_irqrestore(&dev->event_lock, flags);
-	}
+	// NOTE: we don't need this that in 2.6.35 (DRM port)
+	//if (event) {
+	//	spin_lock_irqsave(&dev->event_lock, flags);
+	//	event->event.sequence =
+	//			drm_vblank_count_and_time(dev, omap_crtc->id, &now);
+	//	event->event.tv_sec = now.tv_sec;
+	//	event->event.tv_usec = now.tv_usec;
+	//	list_add_tail(&event->base.link,
+	//			&event->base.file_priv->event_list);
+	//	wake_up_interruptible(&event->base.file_priv->event_wait);
+	//	spin_unlock_irqrestore(&dev->event_lock, flags);
+	//}
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/omap/omap_fbdev.c b/drivers/gpu/drm/omap/omap_fbdev.c
index a603671a7933..034d25d87fab 100644
--- a/drivers/gpu/drm/omap/omap_fbdev.c
+++ b/drivers/gpu/drm/omap/omap_fbdev.c
@@ -86,8 +86,9 @@ static struct fb_ops omap_fb_ops = {
 	.fb_blank = drm_fb_helper_blank,
 	.fb_setcmap = drm_fb_helper_setcmap,
 
-	.fb_debug_enter = drm_fb_helper_debug_enter,
-	.fb_debug_leave = drm_fb_helper_debug_leave,
+	// DRM port : we don't include those
+	//.fb_debug_enter = drm_fb_helper_debug_enter,
+	//.fb_debug_leave = drm_fb_helper_debug_leave,
 };
 
 static void omap_fbdev_deferred_io(struct fb_info *fbi,
diff --git a/drivers/gpu/drm/omap/omap_gpu.c b/drivers/gpu/drm/omap/omap_gpu.c
index f69c2cb74303..043430ef19ad 100644
--- a/drivers/gpu/drm/omap/omap_gpu.c
+++ b/drivers/gpu/drm/omap/omap_gpu.c
@@ -21,6 +21,7 @@
 #include "omap_gpu_priv.h"
 
 #include "drm_fb_helper.h"
+#include "drm_crtc_helper.h"
 
 //#define DRIVER_NAME		MODULE_NAME
 // temporary hack for android:
diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c
index 4a0a7889720f..ee4409753499 100644
--- a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c
+++ b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c
@@ -1002,7 +1002,8 @@ static OMAPLFB_DEVINFO *OMAPLFBInitDev(unsigned uiFBDevID, struct drm_device *de
 	
 	if(psDevInfo->sPVRJTable.pfnPVRSRVRegisterDCDevice(
 		&psDevInfo->sDCJTable,
-		&psDevInfo->uiPVRDevID) != PVRSRV_OK)
+		&psDevInfo->uiPVRDevID,
+		NULL) != PVRSRV_OK)
 	{
 		printk(KERN_ERR DRIVER_PREFIX
 			": %s: Device %u: PVR Services device registration failed\n", __FUNCTION__, uiFBDevID);
diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c
index 9d67893ce923..31cd2f1d1d92 100644
--- a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c
+++ b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c
@@ -127,7 +127,7 @@ static void WorkQueueHandler(struct work_struct *psWork)
 OMAPLFB_ERROR OMAPLFBCreateSwapQueue(OMAPLFB_SWAPCHAIN *psSwapChain)
 {
 	
-	psSwapChain->psWorkQueue = alloc_ordered_workqueue(DEVNAME, WQ_NON_REENTRANT | WQ_FREEZABLE | WQ_HIGHPRI);
+	psSwapChain->psWorkQueue = __create_workqueue(DEVNAME, 1, 1, 1);
 	if (psSwapChain->psWorkQueue == NULL)
 	{
 		printk(KERN_WARNING DRIVER_PREFIX ": %s: Device %u: create_singlethreaded_workqueue failed\n", __FUNCTION__, psSwapChain->uiFBDevID);