gfx: display: remove module and early parameter to toggle runtime PM

There's no point in having a module or early parameter to toggle the
driver's runtime PM on and off, since it can be done dynamically through
the sysfs /sys/devices/.../power/control files.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/drv/psb_drv.c b/drivers/staging/mrst/drv/psb_drv.c
index c3c22bb..d70ab23 100644 (file)
--- a/drivers/staging/mrst/drv/psb_drv.c
+++ b/drivers/staging/mrst/drv/psb_drv.c
@@ -73,7 +73,6 @@ int drm_psb_udelaydivider = 1;
 int drm_psb_udelaymultiplier = 1;
 int drm_topaz_pmpolicy = PSB_PMPOLICY_NOPM;
 int drm_topaz_sbuswa;
-int drm_psb_ospm = 1;
 int drm_psb_gl3_enable = 1;
 int drm_psb_topaz_clockgating = 0;
 static int PanelID = TC35876X;
@@ -87,7 +86,6 @@ MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults");
 MODULE_PARM_DESC(disable_vsync, "Disable vsync interrupts");
 MODULE_PARM_DESC(force_pipeb, "Forces PIPEB to become primary fb");
 MODULE_PARM_DESC(ta_mem_size, "TA memory size in kiB");
-MODULE_PARM_DESC(ospm, "switch for ospm support");
 MODULE_PARM_DESC(gl3_enabled, "Enable GL3 cache");
 MODULE_PARM_DESC(msvdx_pmpolicy, "msvdx power management policy btw frames");
 MODULE_PARM_DESC(topaz_pmpolicy, "topaz power managerment policy btw frames");
@@ -108,28 +106,11 @@ module_param_named(udelay_multiplier, drm_psb_udelaymultiplier, int, 0600);
 module_param_named(udelay_divider, drm_psb_udelaydivider, int, 0600);
 module_param_named(topaz_pmpolicy, drm_topaz_pmpolicy, int, 0600);
 module_param_named(topaz_sbuswa, drm_topaz_sbuswa, int, 0600);
-module_param_named(ospm, drm_psb_ospm, int, 0600);
 module_param_named(gl3_enabled, drm_psb_gl3_enable, int, 0600);
 module_param_named(topaz_clockgating, drm_psb_topaz_clockgating, int, 0600);
 module_param_named(PanelID, PanelID, int, 0600);
 module_param_string(hdmi_edid, HDMI_EDID, 20, 0600);
 #ifndef MODULE
-/* Make ospm configurable via cmdline firstly, and others can be enabled if needed. */
-static int __init config_ospm(char *arg)
-{
-       /* ospm turn on/off control can be passed in as a cmdline parameter */
-       /* to enable this feature add ospm=1 to cmdline */
-       /* to disable this feature add ospm=0 to cmdline */
-       if (!arg)
-               return -EINVAL;
-
-       if (!strcasecmp(arg, "0"))
-               drm_psb_ospm = 0;
-       else if (!strcasecmp(arg, "1"))
-               drm_psb_ospm = 1;
-
-       return 0;
-}
 static int __init config_gl3(char *arg)
 {
        if (!arg)
@@ -142,7 +123,6 @@ static int __init config_gl3(char *arg)
 
        return 0;
 }
-early_param("ospm", config_ospm);
 early_param("gl3_enabled", config_gl3);
 #endif
 

diff --git a/drivers/staging/mrst/drv/psb_drv.h b/drivers/staging/mrst/drv/psb_drv.h
index 279fd23..9887239 100644 (file)
--- a/drivers/staging/mrst/drv/psb_drv.h
+++ b/drivers/staging/mrst/drv/psb_drv.h
@@ -1320,7 +1320,6 @@ static inline void REGISTER_WRITE8(struct drm_device *dev,
 
 #define IS_PENWELL(dev) 0 /* FIXME */
 
-extern int drm_psb_ospm;
 extern int drm_psb_cpurelax;
 extern int drm_psb_udelaydivider;
 extern int drm_psb_udelaymultiplier;

diff --git a/drivers/staging/mrst/pvr/services4/system/unified/sysconfig.c b/drivers/staging/mrst/pvr/services4/system/unified/sysconfig.c
index 79f2439..a900e61 100644 (file)
--- a/drivers/staging/mrst/pvr/services4/system/unified/sysconfig.c
+++ b/drivers/staging/mrst/pvr/services4/system/unified/sysconfig.c
@@ -387,8 +387,8 @@ PVRSRV_ERROR SysInitialise(IMG_VOID)
        psTimingInfo->ui32CoreClockSpeed = SYS_SGX_CLOCK_SPEED;
        psTimingInfo->ui32HWRecoveryFreq = SYS_SGX_HWRECOVERY_TIMEOUT_FREQ;
 #if defined(SUPPORT_ACTIVE_POWER_MANAGEMENT)
-       psTimingInfo->bEnableActivePM = (drm_psb_ospm != 0);
-       /*printk(KERN_ERR "SGX APM is %s\n", (drm_psb_ospm != 0)? "enabled":"disabled"); */
+       /* Note: Enable active PM unconditionally, regardless of runtime PM. */
+       psTimingInfo->bEnableActivePM = IMG_TRUE;
 #else
        psTimingInfo->bEnableActivePM = IMG_FALSE;
 #endif