From owner-svn-src-all@FreeBSD.ORG Sat Jan 31 02:13:26 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D98C626; Sat, 31 Jan 2015 02:13:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49F909A4; Sat, 31 Jan 2015 02:13:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0V2DQ0L029199; Sat, 31 Jan 2015 02:13:26 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0V2DQ8c029198; Sat, 31 Jan 2015 02:13:26 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201501310213.t0V2DQ8c029198@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 31 Jan 2015 02:13:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277959 - head/sys/dev/drm2/i915 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jan 2015 02:13:26 -0000 Author: adrian Date: Sat Jan 31 02:13:25 2015 New Revision: 277959 URL: https://svnweb.freebsd.org/changeset/base/277959 Log: Fix backlight for ivybridge based laptops (and whatever else comes through this codepath.) (1<<30) is documented as BLM_PCH_OVERRIDE_ENABLE, which the current i915 driver in Linux only sets for broadwell chips. This fixes the backlight control on the Lenovo X230. Approved by: kib Obtained from: Linux 7aa1e7f06d6ea1bce3b27630d50769d13da28b1a Modified: head/sys/dev/drm2/i915/intel_display.c Modified: head/sys/dev/drm2/i915/intel_display.c ============================================================================== --- head/sys/dev/drm2/i915/intel_display.c Sat Jan 31 02:12:57 2015 (r277958) +++ head/sys/dev/drm2/i915/intel_display.c Sat Jan 31 02:13:25 2015 (r277959) @@ -6995,7 +6995,7 @@ static void ivb_pch_pwm_override(struct */ I915_WRITE(BLC_PWM_CPU_CTL2, PWM_ENABLE); I915_WRITE(BLC_PWM_CPU_CTL, 0); - I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE | (1<<30)); + I915_WRITE(BLC_PWM_PCH_CTL1, PWM_ENABLE); } void intel_modeset_init_hw(struct drm_device *dev)