1. 17 8月, 2015 13 次提交
    • D
      Merge tag 'drm/panel/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 6406e45c
      Dave Airlie 提交于
      drm/panel: Changes for v4.3-rc1
      
      This introduces support for a couple of new panels and also contains
      some work to restructure the directories to get more consistency, to
      deal better with more panel and bridge drivers getting added.
      
      * tag 'drm/panel/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux:
        drm/bridge: Put Kconfig entries in a separate menu
        drm/panel: Add support for LG LG4573 480x800 4.3" panel
        drm/panel: Add display timing for Okaya RS800480T-7X0GP
        of: Add Okaya Electric America vendor prefix
        drm/panel: simple: Add support for NEC NL4827HC19-05B 480x272 panel
        drm/panel: simple: Add support for AUO B080UAN01
        drm/panel: simple: Correct minimum hsync length of the HannStar HSD070PWW1 panel
        drm/panel: simple: Add bus format for HannStar HSD070PWW1 LVDS panel
        drm/bridge: Add vendor prefixes
        drm/panel: Add Samsung prefix to panel drivers
        drm/exynos: Remove PTN3460 dependency
      6406e45c
    • D
      Merge tag 'drm/tegra/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · bef2c7bd
      Dave Airlie 提交于
      drm/tegra: Changes for v4.3-rc1
      
      There are a bunch of non-critical fixes here that I've collected over
      the past few months, but the biggest part is Tegra210 support, in the
      DC, DSI and SOR/HDMI drivers.
      
      Also this finally restores DPMS with atomic mode-setting, something
      that has been broken since the conversion and which I had originally
      expected to take far less longer to fix.
      
      * tag 'drm/tegra/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux: (41 commits)
        drm/tegra: sor: Add HDMI support
        drm/tegra: sor: Add Tegra210 eDP support
        drm/tegra: dc: Implement atomic DPMS
        drm/tegra: sor: Restore DPMS
        drm/tegra: dsi: Restore DPMS
        drm/tegra: hdmi: Restore DPMS
        drm/tegra: rgb: Restore DPMS
        drm/tegra: sor: Use DRM debugfs infrastructure for CRC
        drm/tegra: sor: Write correct head state registers
        drm/tegra: sor: Constify display mode
        drm/tegra: sor: Reset the correct debugfs fields
        drm/tegra: sor: Set minor after debugfs initialization
        drm/tegra: sor: Provide error messages in probe
        drm/tegra: sor: Rename registers for consistency
        drm/tegra: dpaux: Disable interrupt when detached
        drm/tegra: dpaux: Configure pads as I2C by default
        drm/tegra: dpaux: Provide error message in probe
        drm/tegra: dsi: Add Tegra210 support
        drm/tegra: dsi: Add Tegra132 support
        drm/tegra: dsi: Add Tegra124 support
        ...
      bef2c7bd
    • D
      Merge branch 'exynos-drm-next' of... · 3ff8e509
      Dave Airlie 提交于
      Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
      Summary:
      - Clean up HDMI and MIXER parts
      - Clean up legacy structures specific to Exynos DRM
        . This patch series removes existing exyons_drm_display and
          exynos_drm_encoder structures specific to Exynos DRM, and
          makes them to replace with common drm_encoder structure.
          With cleanup patch, we removes exynos_drm_encoder module.
      - Clean up gem, dmabuf and buffer modules
        . This patch series replaces existing Exynos DRM dmabuf codes
          with common drm prime ones, and embeds all codes of exynos_drm_buf
          into exynos_drm_gem module.
          With cleanup patch, we removes exynos_drm_buf and exynos_drm_dmabuf
          modules.
      - And some fixups.
      
      * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (53 commits)
        drm/exynos: merge exynos_drm_buf.c to exynos_drm_gem.c
        drm/exynos: use prime helpers
        drm/exynos: remove function roundup_gem_size
        drm/exynos: remove function update_vm_cache_attr
        drm/exynos: remove function check_gem_flags
        drm/exynos: use ERR_PTR instead of NULL in exynos_drm_gem_init
        drm/exynos: remove unused fields of struct exynos_drm_gem_buf
        drm/exynos: stop copying sg table
        drm/exynos: remove function exynos_drm_gem_map_buf
        drm/exynos: remove mutex locking in pagefault handler
        drm/exynos: remove function convert_to_vm_err_msg
        drm/exynos: stop using sgtable in page fault handler
        drm/exynos: remove struct exynos_drm_encoder layer
        drm/exynos: fold encoder setup into exynos_drm_load()
        drm/exynos: remove exynos_drm_create_enc_conn()
        drm/exynos: remove exynos_encoder's .commit() op
        drm/exynos: remove extra call to exynos_dp_commit()
        drm/exynos: remove extra call to hdmi_commit()
        drm/exynos: remove struct exynos_drm_display
        drm/exynos: simplify calculation of possible CRTCs
        ...
      3ff8e509
    • D
      Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next · 3be66711
      Dave Airlie 提交于
      1) includes all the drm/msm side of things for upstream kernel working
      on dragonboard 410c (still some pending work on adv7533 bridge chip)
      2) initial support for msm8x94 (snapdragon 810)
      3) support for msm8x74v1 (in addition to existing v2 support)
      4) support for dma planes on mdp5 (additional planes that cannot scale/csc)
      5) more yuv format support for mdp5 (single plane vyuy/uyvy/yuyv/yvyu,
      two plane nv16/nv61, and three plane yuv420/yvu420)
      6) rotation support for mdp5
      7) initial hdcp support
      8) fixes, etc
      
      * 'msm-next' of git://people.freedesktop.org/~robclark/linux: (46 commits)
        drm/msm/dsi: Introduce DSI configuration module
        drm/msm/dsi: Make each PHY type compilation independent
        drm/msm/dsi: Split PHY drivers to separate files
        drm/msm/dsi: Return void from msm_dsi_phy_disable()
        drm/msm/dsi: Specify bitmask to set source PLL
        drm/msm/mdp: Clear pending interrupt status before enable interrupt
        drm/msm/mdp5: Add rotation (hflip/vflip) support to MDP5 planes (v2)
        drm/msm: add calls to prepare and unprepare panel
        drm/msm/dsi: Modify dsi manager bridge ops to work with external bridges
        drm/msm/dsi: Allow dsi to connect to an external bridge
        drm/msm/dsi: Create a helper to check if there is a connected device
        drm/msm/dsi: Refer to connected device as 'device' instead of 'panel'
        drm/msm/dsi: Make TE gpio optional
        drm/msm: mdp4 lvds: get panel node via of graph parsing
        drm/msm: dsi host: Use device graph parsing to parse connected panel
        drm/msm: dsi host: add missing of_node_put()
        drm/msm: Enable clocks during enable/disable_vblank() callbacks
        drm/msm/mdp5: Add support for msm8x74v1
        drm/msm/mdp5: Add DMA pipe planes for MDP5
        drm/msm/mdp: Add capabilities to MDP planes (v2)
        ...
      3be66711
    • D
      Merge tag 'drm-intel-next-fixes-2015-08-16' of... · d3638ac4
      Dave Airlie 提交于
      Merge tag 'drm-intel-next-fixes-2015-08-16' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      Bunch more fixes for 4.3, most of it skl fallout. It's not quite all yet,
      there's still a few more patches pending to enable DDI-E correctly on skl.
      Also included the dpms atomic work from Maarten since atomic is just a
      pain and not including would cause piles of conflicts right from the
      start.
      
      * tag 'drm-intel-next-fixes-2015-08-16' of git://anongit.freedesktop.org/drm-intel: (67 commits)
        drm/i915: Per-DDI I_boost override
        drm/i915/skl: WaIgnoreDDIAStrap is forever, always init DDI A
        drm/i915: fix checksum write for automated test reply
        drm/i915: Contain the WA_REG macro
        drm/i915: Remove the failed context from the fpriv->context_idr
        drm/i915: Report IOMMU enabled status for GPU hangs
        drm/i915: Check idle to active before processing CSQ
        drm/i915: Set alternate aux for DDI-E
        drm/i915: Set power domain for DDI-E
        drm/i915: fix stolen bios_reserved checks
        drm/i915: Use masked write for Context Status Buffer Pointer
        drm/i915/skl WaDisableSbeCacheDispatchPortSharing
        drm/i915: Spam less on dp aux send/receive problems
        drm/i915: Handle return value in intel_pin_and_fence_fb_obj, v2.
        drm/i915: Only update mode related state if a modeset happened.
        drm/i915: Remove connectors_active.
        drm/i915: Remove connectors_active from intel_dp.c, v2.
        drm/i915: Remove connectors_active from sanitization, v2.
        drm/i915: Get rid of dpms handling.
        drm/i915: Make crtc checking use the atomic state, v2.
        ...
      d3638ac4
    • D
      Merge tag 'v4.2-rc7' into drm-next · 4eebf60b
      Dave Airlie 提交于
      Linux 4.2-rc7
      
      Backmerge master for i915 fixes
      4eebf60b
    • L
      Linux 4.2-rc7 · 2c6625cd
      Linus Torvalds 提交于
      2c6625cd
    • L
      Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8916e0b0
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "A smallish batch of fixes, a little more than expected this late, but
        all fixes are contained to their platforms and seem reasonably low
        risk:
      
         - a somewhat large SMP fix for ux500 that still seemed warranted to
           include here
         - OMAP DT fixes for pbias regulator specification that broke due to
           some DT reshuffling
         - PCIe IRQ routing bugfix for i.MX
         - networking fixes for keystone
         - runtime PM for OMAP GPMC
         - a couple of error path bug fixes for exynos"
      
      * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: dts: keystone: Fix the mdio bindings by moving it to soc specific file
        ARM: dts: keystone: fix the clock node for mdio
        memory: omap-gpmc: Don't try to save uninitialized GPMC context
        ARM: imx6: correct i.MX6 PCIe interrupt routing
        ARM: ux500: add an SMP enablement type and move cpu nodes
        ARM: dts: dra7: Fix broken pbias device creation
        ARM: dts: OMAP5: Fix broken pbias device creation
        ARM: dts: OMAP4: Fix broken pbias device creation
        ARM: dts: omap243x: Fix broken pbias device creation
        ARM: EXYNOS: fix double of_node_put() on error path
        ARM: EXYNOS: Fix potentian kfree() of ro memory
      8916e0b0
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 0f405bf7
      Linus Torvalds 提交于
      Pull MIPS bugfix from Ralf Baechle:
       "Only a single MIPS fix - the math when invoking syscall_trace_enter
        was wrong"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Fix seccomp syscall argument for MIPS64
      0f405bf7
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 01565479
      Linus Torvalds 提交于
      Merge x86 fixes from Ingo Molnar:
       "Two followup fixes related to the previous LDT fix"
      
      Also applied a further FPU emulation fix from Andy Lutomirski to the
      branch before actually merging it.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
        x86/ldt: Further fix FPU emulation
        x86/ldt: Correct FPU emulation access to LDT
        x86/ldt: Correct LDT access in single stepping logic
      01565479
    • A
      x86/ldt: Further fix FPU emulation · 12e244f4
      Andy Lutomirski 提交于
      The previous fix confused a selector with a segment prefix.  Fix it.
      
      Compile-tested only.
      
      Cc: stable@vger.kernel.org
      Cc: Juergen Gross <jgross@suse.com>
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Fixes: 4809146b ("x86/ldt: Correct FPU emulation access to LDT")
      Signed-off-by: NAndy Lutomirski <luto@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      12e244f4
    • J
      fs/fuse: fix ioctl type confusion · 8ed1f0e2
      Jann Horn 提交于
      fuse_dev_ioctl() performed fuse_get_dev() on a user-supplied fd,
      leading to a type confusion issue. Fix it by checking file->f_op.
      Signed-off-by: NJann Horn <jann@thejh.net>
      Acked-by: NMiklos Szeredi <miklos@szeredi.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8ed1f0e2
    • O
      Merge tag 'keystone-dts-late-fixes-v2' of... · 02149517
      Olof Johansson 提交于
      Merge tag 'keystone-dts-late-fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into fixes
      
      ARM: Couple of Keysyone MDIO DTS fixes for 4.2-rc6+
      
      These are necessary to get the NIC card working on all Keystone
      EVMs. Couple of boards are broken without these two fixes.
      
      * tag 'keystone-dts-late-fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
        ARM: dts: keystone: Fix the mdio bindings by moving it to soc specific file
        ARM: dts: keystone: fix the clock node for mdio
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      02149517
  2. 16 8月, 2015 27 次提交