1. 03 11月, 2015 32 次提交
  2. 30 10月, 2015 3 次提交
    • D
      Merge tag 'topic/drm-misc-2015-10-22' of git://anongit.freedesktop.org/drm-intel into drm-next · a76edb8c
      Dave Airlie 提交于
      Few more drm-misc stragglers for 4.4. Big thing is the generic probe for
      imx/rockchip/armada (but the variant for msm/rpi/exynos is still missing).
      
      Also the hdmi clocking fixes from Ville which was a lot of confusion about
      which tree it should be applied to ;-)
      
      * tag 'topic/drm-misc-2015-10-22' of git://anongit.freedesktop.org/drm-intel:
        drm: correctly check failed allocation
        vga_switcheroo: Constify vga_switcheroo_handler
        drm/armada: Convert the probe function to the generic drm_of_component_probe()
        drm/rockchip: Convert the probe function to the generic drm_of_component_probe()
        drm/imx: Convert the probe function to the generic drm_of_component_probe()
        drm: Introduce generic probe function for component based masters.
        drm/edid: Round to closest when computing the CEA/HDMI alternate clock
        drm/edid: Fix up clock for CEA/HDMI modes specified via detailed timings
      a76edb8c
    • D
      Merge branch 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-next · f1a04d82
      Dave Airlie 提交于
      More amdgpu and radeon stuff for drm-next.  Stoney support is the big change.
      The rest is just bug fixes and code cleanups.  The Stoney stuff is pretty
      low impact with respect to existing chips.
      
      * 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu: change VM size default to 64GB
        drm/amdgpu: add Stoney pci ids
        drm/amdgpu: update the core VI support for Stoney
        drm/amdgpu: add VCE support for Stoney (v2)
        drm/amdgpu: add UVD support for Stoney
        drm/amdgpu: add GFX support for Stoney (v2)
        drm/amdgpu: add SDMA support for Stoney (v2)
        drm/amdgpu: add DCE support for Stoney
        drm/amdgpu: Update SMC/DPM for Stoney
        drm/amdgpu: add GMC support for Stoney
        drm/amdgpu: add Stoney chip family
        drm/amdgpu: fix the broken vm->mutex V2
        drm/amdgpu: remove the unnecessary parameter adev for amdgpu_fence_wait_any()
        drm/amdgpu: remove the exclusive lock
        drm/amdgpu: remove old lockup detection infrastructure
        drm: fix trivial typos
        drm/amdgpu/dce: simplify suspend/resume
        drm/amdgpu/gfx8: set TC_WB_ACTION_EN in RELEASE_MEM packet
        drm/radeon: Use rdev->gem.mutex to protect hyperz/cmask owners
      f1a04d82
    • D
      Merge tag 'drm-intel-next-fixes-2015-10-22' of... · 974e59ba
      Dave Airlie 提交于
      Merge tag 'drm-intel-next-fixes-2015-10-22' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      Bunch of -fixes for 4.4. Well not just, I've left the mmio/register work
      from Ville in here since it's low-risk but lots of churn all over.
      
      * tag 'drm-intel-next-fixes-2015-10-22' of git://anongit.freedesktop.org/drm-intel: (23 commits)
        drm/i915: Use round to closest when computing the CEA 1.001 pixel clocks
        drm/i915: Kill the leftover RMW from ivb_sprite_disable()
        drm/i915: restore ggtt double-bind avoidance
        drm/i915/skl: Enable pipe gamma for sprite planes.
        drm/i915/skl+: Enable pipe CSC on cursor planes. (v2)
        MAINTAINERS: add link to the Intel Graphics for Linux web site
        drm/i915: Move skl/bxt gt specific workarounds to ring init
        drm/i915: Drop i915_gem_obj_is_pinned() from set-cache-level
        drm/i915: revert a few more watermark commits
        drm/i915: Remove dev_priv argument from NEEDS_FORCE_WAKE
        drm/i915: Clean up LVDS register handling
        drm/i915: Throw out some useless variables
        drm/i915: Parametrize and fix SWF registers
        drm/i915: s/PIPE_FRMCOUNT_GM45/PIPE_FRMCOUNT_G4X/ etc.
        drm/i915: Turn GEN5_ASSERT_IIR_IS_ZERO() into a function
        drm/i915: Fix a few bad hex numbers in register defines
        drm/i915: Protect register macro arguments
        drm/i915: Include gpio_mmio_base in GMBUS reg defines
        drm/i915: Parametrize HSW video DIP data registers
        drm/i915: Eliminate weird parameter inversion from BXT PPS registers
        ...
      974e59ba
  3. 23 10月, 2015 5 次提交
    • D
      Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next · d7e1bc3f
      Dave Airlie 提交于
      A bit smaller pull this time.  Few minor things, plus initial support
      for msm8996 (snapdragon 820)..  Sorry, a bit latish, was hoping to get
      some 8960/8064 DSI stuff included.  But still waiting on the v2 of the
      patchset (just pending some minor review comments).  It would be nice
      to get the DSI patches merged since it would help some folks trying to
      get upstream kernel running on n4/n7 and xperia z and wanting to write
      some more panel drivers.  Also, waiting for OCMEM driver to get merged
      via other trees and then I have a small bit to go along with that to
      make the gpu actually work on devices w/ OCMEM (snapdragon 800, 805,
      etc).  So maybe a second later pull req, time permitting.
      
      * 'msm-next' of git://people.freedesktop.org/~robclark/linux:
        drm/msm: Remove local fbdev emulation Kconfig option
        drm/msm/mdp5: Basic support for MDP5 v1.7 (MSM8996)
        drm/msm/mdp: Add Software Pixel Extension support
        drm/msm/mdp5: Use the newly introduced enum mdp_component_type
        drm/msm/hdmi: Add basic HDMI support for msm8996
        drm/msm/mdp5: Avoid printing error messages for optional clocks
        drm/msm: Fix IOMMU clean up path in case msm_iommu_new() fails
        drm/msm/mdp5: remove the cfg pointer from SMP struct
        drm/msm/dsi: Updata LNn_CFG4 register settings for 28nm PHY
        drm: msm: dsi: Don't attempt changing voltage of switches
        drm/msm: update generated headers
      d7e1bc3f
    • A
      drm/msm: Remove local fbdev emulation Kconfig option · a9ee34b7
      Archit Taneja 提交于
      DRM_MSM_FBDEV config is used to enable/disable fbdev emulation for the
      msm kms driver.
      
      Replace this with the top level DRM_FBDEV_EMULATION config option where
      applicable. This also prevents build breaks caused by undefined
      drm_fb_helper_* functions when legacy fbdev support was disabled.
      Signed-off-by: NArchit Taneja <architt@codeaurora.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      a9ee34b7
    • S
      drm/msm/mdp5: Basic support for MDP5 v1.7 (MSM8996) · d879eb5a
      Stephane Viau 提交于
      This change adds the basic MDP5 support for MSM8996.
      Signed-off-by: NStephane Viau <sviau@codeaurora.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      d879eb5a
    • S
      drm/msm/mdp: Add Software Pixel Extension support · 8e2930c6
      Stephane Viau 提交于
      In order to produce an image, the scalar needs to be fed extra
      pixels. These top/bottom/left/right values depend on a various of
      factors, including resolution, scaling type, phase step and
      initial phase.
      
      Pixel Extension are programmed by hardware in most targets - and
      can be overwritten by software. For some targets (e.g.: msm8996),
      software *must* program those registers.
      
      In order to ease this computation, let's always use bilinear
      filters, which are easier to program from kernel. Eventually,
      all of these values will come down from user space for better
      quality.
      Signed-off-by: NStephane Viau <sviau@codeaurora.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      8e2930c6
    • S
      drm/msm/mdp5: Use the newly introduced enum mdp_component_type · 95651cd9
      Stephane Viau 提交于
      When calculating phase steps, let's use the same enum
      mdp_component_type in order to ease the readability; 0/1 indexes
      are a bit confusing and we now have explicit values to index
      this type of arrays.
      Signed-off-by: NStephane Viau <sviau@codeaurora.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      95651cd9