gpu: pvr: move debugfs infrastructure to its own files

[sgx.git] / pvr / sysutils.c

diff --git a/pvr/sysutils.c b/pvr/sysutils.c
index a1dda0f..6e8ceef 100644 (file)
--- a/pvr/sysutils.c
+++ b/pvr/sysutils.c
@@ -68,8 +68,6 @@ void SysGetSGXTimingInformation(struct SGX_TIMING_INFORMATION *psTimingInfo)
 #if defined(NO_HARDWARE)
        rate = SYS_SGX_MAX_FREQ_NO_HW;
 #else
-       PVR_ASSERT(atomic_read(&gpsSysSpecificData->sSGXClocksEnabled) != 0);
-
        rate = clk_get_rate(gpsSysSpecificData->psSGX_FCK);
        PVR_ASSERT(rate != 0);
 #endif
@@ -144,16 +142,16 @@ static int vdd2_pre_post_func(struct notifier_block *n, unsigned long event,
                  cnd->rate);
 
        if (CLK_PRE_RATE_CHANGE == event) {
-               pvr_dvfs_lock();
+               pvr_dev_lock();
                PVR_TRACE("vdd2_pre_post_func: CLK_PRE_RATE_CHANGE event");
                vdd2_pre_func(n, event, ptr);
        } else if (CLK_POST_RATE_CHANGE == event) {
                PVR_TRACE("vdd2_pre_post_func: CLK_POST_RATE_CHANGE event");
                vdd2_post_func(n, event, ptr);
-               pvr_dvfs_unlock();
+               pvr_dev_unlock();
        } else if (CLK_ABORT_RATE_CHANGE == event) {
                PVR_TRACE("vdd2_pre_post_func: CLK_ABORT_RATE_CHANGE event");
-               pvr_dvfs_unlock();
+               pvr_dev_unlock();
        } else {
                printk(KERN_ERR "vdd2_pre_post_func: unexpected event (%lu)\n",
                        event);