1. 16 6月, 2014 1 次提交
    • T
      drm/i915, HD-audio: Don't continue probing when nomodeset is given · 74b0c2d7
      Takashi Iwai 提交于
      When a machine is booted with nomodeset option, i915 driver skips the
      whole initialization.  Meanwhile, HD-audio tries to bind wth i915 just
      by request_symbol() without knowing that the initialization was
      skipped, and eventually it hits WARN_ON() in i915_request_power_well()
      and i915_release_power_well() wrongly but still continues probing,
      even though it doesn't work at all.
      
      In this patch, both functions are changed to return an error in case
      of uninitialized state instead of WARN_ON(), so that HD-audio driver
      can give up HDMI controller initialization at the right time.
      Acked-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Cc: <stable@vger.kernel.org> [3.15]
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      74b0c2d7
  2. 05 6月, 2014 11 次提交
  3. 23 5月, 2014 2 次提交
  4. 21 5月, 2014 2 次提交
  5. 20 5月, 2014 8 次提交
  6. 16 5月, 2014 5 次提交
  7. 15 5月, 2014 1 次提交
  8. 14 5月, 2014 3 次提交
  9. 13 5月, 2014 1 次提交
  10. 06 5月, 2014 2 次提交
    • V
      drm/i915: Merge LP1+ watermarks in safer way · d52fea5b
      Ville Syrjälä 提交于
      On ILK when we disable a particular watermark level, we must
      maintain the actual watermark values for that level for some time
      (until the next vblank possibly). Otherwise we risk underruns.
      
      In order to achieve that result we must merge the LP1+ watermarks a
      bit differently since we must also merge levels that are to be
      disabled. We must also make sure we don't overflow the fields in the
      watermark registers in case the calculated watermarks come out too
      big to fit.
      
      As early as possbile we mark all computed watermark levels as
      disabled if they would exceed the register maximums. We make sure
      to leave the actual watermarks for such levels zeroed out. Then during
      merging, we take the maxium values for every level, regardless if
      they're disabled or not. That may seem a bit pointless since at the
      moment all the watermark levels we merge should have their values
      zeroed if the level is already disabled. However soon we will be
      dealing with intermediate watermarks that, in addition to the new
      watermark values, also contain the previous watermark values, and so
      levels that are disabled may no longer be zeroed out.
      
      v2: Split the patch in two (Paulo)
          Use if() instead of & when merging ->enable (Paulo)
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      [danvet: Fix commit message as noted by Paulo.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      d52fea5b
    • V
      drm/i915: Make sure computed watermarks never overflow the registers · a3cb4048
      Ville Syrjälä 提交于
      When we calculate the watermarks for a pipe make sure we leave any
      level fully zeroed out if it would exceed any of the maximum values
      that fit in the registers.
      
      This will be important later when we start to use also disabled
      watermark levels during LP1+ merging.
      Signed-off-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      a3cb4048
  11. 05 5月, 2014 4 次提交