remove use of features missing in mainline

diff --git a/pvr/pvr_events.c b/pvr/pvr_events.c
index e5a7b1c..6b945df 100644 (file)
--- a/pvr/pvr_events.c
+++ b/pvr/pvr_events.c
@@ -96,6 +96,7 @@ int pvr_flip_event_req(struct PVRSRV_FILE_PRIVATE_DATA *priv,
                         unsigned int overlay,
                         enum pvr_sync_wait_seq_type type, u64 user_data)
 {
+#if 0
        struct pvr_pending_flip_event *e;
        struct timeval now;
        unsigned long flags;
@@ -139,6 +140,9 @@ int pvr_flip_event_req(struct PVRSRV_FILE_PRIVATE_DATA *priv,
        spin_unlock_irqrestore(&event_lock, flags);
 
        return omap_dss_request_notify(e->dss_event, overlay);
+#else
+       return -EFAULT;
+#endif
 }
 
 static bool pvr_dequeue_event(struct PVRSRV_FILE_PRIVATE_DATA *priv,
@@ -333,10 +337,10 @@ void pvr_init_events(void)
        INIT_LIST_HEAD(&flip_wait_list);
 
        dss_nb.notifier_call = dss_notifier_callback;
-       omap_dss_register_notifier(&dss_nb);
+//     omap_dss_register_notifier(&dss_nb);
 }
 
 void pvr_exit_events(void)
 {
-       omap_dss_unregister_notifier(&dss_nb);
+//     omap_dss_unregister_notifier(&dss_nb);
 }

diff --git a/pvr/sysutils.c b/pvr/sysutils.c
index 6e8ceef..a568524 100644 (file)
--- a/pvr/sysutils.c
+++ b/pvr/sysutils.c
@@ -80,6 +80,7 @@ void SysGetSGXTimingInformation(struct SGX_TIMING_INFORMATION *psTimingInfo)
            SYS_SGX_ACTIVE_POWER_LATENCY_MS;
 }
 
+#if 0
 static int vdd2_post_func(struct notifier_block *n, unsigned long event,
                          void *ptr)
 {
@@ -183,6 +184,10 @@ static void UnRegisterConstraintNotifications(struct SYS_SPECIFIC_DATA
 
        clk_notifier_unregister(psSysSpecData->psSGX_FCK, &vdd2_pre_post);
 }
+#else
+#define RegisterConstraintNotifications(x)
+#define UnRegisterConstraintNotifications(x)
+#endif
 
 static struct device sgx_dev;
 static int sgx_clock_enabled;
@@ -285,7 +290,11 @@ static void sgx_lock_perf(struct work_struct *work)
                high = 0;
        }
        if (high != bHigh) {
+#if 0
                omap_pm_set_min_bus_tput(&sgx_dev, OCP_INITIATOR_AGENT, vdd2);
+#else
+               (void)sgx_dev;
+#endif
                bHigh = high;
        }