1. 12 11月, 2012 6 次提交
    • D
      drm/i915: add ->display.modeset_global_resources callback · 47fab737
      Daniel Vetter 提交于
      After all relevant pipes are disabled and after we've updated all the
      state with the staged state, but before we call the per-crtc
      ->mode_set functions there's a very natural point to set up any
      shared/global resources like
      - shared plls (obviously only the setup, the enabling needs to be
        separately handling with a separate refcount)
      - global watermark state like the DSPARB on gmch platforms
      - workaround bits that depend upon the exact global output
        configuration
      - enabling the right set of refclocks
      - enabling/disabling manual power wells.
      
      Now for a lot of these things we can't move them into this function
      yet, most often because we only compute the required information in
      the per-crtc ->mode_set callback. Which is too late. But due to a
      bunch of reasons (check-only atomic modeset, fastboot&hw state checks,
      ...) we need to separate the computation of that state from the actual
      hw frobbery anyway. So we can move things into this new callback step-
      by-step.
      
      Others can't be moved here (or implemented at all) because our code
      lacks the smarts to properly update them. E.g. the DSPARB can only be
      updated when all pipes are disabled, so if we decide to change it's
      value, we need to disable _all_ pipes. The infrastructure for that is
      already in place (with the various pipe masks that driver the modeset
      logic). But again we need to move a few things out of ->mode_set
      first before we can even implement the correct decision making.
      
      In any case, we need to start somewhere, so let's start with the
      callback: Some small follow-up patches will make immediate good use of
      it.
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      47fab737
    • D
      drm/i915: BUG on impossible pch dp port · e95d41e1
      Daniel Vetter 提交于
      Since it is one. We need to move this code to encoder specific callbacks
      eventually, to kill all that inversion of control ...
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      e95d41e1
    • D
      drm/i915: add comment about pch pll enabling rules · 572deb37
      Daniel Vetter 提交于
      Atm we have a few funny issues where we enable/disable shared
      pll clocks. To make it clear that we are not required to enable/
      disable the pch plls together with the other pch resources (and
      so should keep it running when it's used by another pipe in
      a shared pll configuration) add a comment.
      
      This note is lifted from "Graphics BSpec: vol4g North Display Engine
      Registers [IVB], Display Mode Set Sequence", step 9.d. of the enable
      sequence:
      
      "Configure and enable PCH DPLL, wait for PCH DPLL warmup (Can be
      done anytime before enabling PCH transcoder)."
      
      Since fixing the pll sharing code to no longer disable shared plls
      if they're still in use is more involved, let's just stick with the
      comment for now.
      
      v2: Make the comment in the code clearer, to address questions raised
      by Paulo Zanoni in review.
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      572deb37
    • D
      drm/i915: set FDI_RX_MISC to recommended values on CPT/PPT · d74cf324
      Daniel Vetter 提交于
      My machine here has the correct ones already, but better safe
      than sorry. IBX has different settings for that register, and
      on IBX the device defaults match the recommended values. Hence
      I did not add the respective writes for IBX.
      
      LPT needs the same settings, but that has been done already
      
      commit 4acf5186
      Author: Eugeni Dodonov <eugeni.dodonov@intel.com>
      Date:   Wed Jul 4 20:15:16 2012 -0300
      
          drm/i915: program FDI_RX TP and FDI delays
      
      Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      d74cf324
    • D
      drm/i915: clarify why we need to enable fdi plls so early · fff367c7
      Daniel Vetter 提交于
      For reference, see "Graphics BSpec: vol4g North Display Engine
      Registers [IVB], Display Mode Set Sequence", step 4 of the enabling
      sequence:
      
      a. "Enable PCH FDI Receiver PLL, wait for warmup plus DMI latency
      b. "Switch from Rawclk to PCDclk in FDI Receiver
      c. "Enable CPU FDI Transmitter PLL, wait for warmup"
      
      Cc: Paulo Zanoni <przanoni@gmail.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      fff367c7
    • D
      drm/i915: Write the FDI RX TU size reg at the right time · cd986abb
      Daniel Vetter 提交于
      According to "Graphics BSpec: vol4g North Display Engine Registers [IVB],
      Display Mode Set Sequence" We need to write the TU size register
      of the fdi RX unit _before_ starting to train the link.
      
      Note: The current code is actually correct as Paulo mentioned in
      review, but it's a bit confusion since only the fdi rx/tx plls need to
      be enabled before the cpu pipes/planes. Hence it's still a good idea
      to move the TU_SIZE setting to the "right" spot in the sequence, to
      better match Bspec.
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      cd986abb
  2. 02 11月, 2012 1 次提交
    • J
      drm/i915: pass adjusted_mode to intel_choose_pipe_bpp_dither(), again · c8241969
      Jani Nikula 提交于
      Daniel's backmerge
      
      commit c2fb7916
      Merge: 29de6ce5 6f0c0580
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Mon Oct 22 14:34:51 2012 +0200
      
          Merge tag 'v3.7-rc2' into drm-intel-next-queued
      
      to solve conflicts blew up (either git or Daniel was trying to be too
      clever for their own good; it's usually convenient to blame tools ;) and
      caused the changes of
      
      commit 0c96c65b
      Author: Jani Nikula <jani.nikula@intel.com>
      Date:   Wed Sep 26 18:43:10 2012 +0300
      
          drm/i915: use adjusted_mode instead of mode for checking the 6bpc force flag
      
      in ironlake_crtc_mode_set() to be dropped.
      
      Fix the call in ironlake_crtc_mode_set() again, and while at it, also fix
      the new, copy-pasted haswell_crtc_mode_set() to use adjusted_mode.
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      c8241969
  3. 26 10月, 2012 12 次提交
  4. 24 10月, 2012 1 次提交
  5. 19 10月, 2012 1 次提交
  6. 18 10月, 2012 2 次提交
  7. 12 10月, 2012 2 次提交
    • D
      drm/i915: fixup the plane->pipe fixup code · fa555837
      Daniel Vetter 提交于
      We need to check whether the _other plane is on our pipe, not whether
      our plane is on the other pipe. Otherwise if not both pipes/planes are
      active, we won't properly clean up the mess and set up our desired
      plane->pipe mapping.
      
      v2: Fixup the logic, I've totally fumbled it. Noticed by Chris Wilson.
      
      v3: I've checked Bspec, and the flexible plane->pipe mapping is a
      gen2/3 feature, so test for that instead of PCH_SPLIT
      
      v4: Check whether we indeed have 2 pipes before checking the other
      pipe, to avoid upsetting i845g/i865g. Noticed by Chris Wilson.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51265
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49838Tested-by: NDave Airlie <airlied@gmail.com>
      Tested-by: Chris Wilson <chris@chris-wilson.co.uk> #855gm
      Reviewed-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      fa555837
    • D
      drm/i915: rip out the pipe A quirk for i855gm · ccd0d36e
      Daniel Vetter 提交于
      This seems to be the root-cause that breaks resume on my i855gm when I
      apply the "drm/i915: fixup the plane->pipe fixup code" patch. And that
      code doesn't even run on my machine, so it's pure timing changes
      causing the regression.
      
      Furthermore resume has been constantly switching between working and
      broken on this machine ever since kms support has been merged,
      seemingly with no related change as a root cause. And always with the
      same symptoms of the backlight lighting up, but the lvds panel only
      displaying black.
      
      Also, of both i855gm variants only one is in the table. And in the
      past we've only ever removed entries from this quirk table because it
      breaks things.
      
      So let's just remove it - in case there's indeed a bios out there
      relying on a running pipe A, we can add back in a more precise quirk
      entry, like all the others (save for i830/i845).
      
      Tested-by: Chris Wilson <chris@chris-wilson.co.uk> #855gm
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      ccd0d36e
  8. 11 10月, 2012 1 次提交
  9. 10 10月, 2012 7 次提交
  10. 09 10月, 2012 1 次提交
  11. 04 10月, 2012 1 次提交
  12. 03 10月, 2012 1 次提交
  13. 02 10月, 2012 2 次提交
    • P
      drm/i915: extract intel_set_pipe_timings from crtc_mode_set · b0e77b9c
      Paulo Zanoni 提交于
      Version 2: call intel_set_pipe_timings from both i9xx_crtc_mode_set
      and ironlake_crtc_mode_set, instead of just ironlake, as requested by
      Daniel Vetter.
      
      The problem caused by calling this function from i9xx_crtc_mode_set
      too is that now on i9xx we write to PIPESRC before writing to DSPSIZE
      and DSPPOS. I could not find any evidence in our documentation that
      this won't work, and the docs actually say the pipe registers should
      be set before the plane registers.
      
      Version 3: don't remove pipeconf bits on i9xx_crtc_mode_set.
      Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      b0e77b9c
    • C
      drm/i915: Flush the pending flips on the CRTC before modification · 5bb61643
      Chris Wilson 提交于
      This was meant to be the purpose of the
      intel_crtc_wait_for_pending_flips() function which is called whilst
      preparing the CRTC for a modeset or before disabling. However, as Ville
      Syrjala pointed out, we set the pending flip notification on the old
      framebuffer that is no longer attached to the CRTC by the time we come
      to flush the pending operations. Instead, we can simply wait on the
      pending unpin work to be finished on this CRTC, knowning that the
      hardware has therefore finished modifying the registers, before proceeding
      with our direct access.
      
      Fixes i-g-t/flip_test on non-pch platforms. pch platforms simply
      schedule the flip immediately when the pipe is disabled, leading
      to other funny issues.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Cc: stable@vger.kernel.org
      [danvet: Added i-g-t note and cc: stable]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      5bb61643
  14. 28 9月, 2012 2 次提交