Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@no-log.org --- vgasrc/i915vga.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/vgasrc/i915vga.c b/vgasrc/i915vga.c index ee0f99f..95ca2c0 100644 --- a/vgasrc/i915vga.c +++ b/vgasrc/i915vga.c @@ -16,8 +16,6 @@ /**************************************************************** * Helper functions ****************************************************************/ -#define wait_for(condition) \ - while(!condition){}
u32 VISIBLE32FLAT i915_readl_32_notrace(u32 addr) @@ -87,15 +85,6 @@ void intel_lvds_enable(u32 bar)
i915_writel_32(bar + ctl_reg, i915_readl_32(bar + ctl_reg) | POWER_TARGET_ON); i915_readl_32_notrace(bar + lvds_reg); -#if 0 - if (wait_for((I915_READ(bar + stat_reg) & PP_ON) != 0, 1000)) { - dprintf(1, "[000000.0] [drm:%s], ", __func__); - dprintf(1, "timed out waiting for panel to power on\n"); - } -#else - while((i915_readl_32(bar + stat_reg) & PP_ON) != 0, 1000) - dprintf(1,"waiting for panel to power on\n"); -#endif intel_panel_actually_set_backlight(bar,get_default_max_backlight()); }
@@ -109,8 +98,7 @@ int i915vga_setup(void) dprintf(1, "%s: VGA init...\n", __func__);
int ret = stdvga_setup(); - if ( -ret) + if (ret) return ret;
/* HACK? hardcode to 00:02.0 for now */ @@ -118,8 +106,10 @@ ret)
// SET_VGA(VgaBDF, pci_to_bdf(0, 2, 0)); // intel_panel_actually_set_backlight(bar,488); +// +// intel_lvds_enable(bar);
- intel_lvds_enable(bar); + intel_panel_actually_set_backlight(bar,get_default_max_backlight());
dprintf(1, "%s: VGA init DONE.\n", __func__); return 0;