Skip to contentSkip to conversation

drm/i915: Insert i915_preliminary_hw_support variable.

PATCH In review Rodrigo Vivi 4 participants 6 messages Oct 15, 2012 – Oct 18, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Insert i915_preliminary_hw_support variable.

On the worst scenario, users with new hardwares and old kernel from enabling times can get black screens. So, now on, this i915_perliminary_hw_support variable shall be used by all upcoming platforms that are still under enabling.

Although it is uncomfortable for developers use this extra variable it brings more stability for end users.

---
 drivers/gpu/drm/i915/i915_drv.c | 13 +++++++++++++
 drivers/gpu/drm/i915/i915_drv.h |  1 +
 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +13 -0
index a7837e5..41bee22 100644
@@ -119,6 +119,13 @@ module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, int, 0600);
 MODULE_PARM_DESC(i915_enable_ppgtt,
 		"Enable PPGTT (default: true)");
 
+unsigned int i915_preliminary_hw_support __read_mostly = 0;
+module_param_named(i915_preliminary_hw_support, i915_preliminary_hw_support, int, 0600);
+MODULE_PARM_DESC(i915_preliminary_hw_support,
+		"Enable preliminary hardware support. "
+		"Enable Haswell and ValleyView Support. "
+		"(default: false)");
+
 static struct drm_driver driver;
 extern int intel_agp_enabled;
 
@@ -827,6 +834,12 @@ i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct intel_device_info *intel_info =
 		(struct intel_device_info *) ent->driver_data;
 
+	if (intel_info->is_haswell || intel_info->is_valleyview)
+		if(!i915_preliminary_hw_support) {
+			DRM_ERROR("Preliminary hardware support disabled\n");
+			return -ENODEV;
+		}
+
 	/* Only bind to function 0 of the device. Early generations
 	 * used function 1 as a placeholder for multi-head. This causes
 	 * us confusion instead, especially on the systems where both
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 9e446b6..5617881 100644
@@ -1225,6 +1225,7 @@ extern int i915_enable_rc6 __read_mostly;
 extern int i915_enable_fbc __read_mostly;
 extern bool i915_enable_hangcheck __read_mostly;
 extern int i915_enable_ppgtt __read_mostly;
+extern unsigned int i915_preliminary_hw_support __read_mostly;
 
 extern int i915_suspend(struct drm_device *dev, pm_message_t state);
 extern int i915_resume(struct drm_device *dev);
Signature · 1 line
1.7.11.4
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Rodrigo Vivi

On the worst scenario, users with new hardwares and old kernel from enabling times can get black screens. So, now on, this i915_perliminary_hw_support variable shall be used by all upcoming platforms that are still under enabling.

Although it is uncomfortable for developers use this extra variable it brings more stability for end users.

I like this idea, since I've got to ship known broken kernels on HSW by default.

The biggest issue is when we consider it working, I suppose if it can successfully light up most of its output, since I know we'll always be plagued with eDP randomly not working.

Quoted 55 lines
---
 drivers/gpu/drm/i915/i915_drv.c | 13 +++++++++++++
 drivers/gpu/drm/i915/i915_drv.h |  1 +
 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +13 -0
index a7837e5..41bee22 100644
@@ -119,6 +119,13 @@ module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, int, 0600);
 MODULE_PARM_DESC(i915_enable_ppgtt,
                "Enable PPGTT (default: true)");
 
+unsigned int i915_preliminary_hw_support __read_mostly = 0;
+module_param_named(i915_preliminary_hw_support, i915_preliminary_hw_support, int, 0600);
+MODULE_PARM_DESC(i915_preliminary_hw_support,
+               "Enable preliminary hardware support. "
+               "Enable Haswell and ValleyView Support. "
+               "(default: false)");
+
 static struct drm_driver driver;
 extern int intel_agp_enabled;
 
@@ -827,6 +834,12 @@ i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct intel_device_info *intel_info =
                (struct intel_device_info *) ent->driver_data;
 
+       if (intel_info->is_haswell || intel_info->is_valleyview)
+               if(!i915_preliminary_hw_support) {
+                       DRM_ERROR("Preliminary hardware support disabled\n");
+                       return -ENODEV;
+               }
+
        /* Only bind to function 0 of the device. Early generations
         * used function 1 as a placeholder for multi-head. This causes
         * us confusion instead, especially on the systems where both
drivers/gpu/drm/i915/i915_drv.h +1 -1
index 9e446b6..5617881 100644
@@ -1225,6 +1225,7 @@ extern int i915_enable_rc6 __read_mostly;
 extern int i915_enable_fbc __read_mostly;
 extern bool i915_enable_hangcheck __read_mostly;
 extern int i915_enable_ppgtt __read_mostly;
+extern unsigned int i915_preliminary_hw_support __read_mostly;
 
 extern int i915_suspend(struct drm_device *dev, pm_message_t state);
 extern int i915_resume(struct drm_device *dev);
--

1.7.11.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Rodrigo Vivi
Quoted 6 lines · Rodrigo Vivi

On the worst scenario, users with new hardwares and old kernel from enabling times can get black screens. So, now on, this i915_perliminary_hw_support variable shall be used by all upcoming platforms that are still under enabling.

Although it is uncomfortable for developers use this extra variable it brings more stability for end users.

Merged, with the linewrap in the commit message fixed and the module param shrunk by the redudant i915_ prefix.

Thanks, Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#3 lore raw
Quoted 6 lines · Daniel Vetter
Quoted 1 line · Rodrigo Vivi

On the worst scenario, users with new hardwares and old kernel from

enabling times can get black screens.

Quoted 1 line

So, now on, this i915_perliminary_hw_support variable shall be used by

all upcoming platforms that are still under enabling.

Quoted 1 line
Quoted 8 lines
Quoted 1 line

Although it is uncomfortable for developers use this extra variable it

brings more stability for end users.

Quoted 2 lines

Merged, with the linewrap in the commit message fixed and the module param shrunk by the redudant i915_ prefix.

Thanks!
To be honest I don't like any of those i915_... all redundants i195.i915_

Quoted 7 lines

Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Signature · 2 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 1 line · Rodrigo Vivi

To be honest I don't like any of those i915_... all redundants i195.i915_

Yeah, unfortunately we can't kill them because tons of people set random options they've found while googling (i915.rc6=7 anyone?) and if we rename them, the module won't load any more :( -Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#5 lore raw
In reply to Rodrigo Vivi
Quoted 11 lines · Rodrigo Vivi
Quoted 9 lines · Daniel Vetter
Quoted 1 line · Rodrigo Vivi

On the worst scenario, users with new hardwares and old kernel from

enabling times can get black screens.

Quoted 1 line

So, now on, this i915_perliminary_hw_support variable shall be used by

all upcoming platforms that are still under enabling.

Quoted 2 lines

Although it is uncomfortable for developers use this extra variable it

brings more stability for end users.

Quoted 1 line
Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Merged, with the linewrap in the commit message fixed and the module param shrunk by the redudant i915_ prefix.

Thanks!
To be honest I don't like any of those i915_... all redundants i195.i915_

There weren't meant to be there, they were just cut'n'pasting the variable name into the wrong field and then enshrined as a public interface.

Quoted 4 lines
Quoted 4 lines
Quoted 12 lines
Quoted 6 lines

Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Signature · 2 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br

Non-text part: text/html

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre