Skip to content
  1. Nov 17, 2016
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.9' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 29ed1973
      Dave Airlie authored
      Just a few bug fixes for 4.9.  The big one is Mario's prime fencing fix.
      
      * 'drm-fixes-4.9' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu:fix vpost_needed routine
        drm/amdgpu/powerplay: drop a redundant NULL check
        drm/amdgpu: Attach exclusive fence to prime exported bo's. (v5)
      29ed1973
    • Dave Airlie's avatar
      Merge branch 'mediatek-drm-fixes-2016-11-11' of... · 51a4c38a
      Dave Airlie authored
      Merge branch 'mediatek-drm-fixes-2016-11-11' of https://github.com/ckhu-mediatek/linux.git-tags into drm-fixes
      
      This branch include one patch to fix a typo, two patches to disable
      vblank interrupt, and three patches to support HDMI 4K resolution.
      
      * 'mediatek-drm-fixes-2016-11-11' of https://github.com/ckhu-mediatek/linux.git-tags:
        drm/mediatek: modify the factor to make the pll_rate set in the 1G-2G range
        drm/mediatek: enhance the HDMI driving current
        drm/mediatek: do mtk_hdmi_send_infoframe after HDMI clock enable
        drm/mediatek: clear IRQ status before enable OVL interrupt
        drm/mediatek: set vblank_disable_allowed to true
        drm/mediatek: fix a typo of OD_CFG to OD_RELAYMODE
      51a4c38a
  2. Nov 16, 2016
  3. Nov 11, 2016
    • Mario Kleiner's avatar
      drm/amdgpu: Attach exclusive fence to prime exported bo's. (v5) · 8e94a46c
      Mario Kleiner authored
      
      
      External clients which import our bo's wait only
      for exclusive dmabuf-fences, not on shared ones,
      ditto for bo's which we import from external
      providers and write to.
      
      Therefore attach exclusive fences on prime shared buffers
      if our exported buffer gets imported by an external
      client, or if we import a buffer from an external
      exporter.
      
      See discussion in thread:
      https://lists.freedesktop.org/archives/dri-devel/2016-October/122370.html
      
      Prime export tested on Intel iGPU + AMD Tonga dGPU as
      DRI3/Present Prime render offload, and with the Tonga
      standalone as primary gpu.
      
      v2: Add a wait for all shared fences before prime export,
          as suggested by Christian Koenig.
      
      v3: - Mark buffer prime_exported in amdgpu_gem_prime_pin,
          so we only use the exclusive fence when exporting a
          bo to external clients like a separate iGPU, but not
          when exporting/importing from/to ourselves as part of
          regular DRI3 fd passing.
      
          - Propagate failure of reservation_object_wait_rcu back
          to caller.
      
      v4: - Switch to a prime_shared_count counter instead of a
            flag, which gets in/decremented on prime_pin/unpin, so
            we can switch back to shared fences if all clients
            detach from our exported bo.
      
          - Also switch to exclusive fence for prime imported bo's.
      
      v5: - Drop lret, instead use int ret -> long ret, as proposed
            by Christian.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95472
      Tested-by: Mike Lothian <mike@fireburn.co.uk> (v1)
      Signed-off-by: default avatarMario Kleiner <mario.kleiner.de@gmail.com>
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com&gt;.>
      Cc: Christian König <christian.koenig@amd.com>
      Cc: Michel Dänzer <michel.daenzer@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      8e94a46c
    • Dave Airlie's avatar
      Merge branch 'topic-arcpgu-fixes' of... · e2384535
      Dave Airlie authored
      Merge branch 'topic-arcpgu-fixes' of https://github.com/foss-for-synopsys-dwc-arc-processors/linux into drm-fixes
      
      * 'topic-arcpgu-fixes' of https://github.com/foss-for-synopsys-dwc-arc-processors/linux:
        drm/arcpgu: Accommodate adv7511 switch to DRM bridge
      e2384535
    • Eugeniy Paltsev's avatar
      drm/arcpgu: Accommodate adv7511 switch to DRM bridge · 7bc61cc5
      Eugeniy Paltsev authored
      ARC PGU driver starts crashing on initialization after
      'commit e12c2f64
      
       ("drm/i2c: adv7511: Convert to drm_bridge")'
      This happenes because in "arcpgu_drm_hdmi_init" function we get pointer
      of "drm_i2c_encoder_driver" structure, which doesn't exist after
      adv7511 hdmi encoder interface changed from slave encoder to drm bridge.
      So, when we call "encoder_init" function from this structure driver
      crashes.
      
      Bootlog:
      ------------------------------------->8--------------------------------
      [drm] Initialized drm 1.1.0 20060810
      arcpgu e0017000.pgu: arc_pgu ID: 0xabbabaab
      arcpgu e0017000.pgu: assigned reserved memory node frame_buffer@9e000000
      Path: (null)
      CPU: 0 PID: 1 Comm: swapper Not tainted 4.8.0-00001-gb5642252fa01-dirty #8
      task: 9a058000 task.stack: 9a032000
      
      [ECR   ]: 0x00220100 => Invalid Read @ 0x00000004 by insn @ 0x803934e8
      [EFA   ]: 0x00000004
      [BLINK ]: drm_atomic_helper_connector_dpms+0xa6/0x230
      [ERET  ]: drm_atomic_helper_connector_dpms+0xa4/0x230
      [STAT32]: 0x00000846 : K DE       E2 E1
      BTA: 0x8016d949  SP: 0x9a033e34  FP: 0x00000000
      LPS: 0x8036f6fc LPE: 0x8036f700 LPC: 0x00000000
      r00: 0x8063c118 r01: 0x805b98ac r02: 0x00000b11
      r03: 0x00000000 r04: 0x9a010f54 r05: 0x00000000
      r06: 0x00000001 r07: 0x00000000 r08: 0x00000028
      r09: 0x00000001 r10: 0x00000007 r11: 0x00000054
      r12: 0x720a3033
      
      Stack Trace:
        drm_atomic_helper_connector_dpms+0xa4/0x230
        arcpgu_drm_hdmi_init+0xbc/0x228
        arcpgu_probe+0x168/0x244
        platform_drv_probe+0x26/0x64
        really_probe+0x1f0/0x32c
        __driver_attach+0xa8/0xd0
        bus_for_each_dev+0x3c/0x74
        bus_add_driver+0xc2/0x184
        driver_register+0x50/0xec
        do_one_initcall+0x3a/0x120
        kernel_init_freeable+0x108/0x1a0
      ------------------------------------->8--------------------------------
      
      Fix ARC PGU driver to be able work with drm bridge hdmi encoder
      interface. The hdmi connector code isn't needed anymore as we expect
      the adv7511 bridge driver to create/manage the connector.
      
      Signed-off-by: default avatarEugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
      Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
      Signed-off-by: default avatarAlexey Brodkin <abrodkin@synopsys.com>
      7bc61cc5
    • Dave Airlie's avatar
      Merge branch 'fixes-for-v4.9-rc5' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-fixes · 76af753b
      Dave Airlie authored
      Yet another small batch of fixes. Two of the patches I had prepared
      since quite some time, but they did not seem to affect operation in
      a visible manner so far. Until recently, when I discovered the third
      issue (disable planes before disabling CRTC), which made the two
      previous fixes necessary.
      
      * 'fixes-for-v4.9-rc5' of http://git.agner.ch/git/linux-drm-fsl-dcu:
        drm/fsl-dcu: disable planes before disabling CRTC
        drm/fsl-dcu: update all registers on flush
        drm/fsl-dcu: do not update when modifying irq registers
      76af753b
    • Dave Airlie's avatar
      Merge tag 'imx-drm-fixes-2016-11-10' of git://git.pengutronix.de/git/pza/linux into drm-fixes · 24399f4f
      Dave Airlie authored
      imx-drm: fix possible hangup when disabling crtcs
      
      - only ever disable the display controller (DC) module after all plane
        IDMAC channels are stopped. This fixes a regression introduced by the
        atomic modeset conversion.
      
      * tag 'imx-drm-fixes-2016-11-10' of git://git.pengutronix.de/git/pza/linux:
        drm/imx: disable planes before DC
      24399f4f
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.9' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · b71752af
      Dave Airlie authored
       Regression fix for powerplay on some iceland boards.
      
      * 'drm-fixes-4.9' of git://people.freedesktop.org/~agd5f/linux:
        drm/amd/powerplay: implement get_clock_by_type for iceland.
        drm/amd/powerplay/smu7: fix checks in smu7_get_evv_voltages (v2)
        drm/amd/powerplay: update phm_get_voltage_evv_on_sclk for iceland
        drm/amd/powerplay: propagate errors in phm_get_voltage_evv_on_sclk
      b71752af
    • Dave Airlie's avatar
      drm/udl: make control msg static const. (v2) · e5581fe2
      Dave Airlie authored
      
      
      Thou shall not send control msg from the stack,
      does that mean I can send it from the RO memory area?
      
      and it looks like the answer is no, so here's
      v2 which kmemdups.
      
      Reported-by: poma
      Tested-by: default avatarpoma <poma@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e5581fe2
    • Rex Zhu's avatar
      drm/amd/powerplay: implement get_clock_by_type for iceland. · 954e6bee
      Rex Zhu authored
      
      
      iceland use pptable v0.
      
      bugs:
      https://bugzilla.kernel.org/show_bug.cgi?id=185681
      https://bugs.freedesktop.org/show_bug.cgi?id=98357
      
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      954e6bee
    • Alex Deucher's avatar
      drm/amd/powerplay/smu7: fix checks in smu7_get_evv_voltages (v2) · 0f12f73c
      Alex Deucher authored
      
      
      Only check if the tables exist in relevant configs.  This
      fixes a failure on V0 tables.
      
      v2: fix version check as suggested by Rex
      
      bugs:
      https://bugzilla.kernel.org/show_bug.cgi?id=185681
      https://bugs.freedesktop.org/show_bug.cgi?id=98357
      
      Reviewed-by: default avatarRex Zhu <Rex.Zhu@amd.com>
      Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      0f12f73c
    • Alex Deucher's avatar
      drm/amd/powerplay: update phm_get_voltage_evv_on_sclk for iceland · 90ebf118
      Alex Deucher authored
      
      
      Was missing the handling for iceland.
      
      bugs:
      https://bugzilla.kernel.org/show_bug.cgi?id=185681
      https://bugs.freedesktop.org/show_bug.cgi?id=98357
      
      Reviewed-by: default avatarRex Zhu <Rex.Zhu@amd.com>
      Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      90ebf118
    • Alex Deucher's avatar
      drm/amd/powerplay: propagate errors in phm_get_voltage_evv_on_sclk · 0a866d38
      Alex Deucher authored
      
      
      Missing for one case.
      
      bugs:
      https://bugzilla.kernel.org/show_bug.cgi?id=185681
      https://bugs.freedesktop.org/show_bug.cgi?id=98357
      
      Reviewed-by: default avatarRex Zhu <Rex.Zhu@amd.com>
      Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      0a866d38
  4. Nov 10, 2016
  5. Nov 09, 2016
    • Lucas Stach's avatar
      drm/imx: disable planes before DC · 5ced937b
      Lucas Stach authored
      If the DC clock is disabled before the attached IDMACs are properly
      stopped the IDMACs may hang the IPU or even the whole system.
      
      Make sure the IDMACs are in safe state by disabling the planes before
      removal of the DC clock.
      
      Also set the atomic parameter to false to stop calling the atomic_begin
      hook, which does nothing useful as we immediately afterwards turn off
      vblank interrupts and possibly send the pending vblank event.
      
      Fixes: 33f14235
      
       (drm/imx: atomic phase 1: Use transitional atomic
                           CRTC and plane helpers)
      Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
      Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
      5ced937b
    • Stefan Agner's avatar
      drm/fsl-dcu: disable planes before disabling CRTC · 3d6f3710
      Stefan Agner authored
      
      
      After disabling and reenabling the CRTC the DCU sometimes got stuck
      displaying the whole screen with a solid color. Disabling and
      reenabling the CRTC did not recover from the situation. This was
      often reproducable by just restarting the X-Server.
      
      The disabling sequence is not explicitly documented. But it turns
      out that disabling the planes before disabling the CRTC seems to
      prevent the above situation from happening.
      
      Use the callback ->atomic_disable instead of ->disable which allows
      to use the drm_atomic_helper_disable_planes_on_crtc() helper to
      disable planes before disabling the controller.
      
      Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
      3d6f3710
    • Stefan Agner's avatar
      drm/fsl-dcu: update all registers on flush · 93daeeca
      Stefan Agner authored
      
      
      Use the UPDATE_MODE READREG bit to initiate a register transfer
      on flush. This makes sure that we flush all registers only once
      for all planes.
      
      Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
      93daeeca
    • Stefan Agner's avatar
      drm/fsl-dcu: do not update when modifying irq registers · 34a515d2
      Stefan Agner authored
      
      
      The IRQ status and mask registers are not "double buffered" according
      to the reference manual. Hence, there is no extra transfer/update
      write needed when modifying these registers.
      
      Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
      34a515d2
    • Andrew Shadura's avatar
      drm/amd/powerplay: return false instead of -EINVAL · f20024d8
      Andrew Shadura authored
      
      
      Returning -EINVAL from a bool-returning function
      phm_check_smc_update_required_for_display_configuration has an unexpected
      effect of returning true, which is probably not what was intended.
      Replace -EINVAL by false.
      
      The only place this function is called from is
      psm_adjust_power_state_dynamic in
      drivers/gpu/drm/amd/powerplay/eventmgr/psm.c:106:
      
      	if (!equal || phm_check_smc_update_required_for_display_configuration(hwmgr)) {
      		phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
      		phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
      		hwmgr->current_ps = requested;
      	}
      
      It seems to expect a boolean value here.
      
      This issue has been found using the following Coccinelle semantic patch
      written by Peter Senna Tschudin:
      <smpl>
      @@
      identifier f;
      constant C;
      typedef bool;
      @@
      bool f (...){
      <+...
      * return -C;
      ...+>
      }
      </smpl>
      
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarAndrew Shadura <andrew.shadura@collabora.co.uk>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      f20024d8
  6. Nov 08, 2016
    • Arnd Bergmann's avatar
      drm/amdgpu/powerplay/smu7: fix unintialized data usage · a29d1260
      Arnd Bergmann authored
      A recent bugfix replaced an out-of-bounds access with direct
      use of unintialized data:
      
      drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c: In function 'smu7_patch_limits_vddc':
      drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2033:6: error: 'vddc' may be used uninitialized in this function [-Werror=maybe-uninitialized]
      drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2146:11: note: 'vddc' was declared here
      drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2033:6: error: 'vddci' may be used uninitialized in this function [-Werror=maybe-uninitialized]
      drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2146:17: note: 'vddci' was declared here
        uint32_t vddc, vddci;
      
      This initializes the data as before using the correct type.
      
      Fixes: 77f7f71f
      
       ("drm/amdgpu/powerplay/smu7: fix static checker warning")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      a29d1260
    • Alex Deucher's avatar
      drm/amdgpu: fix crash in acp_hw_fini · 757124d9
      Alex Deucher authored
      
      
      On CZ/ST systems with AZ rather than ACP audio, we need to bail
      early in hw_fini since there is nothing to do.
      
      bug: https://bugs.freedesktop.org/show_bug.cgi?id=98276
      
      Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Cc: stable@vger.kernel.org
      757124d9
    • Chris Wilson's avatar
      drm/i915: Limit Valleyview and earlier to only using mappable scanout · 54905ab5
      Chris Wilson authored
      
      
      Valleyview appears to be limited to only scanning out from the first 512MiB
      of the Global GTT. Lets presume that this behaviour was inherited from the
      display block copied from g4x (not Ironlake) and all earlier generations
      are similarly affected, though testing suggests different symptoms. For
      simplicity, impose that these platforms must scanout from the mappable
      region. (For extra simplicity, use HAS_GMCH_DISPLAY even though this
      catches Cherryview which does not appear to be limited to the low
      aperture for its scanout.)
      
      v2: Use HAS_GMCH_DISPLAY() to more clearly convey my intent about
      limiting this workaround to the old style of display engine.
      
      v3: Update changelog to reflect testing by Ville Syrjälä
      v4: Include the changes to the comments as well
      
      Reported-by: default avatarLuis Botello <luis.botello.ortega@intel.com>
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98036
      Fixes: 2efb813d
      
       ("drm/i915: Fallback to using unmappable memory for scanout")
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Akash Goel <akash.goel@intel.com>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.9-rc1+
      Link: http://patchwork.freedesktop.org/patch/msgid/20161107110128.28762-1-chris@chris-wilson.co.uk
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      (cherry picked from commit 767a222e
      
      )
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      54905ab5
    • Chris Wilson's avatar
      drm/i915: Round tile chunks up for constructing partial VMAs · c4b8c570
      Chris Wilson authored
      
      
      When we split a large object up into chunks for GTT faulting (because we
      can't fit the whole object into the aperture) we have to align our cuts
      with the fence registers. Each partial VMA must cover a complete set of
      tile rows or the offset into each partial VMA is not aligned with the
      whole image. Currently we enforce a minimum size on each partial VMA,
      but this minimum size itself was not aligned to the tile row causing
      distortion.
      
      Reported-by: default avatarAndreas Reis <andreas.reis@gmail.com>
      Reported-by: default avatarChris Clayton <chris2553@googlemail.com>
      Reported-by: default avatarNorbert Preining <preining@logic.at>
      Tested-by: default avatarNorbert Preining <preining@logic.at>
      Tested-by: default avatarChris Clayton <chris2553@googlemail.com>
      Fixes: 03af84fe ("drm/i915: Choose partial chunksize based on tile row size")
      Fixes: a61007a8
      
       ("drm/i915: Fix partial GGTT faulting") # enabling patch
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98402
      Testcase: igt/gem_mmap_gtt/medium-copy-odd
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.9-rc1+
      Link: http://patchwork.freedesktop.org/patch/msgid/20161107105443.27855-1-chris@chris-wilson.co.uk
      Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
      (cherry picked from commit 0ef723cb
      
      )
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      c4b8c570
    • Dhinakaran Pandiyan's avatar
      drm/i915/dp: Extend BDW DP audio workaround to GEN9 platforms · 61e0c543
      Dhinakaran Pandiyan authored
      
      
      According to BSpec, cdclk for BDW has to be not less than 432 MHz with DP
      audio enabled, port width x4, and link rate HBR2 (5.4 GHz). With cdclk less
      than 432 MHz, enabling audio leads to pipe FIFO underruns and displays
      cycling on/off.
      
      Let's apply this work around to GEN9 platforms too, as it fixes the same
      issue.
      
      v2: Move drm_device to drm_i915_private conversion
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97907
      Cc: stable@vger.kernel.org
      Cc: Libin Yang <libin.yang@linux.intel.com>
      Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1478117601-19122-1-git-send-email-dhinakaran.pandiyan@intel.com
      (cherry picked from commit 9c754024
      
      )
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      61e0c543
    • Dhinakaran Pandiyan's avatar
      drm/i915/dp: BDW cdclk fix for DP audio · fbb21c52
      Dhinakaran Pandiyan authored
      
      
      According to BSpec, cdclk for BDW has to be not less than 432 MHz with DP
      audio enabled, port width x4, and link rate HBR2 (5.4 GHz). With cdclk less
      than 432 MHz, enabling audio leads to pipe FIFO underruns and displays
      cycling on/off.
      
      From BSpec:
      "Display» BDW-SKL» dpr» [Register] DP_TP_CTL [BDW+,EXCLUDE(CHV)]
      Workaround : Do not use DisplayPort with CDCLK less than 432 MHz, audio
      enabled, port width x4, and link rate HBR2 (5.4 GHz), or else there may
      be audio corruption or screen corruption."
      
      Since, some DP configurations (e.g., MST) use port width x4 and HBR2
      link rate, let's increase the cdclk to >= 432 MHz to enable audio for those
      cases.
      
      v4: Changed commit message
      v3: Combine BDW pixel rate adjustments into a function (Jani)
      v2: Restrict fix to BDW
          Retain the set cdclk across modesets (Ville)
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1478026080-2925-1-git-send-email-dhinakaran.pandiyan@intel.com
      
      (cherry picked from commit b30ce9e0
      
      )
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      fbb21c52
    • Lyude's avatar
      drm/i915/vlv: Prevent enabling hpd polling in late suspend · cdffe3e2
      Lyude authored
      One of the CI machines began to run into issues with the hpd poller
      suddenly waking up in the midst of the late suspend phase. It looks like
      this is getting caused by the fact we now deinitialize power wells in
      late suspend, which means that intel_hpd_poll_init() gets called in late
      suspend causing polling to get re-enabled. So, when deinitializing power
      wells on valleyview we now refrain from enabling polling in the midst of
      suspend.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98040
      Fixes: 19625e85
      
       ("drm/i915: Enable polling when we don't have hpd")
      Signed-off-by: default avatarLyude <lyude@redhat.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Jani Saarinen <jani.saarinen@intel.com>
      Cc: Petry Latvala <petri.latvala@intel.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1477499769-1966-1-git-send-email-lyude@redhat.com
      (cherry picked from commit b64b5409
      
      )
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      cdffe3e2
    • Ville Syrjälä's avatar
      drm/i915: Respect alternate_ddc_pin for all DDI ports · 8d83bc22
      Ville Syrjälä authored
      
      
      The VBT provides the platform a way to mix and match the DDI ports vs.
      GMBUS pins. Currently we only trust the VBT for DDI E, which I suppose
      has no standard GMBUS pin assignment. However, there are machines out
      there that use a non-standard mapping for the other ports as well.
      Let's start trusting the VBT on this one for all ports on DDI platforms.
      
      I've structured the code such that other platforms could easily start
      using this as well, by simply filling in the ddi_port_info. IIRC there
      may be CHV system that might actually need this.
      
      v2: Include a commit message, include a debug message during init
      
      Cc: stable@vger.kernel.org
      Cc: Maarten Maathuis <madman2003@gmail.com>
      Tested-by: default avatarMaarten Maathuis <madman2003@gmail.com>
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97877
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1476208368-5710-3-git-send-email-ville.syrjala@linux.intel.com
      Reviewed-by: default avatarJim Bride <jim.bride@linux.intel.com>
      (cherry picked from commit e4ab73a1
      
      )
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      8d83bc22
  7. Nov 07, 2016
  8. Nov 06, 2016
    • Linus Torvalds's avatar
      Linux 4.9-rc4 · bc33b0ca
      Linus Torvalds authored
      bc33b0ca
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · bd060ac0
      Linus Torvalds authored
      Pull i2c fix from Wolfram Sang:
       "A bugfix for the I2C core fixing a (rare) race condition"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: core: fix NULL pointer dereference under race condition
      bd060ac0
    • Linus Torvalds's avatar
      Merge branches 'sched-urgent-for-linus' and 'core-urgent-for-linus' of... · ffbcbfca
      Linus Torvalds authored
      Merge branches 'sched-urgent-for-linus' and 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull stack vmap fixups from Thomas Gleixner:
       "Two small patches related to sched_show_task():
      
         - make sure to hold a reference on the task stack while accessing it
      
         - remove the thread_saved_pc printout
      
        .. and add a sanity check into release_task_stack() to catch problems
        with task stack references"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/core: Remove pointless printout in sched_show_task()
        sched/core: Fix oops in sched_show_task()
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        fork: Add task stack refcounting sanity check and prevent premature task stack freeing
      ffbcbfca
    • Linus Torvalds's avatar
      Merge tag 'md/4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · 6c286e81
      Linus Torvalds authored
      Pull MD fixes from Shaohua Li:
       "There are several bug fixes queued:
      
         - fix raid5-cache recovery bugs
      
         - fix discard IO error handling for raid1/10
      
         - fix array sync writes bogus position to superblock
      
         - fix IO error handling for raid array with external metadata"
      
      * tag 'md/4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
        md: be careful not lot leak internal curr_resync value into metadata. -- (all)
        raid1: handle read error also in readonly mode
        raid5-cache: correct condition for empty metadata write
        md: report 'write_pending' state when array in sync
        md/raid5: write an empty meta-block when creating log super-block
        md/raid5: initialize next_checkpoint field before use
        RAID10: ignore discard error
        RAID1: ignore discard error
      6c286e81
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · e12d8d51
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "Two more important data integrity fixes related to RAID device drivers
        which wrongly throw away the SYNCHRONIZE CACHE command in the non-RAID
        path and a memory leak in the scsi_debug driver"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: arcmsr: Send SYNCHRONIZE_CACHE command to firmware
        scsi: scsi_debug: Fix memory leak if LBP enabled and module is unloaded
        scsi: megaraid_sas: Fix data integrity failure for JBOD (passthrough) devices
      e12d8d51
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f29b909d
      Linus Torvalds authored
      Pull input subsystem updates from Dmitry Torokhov.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: psmouse - cleanup Focaltech code
        Input: i8042 - add XMG C504 to keyboard reset table
      f29b909d