1. 25 8月, 2017 2 次提交
    • D
      Merge tag 'omapdrm-4.14-fixes' of... · 72d45a76
      Dave Airlie 提交于
      Merge tag 'omapdrm-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
      
      omapdrm fixes for 4.14
      
      * fix compilation when compiling omapfb driver
      * WA for OMAP3 endless sync lost issue
      * WA for OMAP5 DSI PLL issue
      * fix analog TV out modecheck
      
      * tag 'omapdrm-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        ARM: OMAP2+: fix missing variable declaration
        drm/omap: work-around for omap3 display enable
        drm/omap: fix i886 work-around
        drm/omap: fix analog tv-out modecheck
      72d45a76
    • D
      Merge tag 'drm-msm-next-2017-08-22' of git://people.freedesktop.org/~robclark/linux into drm-next · cfcfb65a
      Dave Airlie 提交于
      Updates for 4.14..  I have some further patches from Jordan to add
      multiple priority levels and pre-emption, but those will probably be
      for 4.15 to give me time for the mesa parts.
      
      * tag 'drm-msm-next-2017-08-22' of git://people.freedesktop.org/~robclark/linux:
        drm/msm/mdp5: mark runtime_pm functions as __maybe_unused
        drm/msm: remove unused variable
        drm/msm/mdp5: make helper function static
        drm/msm: make msm_framebuffer_init() static
        drm/msm: add helper to allocate stolen fb
        drm/msm: don't track fbdev's gem object separately
        drm/msm: add modeset module param
        drm/msm/mdp5: add tracking for clk enable-count
        drm/msm: remove unused define
        drm/msm: Add a helper function for in-kernel buffer allocations
        drm/msm: Attach the GPU MMU when it is created
        drm/msm: Add A5XX hardware fault detection
        drm/msm: Remove uneeded platform dev members
        drm/msm/mdp5: Set up runtime PM for MDSS
        drm/msm/mdp5: Write to SMP registers even if allocations don't change
        drm/msm/mdp5: Don't use mode_set helper funcs for encoders and CRTCs
        drm/msm/dsi: Implement RPM suspend/resume callbacks
        drm/msm/dsi: Set up runtime PM for DSI
        drm/msm/hdmi: Set up runtime PM for HDMI
        drm/msm/mdp5: Use runtime PM get/put API instead of toggling clocks
      cfcfb65a
  2. 24 8月, 2017 1 次提交
  3. 23 8月, 2017 15 次提交
    • T
      drm/omap: work-around for omap3 display enable · fc5cc967
      Tomi Valkeinen 提交于
      Seems that on omap3 enabling a crtc without any planes causes a sync
      lost flood. This only happens on the first enable, and after that it
      works. This looks like an HW issue and it's unclear why this is
      happening or how to fix it.
      
      This started happening after 897145d0
      ("drm/omapdrm: Move commit_modeset_enables() before commit_planes()")
      which, as a work-around, changed omapdrm first to do the modeset enable,
      and plane set only after that. This WA should be fine on all DSS
      versions, but apparently OMAP3 DSS is an exception.
      
      This patch reverts that work-around for OMAP3 DSS.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      fc5cc967
    • T
      drm/omap: fix i886 work-around · 0c43f1e0
      Tomi Valkeinen 提交于
      7d267f06 ("drm/omap: work-around for
      errata i886") changed how the PLL dividers and multipliers are
      calculated. While the new way should work fine for all the PLLs, it
      breaks omap5 PLLs. The issues seen are rather odd: seemed that the
      output clock rate is half of what we asked. It is unclear what's causing
      there issues.
      
      As a work-around this patch adds a "errata_i886" flag, which is set only
      for DRA7's PLLs, and the PLL setup is done according to that flag.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Tested-by: NH. Nikolaus Schaller <hns@goldelico.com>
      0c43f1e0
    • T
      drm/omap: fix analog tv-out modecheck · beea6214
      Tomi Valkeinen 提交于
      omapdrm rejects all venc (analog tv-out) videomodes, due to somewhat
      strict checking of the values, making tv-out unusable.
      
      We only support two videomodes, one for PAL and one for NTSC, so instead
      of trying to check every field in the videomode struct, this patch makes
      the driver check only the pixel clock and the size of the display.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      beea6214
    • D
      Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-next · 7c0059dd
      Dave Airlie 提交于
      Not a lot that's ready to be included this round for Nouveau.  GP108
      modesetting support, and misc other fixes.
      
      * 'linux-4.14' of git://github.com/skeggsb/linux:
        drm/nouveau/kms/nv50: perform null check on msto[i] rathern than msto
        drm/nouveau/pci/msi: disable MSI on big-endian platforms by default
        drm/nouveau: silence suspend/resume debugging messages
        drm/nouveau/kms/nv04-nv4x: fix exposed format list
        drm/nouveau/kms/nv10-nv40: add NV21 support to overlay
        drm/nouveau/kms/nv04-nv40: improve overlay error detection, fix pitch setting
        drm/nouveau/kms/nv04-nv40: prevent undisplayable framebuffers from creation
        drm/nouveau/mpeg: print more debug info when rejecting dma objects
        drm/nouveau/fb/gf100-: zero mmu debug buffers
        drm/nouveau/bar/gf100: add config option to limit BAR2 to 16MiB
        initial support (display-only) for GP108
        drm/nouveau/falcon: use a more reasonable msgqueue timeout value
        drm/nouveau/disp: Silence DCB warnings.
        drm/nouveau/bios: Demote missing fp table message to NV_DEBUG.
        drm/nouveau/pmu/gt215-: abstract detection of whether reset is needed
        drm/nouveau/pmu/gt215: fix reset
        drm/nouveau/mc/gf100: add pmu to reset mask
        drm/nouveau/disp/gf119-: avoid creating non-existent heads
        drm/nouveau/therm/gm200: Added
        drm/nouveau/therm: fix spelling mistake on array thresolds
      7c0059dd
    • A
      drm/msm/mdp5: mark runtime_pm functions as __maybe_unused · d1f08d82
      Arnd Bergmann 提交于
      When CONFIG_PM is disabled, we get harmless warnings about unused
      functions:
      
      drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c:1025:12: error: 'mdp5_runtime_resume' defined but not used [-Werror=unused-function]
       static int mdp5_runtime_resume(struct device *dev)
                  ^~~~~~~~~~~~~~~~~~~
      drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c:1015:12: error: 'mdp5_runtime_suspend' defined but not used [-Werror=unused-function]
       static int mdp5_runtime_suspend(struct device *dev)
                  ^~~~~~~~~~~~~~~~~~~~
      
      This marks both functions as __maybe_unused so the compiler
      can drop them silently.
      
      Fixes: d68fe15b ("drm/msm/mdp5: Use runtime PM get/put API instead of toggling clocks")
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      d1f08d82
    • A
      drm/msm: remove unused variable · 6e05899d
      Arnd Bergmann 提交于
      A cleanup left behind an unused variable that we have to remove
      in order to avoid this harmless warning:
      
      drivers/gpu/drm/msm/adreno/a5xx_gpu.c: In function 'a5xx_zap_shader_init':
      drivers/gpu/drm/msm/adreno/a5xx_gpu.c:493:19: error: unused variable 'a5xx_gpu' [-Werror=unused-variable]
      
      Fixes: 8d6f0827 ("drm/msm: Remove uneeded platform dev members")
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      6e05899d
    • R
      drm/msm/mdp5: make helper function static · 5c3ddb85
      Rob Clark 提交于
      Not needed outside of mdp5_crtc.c.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      5c3ddb85
    • R
      drm/msm: make msm_framebuffer_init() static · 6c0693b1
      Rob Clark 提交于
      Only needed in msm_fb.c so don't export it.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      6c0693b1
    • R
      drm/msm: add helper to allocate stolen fb · 466e5606
      Rob Clark 提交于
      We'll later want to re-use this for state-readback when bootloader
      enables display, so that we can create an fb for the initial
      plane->state->fb.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      466e5606
    • R
      drm/msm: don't track fbdev's gem object separately · 38958bab
      Rob Clark 提交于
      The drm_framebuffer is refcnt'd these days and will unref the underlying
      bo as needed.  So we can simplify a little.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      38958bab
    • R
      drm/msm: add modeset module param · ba4dd718
      Rob Clark 提交于
      At least for debugging it is nice to have an easy way to force the
      driver not to load.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      ba4dd718
    • R
      drm/msm/mdp5: add tracking for clk enable-count · a7d3bb00
      Rob Clark 提交于
      Accessing registers for an unclocked block is an insta-reboot on
      snapdragon devices.  So add a bit of logic to track the enable_count so
      we can WARN_ON() unclocked register writes.  This makes it much easier
      to track down mistakes.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      a7d3bb00
    • R
      drm/msm: remove unused define · a0ce4d23
      Rob Clark 提交于
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      a0ce4d23
    • J
      drm/msm: Add a helper function for in-kernel buffer allocations · 8223286d
      Jordan Crouse 提交于
      Nearly all of the buffer allocations for kernel allocate an buffer object,
      virtual address and GPU iova at the same time. Make a helper function to
      handle the details.
      Signed-off-by: NJordan Crouse <jcrouse@codeaurora.org>
      [dropped msm_fbdev conversion to new helper, since it interferes with
      display-handover work, where we want to separate allocation and mapping]
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      8223286d
    • J
      drm/msm: Attach the GPU MMU when it is created · 1267a4df
      Jordan Crouse 提交于
      Currently the GPU MMU is attached in the adreno_gpu code but as
      more and more of the GPU initialization moves to the generic
      GPU path we have a need to map and use GPU memory earlier and
      earlier.  There isn't any reason to defer attaching the MMU
      until later so attach it right after the address space is
      created so it can be used immediately.
      Signed-off-by: NJordan Crouse <jcrouse@codeaurora.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      1267a4df
  4. 22 8月, 2017 22 次提交