gfx: display: drop gl3 enable kernel command line and module parameter

The support for enabling or disabling GL3 via module or command line
parameter is broken (as it only defines whether it's initialized or
not). Also, the gfx userspace depends on this being one or the other, and
it can't be switched at will. Just remove the parameter.

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 d70ab23..195026b 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_gl3_enable = 1;
 int drm_psb_topaz_clockgating = 0;
 static int PanelID = TC35876X;
 char HDMI_EDID[HDMI_MONITOR_NAME_LENGTH];
@@ -86,7 +85,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(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");
 MODULE_PARM_DESC(topaz_sbuswa, "WA for topaz sysbus write");
@@ -106,25 +104,9 @@ 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(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
-static int __init config_gl3(char *arg)
-{
-       if (!arg)
-               return -EINVAL;
-
-       if (!strcasecmp(arg, "0"))
-               drm_psb_gl3_enable = 0;
-       else if (!strcasecmp(arg, "1"))
-               drm_psb_gl3_enable = 1;
-
-       return 0;
-}
-early_param("gl3_enabled", config_gl3);
-#endif
 
 static struct pci_device_id pciidlist[] = {
 #ifdef SGX535
@@ -1300,8 +1282,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
 
        // GL3
 #ifdef CONFIG_MDFD_GL3
-       if (drm_psb_gl3_enable)
-               gl3_enable();
+       gl3_enable();
 #endif
 
        /*Intel drm driver load is done, continue doing pvr load*/

diff --git a/drivers/staging/mrst/drv/psb_drv.h b/drivers/staging/mrst/drv/psb_drv.h
index 9887239..e4c304b 100644 (file)
--- a/drivers/staging/mrst/drv/psb_drv.h
+++ b/drivers/staging/mrst/drv/psb_drv.h
@@ -1323,7 +1323,6 @@ static inline void REGISTER_WRITE8(struct drm_device *dev,
 extern int drm_psb_cpurelax;
 extern int drm_psb_udelaydivider;
 extern int drm_psb_udelaymultiplier;
-extern int drm_psb_gl3_enable;
 extern int drm_psb_topaz_clockgating;
 
 extern char HDMI_EDID[20];