1. 12 6月, 2015 11 次提交
    • N
      drm/msm: drop redundant output in debug message · a7c07690
      Nicholas Mc Guire 提交于
      wait_for_completion_timeout returns 0 in case of timeout so printing the
      return value here will always yield 0 and is therefor redundant - dropped.
      Signed-off-by: NNicholas Mc Guire <hofrat@osadl.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      a7c07690
    • N
      drm/msm: fix HZ dependency of timeout · 84c3b87b
      Nicholas Mc Guire 提交于
      The timeout is passed as a constant which makes it HZ dependent because
      jiffies are expected so it should be converted to jiffies. The actual
      value is not clear from the code - my best guess is that this should be
      300 milliseconds given that other timeouts are in milliseconds based on
      looking at other drm drivers (e.g. exynos_drm_dsi.c:356 300ms,
      tegra/dpaux.c:188 250ms) - this needs to be confirmed by someone who
      knows the details of the driver.
      Signed-off-by: NNicholas Mc Guire <hofrat@osadl.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      84c3b87b
    • N
      drm/msm: fixup wait_for_completion_timeout handling · 9f68ef90
      Nicholas Mc Guire 提交于
      wait_for_completion_timeout return >= 0 but never negative so the check
      logic looks inconsistent. Further the return value of
      wait_for_completion_timeout was being passed up the call chain but the
      x call sites as drm_dp_i2c_do_msg()/drm_dp_dpcd_access() check for < 0
      thus timeout was being treated as success case.
      
      <snip> drivers/gpu/drm/drm_dp_helper.c:drm_dp_i2c_do_msg()
                      mutex_lock(&aux->hw_mutex);
                      ret = aux->transfer(aux, msg);
                      mutex_unlock(&aux->hw_mutex);
                      if (ret < 0) {
      <snip>
      logic in edp_aux_transfer() seems incorrect as it could return 0 (timeout)
      but checks of <= 0 to indicate error so the return probably should be
      -ETIMEDOUT in case wait_for_completion_timeout returns 0 (timeout
      occurred).
      Signed-off-by: NNicholas Mc Guire <hofrat@osadl.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      9f68ef90
    • R
      drm/msm/mdp5: fix for crash in disable path · e5989ee1
      Rob Clark 提交于
      Seems like disable can race with complete_flip() in process of disabling
      a crtc, leading to:
      
      [   49.065364] Call trace:
      [   49.071441] [<ffffffc00041d5a0>] mdp5_ctl_blend+0x20/0x1c0
      [   49.073788] [<ffffffc00041ebcc>] mdp5_crtc_disable+0x3c/0xa8
      [   49.079348] [<ffffffc0003e7854>] disable_outputs.isra.4+0x11c/0x220
      [   49.085164] [<ffffffc0003e7afc>] drm_atomic_helper_commit_modeset_disables+0x14/0x38
      [   49.091155] [<ffffffc000425c80>] complete_commit+0x40/0xb8
      [   49.099136] [<ffffffc0004260ac>] msm_atomic_commit+0x364/0x398
      [   49.104430] [<ffffffc00040a614>] drm_atomic_commit+0x3c/0x70
      [   49.110249] [<ffffffc0003e67b8>] drm_atomic_helper_set_config+0x1b0/0x3e0
      [   49.116065] [<ffffffc0003f99bc>] drm_mode_set_config_internal+0x64/0xf8
      [   49.122746] [<ffffffc0003fa624>] drm_framebuffer_remove+0xe4/0x128
      [   49.129171] [<ffffffc0003feaf8>] drm_mode_rmfb+0xc0/0x100
      [   49.135420] [<ffffffc0003efba8>] drm_ioctl+0x258/0x4d0
      [   49.140889] [<ffffffc0001b0388>] do_vfs_ioctl+0x338/0x5d0
      [   49.145921] [<ffffffc0001b06a8>] SyS_ioctl+0x88/0xa0
      
      It makes no sense to free the ctl without disabling all stages, so lets
      just move them together to avoid the crash.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      e5989ee1
    • R
      drm/msm: workaround for missing irq on a306/8x16 · d735fdc3
      Rob Clark 提交于
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      d735fdc3
    • R
      drm/msm: adreno a306 support · de558cd2
      Rob Clark 提交于
      As found in apq8016 (used in DragonBoard 410c) and msm8916.
      
      Note that numerically a306 is actually 307 (since a305c already claimed
      306).  Nice and confusing.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      de558cd2
    • R
      drm/msm: clarify downstream bus scaling · 6490ad47
      Rob Clark 提交于
      A few spots in the driver have support for downstream android
      CONFIG_MSM_BUS_SCALING.  This is mainly to simplify backporting the
      driver for various devices which do not have sufficient upstream
      kernel support.  But the intentionally dead code seems to cause
      some confusion.  Rename the #define to make this more clear.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      6490ad47
    • R
      drm/msm/mdp4: Support NV12MT format in mdp4 · 570655b0
      Rob Clark 提交于
      Using fb modifier flag, support NV12MT format in MDP4.
      
      v2:
      - rework the modifier's description [Daniel Vetter's comment]
      - drop .set_mode_config() callback [Rob Clark's comment]
      v3:
      - change VENDOR's name and restrict usage to NV12 [pointed by Daniel]
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      570655b0
    • R
      drm/msm: update generated headers · af6cb4c1
      Rob Clark 提交于
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      af6cb4c1
    • R
      drm/msm: add missing DRIVER_ATOMIC flag · a5436e1d
      Rob Clark 提交于
      Somehow this got lost when msm atomic support was first merged.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      a5436e1d
    • R
      drm/msm/adreno: dump scratch regs and other info on hang · 26716185
      Rob Clark 提交于
      Dump a bit more info when the GPU hangs, without having hang_debug
      enabled (which dumps a *lot* of registers).  Also dump the scratch
      registers, as they are useful for determining where in the cmdstream
      the GPU hung (and they seem always safe to read when GPU has hung).
      
      Note that the freedreno gallium driver emits increasing counter values
      to SCRATCH6 (to identify tile #) and SCRATCH7 (to identify draw #), so
      these two in particular can be used to "triangulate" where in the
      cmdstream the GPU hung.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      26716185
  2. 11 6月, 2015 6 次提交
  3. 10 6月, 2015 11 次提交
  4. 09 6月, 2015 5 次提交
  5. 05 6月, 2015 7 次提交