1. 15 10月, 2013 1 次提交
  2. 03 10月, 2013 1 次提交
  3. 02 10月, 2013 1 次提交
    • I
      drm/i915: fix rps.vlv_work initialization · 671952a2
      Imre Deak 提交于
      During driver loading we are initializing rps.vlv_work in
      valleyview_enable_rps() via the rps.delayed_resume_work delayed work.
      This is too late since we are using vlv_work already via
      i915_driver_load()->intel_uncore_sanitize()->
      intel_disable_gt_powersave(). This at least leads to the following
      kernel warning:
      
       INFO: trying to register non-static key.
       the code is fine but needs lockdep annotation.
       turning off the locking correctness validator.
      
      Fix this by initialzing vlv_work before we call intel_uncore_sanitize().
      
      The regression was introduced in
      
      commit 7dcd2677
      Author: Konstantin Khlebnikov <khlebnikov@openvz.org>
      Date:   Wed Jul 17 10:22:58 2013 +0400
      
          drm/i915: fix long-standing SNB regression in power consumption
          after resume
      
      though there was no good reason to initialize the static vlv_work from
      another delayed work to begin with (especially since this will happen
      multiple times).
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69397Tested-by: Nshui yangwei <yangweix.shui@intel.com>
      Signed-off-by: NImre Deak <imre.deak@intel.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      671952a2
  4. 09 9月, 2013 1 次提交
  5. 04 9月, 2013 1 次提交
  6. 03 9月, 2013 1 次提交
    • M
      drm/i915: Don't mask EI UP interrupt on IVB|SNB · a9c1f90c
      Mika Kuoppala 提交于
      Submitting a batchbuffer which simulates a gpu
      hang by doing MI_BATCH_BUFFER_START into itself,
      to test hangcheck, started to hard hang the whole box
      (IVB). Bisecting lead to this commit:
      
      commit 664b422c2966cd39b8f67e8d53a566ea8c877cd6
      Author: Vinit Azad <vinit.azad@intel.com>
      Date:   Wed Aug 14 13:34:33 2013 -0700
      
          drm/i915: Only unmask required PM interrupts
      
      Experimenting with the mask register showed that
      unmasking EI UP will prevent the hard hang in IVB and SNB.
      HSW doesn't hang with EI UP masked.
      
      Considering we are just disabling interrupts that aren't even
      delivered to driver, this change is more likely to paper over some
      weirdness in gpu's internal state machine. But until better
      explanation can be found, let's trade little bit of power
      for stability on these architectures.
      
      v2: - Unmask EI_EXPIRED directly in I915_WRITE (Vinit)
      v3: - Only unmask on SNB and IVB
      
      Cc: Vinit Azad <vinit.azad@intel.com>
      Signed-off-by: NMika Kuoppala <mika.kuoppala@intel.com>
      Acked-by: NVinit Azad <vinit.azad@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      a9c1f90c
  7. 23 8月, 2013 3 次提交
    • P
      drm/i915: allow package C8+ states on Haswell (disabled) · c67a470b
      Paulo Zanoni 提交于
      This patch allows PC8+ states on Haswell. These states can only be
      reached when all the display outputs are disabled, and they allow some
      more power savings.
      
      The fact that the graphics device is allowing PC8+ doesn't mean that
      the machine will actually enter PC8+: all the other devices also need
      to allow PC8+.
      
      For now this option is disabled by default. You need i915.allow_pc8=1
      if you want it.
      
      This patch adds a big comment inside i915_drv.h explaining how it
      works and how it tracks things. Read it.
      
      v2: (this is not really v2, many previous versions were already sent,
           but they had different names)
          - Use the new functions to enable/disable GTIMR and GEN6_PMIMR
          - Rename almost all variables and functions to names suggested by
            Chris
          - More WARNs on the IRQ handling code
          - Also disable PC8 when there's GPU work to do (thanks to Ben for
            the help on this), so apps can run caster
          - Enable PC8 on a delayed work function that is delayed for 5
            seconds. This makes sure we only enable PC8+ if we're really
            idle
          - Make sure we're not in PC8+ when suspending
      v3: - WARN if IRQs are disabled on __wait_seqno
          - Replace some DRM_ERRORs with WARNs
          - Fix calls to restore GT and PM interrupts
          - Use intel_mark_busy instead of intel_ring_advance to disable PC8
      v4: - Use the force_wake, Luke!
      v5: - Remove the "IIR is not zero" WARNs
          - Move the force_wake chunk to its own patch
          - Only restore what's missing from RC6, not everything
      Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Reviewed-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      c67a470b
    • J
      drm/i915: drop WaMbcDriverBootEnable workaround · 3414caf6
      Jesse Barnes 提交于
      Turns out the BIOS will do this for us as needed, and if we try to do it
      again we risk hangs or other bad behavior.
      
      Note that this seems to break libva on ChromeOS after resumes (but
      strangely _not_ after booting up).
      
      This essentially reverts
      
      commit b4ae3f22
      Author: Jesse Barnes <jbarnes@virtuousgeek.org>
      Date:   Thu Jun 14 11:04:48 2012 -0700
      
          drm/i915: load boot context at driver init time
      
      and
      
      commit b3bf0766
      Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Date:   Tue Nov 20 13:27:44 2012 -0200
      
          drm/i915: implement WaMbcDriverBootEnable on Haswell
      Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Reported-and-Tested-by: NStéphane Marchesin <marcheu@chromium.org>
      [danvet: Add note about impact and regression citation.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      3414caf6
    • P
      drm/i915: wrap GEN6_PMIMR changes · edbfdb45
      Paulo Zanoni 提交于
      Just like we're doing with the other IMR changes.
      
      One of the functional changes is that not every caller was doing the
      POSTING_READ.
      Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Reviewed-by: NRodrigo Vivi <rodrigo.vivi@gmail.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      edbfdb45
  8. 22 8月, 2013 3 次提交
    • V
      drm/i915: Only unmask required PM interrupts · fd547d25
      Vinit Azad 提交于
      Un-masking all PM interrupts causes hardware to generate
      interrupts regardless of whether the interrupts are enabled
      on the DE side. Since turbo only need up/down threshold and
      rc6 timeout interrupt, mask all other interrupts bits to avoid
      unnecessary overhead/wake up.
      
      Note that our interrupt handler isn't being fired since we do set the
      IER bits properly (IIR bits aren't set). The overhead isn't because
      our driver is reacting to these interrupts, but because hardware keeps
      generating internal messages when PMINTRMSK doesn't mask out the
      up/down EI interrupts (which happen periodically).
      
      Change-Id: I6c947df6fd5f60584d39b9e8b8c89faa51a5e827
      Signed-off-by: NVinit Azad <vinit.azad@intel.com>
      [danvet: Add follow-up explanation of the precise effects from Vinit
      as a note to the commit message.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      fd547d25
    • P
      drm/i915: clarify Haswell power well bit names · 6aedd1f5
      Paulo Zanoni 提交于
      Whenever I need to work with the HSW_PWER_WELL_* register bits I have
      to look at the documentation to find out which bit is to request the
      power well and which one shows its current state. Rename the bits so I
      won't need to look the docs every time.
      Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      6aedd1f5
    • S
      drm/i915: tune the RC6 threshold for stability · 351aa566
      Stéphane Marchesin 提交于
      It's basically the same deal as the RC6+ issues on ivy bridge
      except this time with RC6 on sandy bridge. Like last time the
      core of the issue is that the timings don't work 100% with our
      voltage regulator. So from time to time, the kernel will print
      a warning message about the GPU not getting out of RC6. In
      particular, I found this fairly easy to reproduce during
      suspend/resume.
      
      Changing the threshold to 125000 instead of 50000 seems to fix
      the issue. The previous patch used 150000 but as it turns out
      this doesn't work everywhere. After getting such a machine, I
      bisected the highest value which works, which is 125000, so here
      it is.
      
      I also measured the idle power usage before/after this patch and
      didn't see a difference on a sandy bridge laptop. On haswell and
      up, it makes a big difference, so we want to keep it at 50k
      there. It also seems like haswell doesn't have the RC6 issues
      that sandy bridge has so the 50k value is fine.
      Signed-off-by: NStéphane Marchesin <marcheu@chromium.org>
      Acked-by: NJesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      351aa566
  9. 10 8月, 2013 2 次提交
  10. 08 8月, 2013 10 次提交
  11. 07 8月, 2013 1 次提交
    • P
      drm/i915: update last_vblank when disabling the power well · 9dbd8feb
      Paulo Zanoni 提交于
      The DRM layer keeps track of our vblanks and it assumes our vblank
      counters only go back to zero when they overflow. The problem is that
      when we disable the power well our counters also go to zero, but it
      doesn't mean they did overflow. So on this patch we grab the lock and
      update last_vblank so the DRM layer won't think our counters
      overflowed.
      
      This patch fixes the following intel-gpu-tools test:
      ./kms_flip --run-subtest blocking-absolute-wf_vblank
      
      Regression introduced by the following commit:
      
      commit bf51d5e2
      Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Date:   Wed Jul 3 17:12:13 2013 -0300
          drm/i915: switch disable_power_well default value to 1
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66808Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      [danvet: Added a comment that this might be better done in
      drm_vblank_post_modeset in general.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      9dbd8feb
  12. 06 8月, 2013 15 次提交