1. 16 10月, 2015 17 次提交
  2. 07 10月, 2015 1 次提交
  3. 06 10月, 2015 1 次提交
    • T
      drm/irq: Use unsigned int pipe in public API · 88e72717
      Thierry Reding 提交于
      This continues the pattern started in commit cc1ef118 ("drm/irq:
      Make pipe unsigned and name consistent"). This is applied to the public
      APIs and driver callbacks, so pretty much all drivers need to be updated
      to match the new prototypes.
      
      Cc: Christian König <christian.koenig@amd.com>
      Cc: Alex Deucher <alexander.deucher@amd.com>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      Cc: Inki Dae <inki.dae@samsung.com>
      Cc: Jianwei Wang <jianwei.wang.chn@gmail.com>
      Cc: Alison Wang <alison.wang@freescale.com>
      Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
      Cc: Daniel Vetter <daniel.vetter@intel.com>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: Philipp Zabel <p.zabel@pengutronix.de>
      Cc: David Airlie <airlied@linux.ie>
      Cc: Rob Clark <robdclark@gmail.com>
      Cc: Ben Skeggs <bskeggs@redhat.com>
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
      Cc: Mark Yao <mark.yao@rock-chips.com>
      Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
      Cc: Vincent Abriou <vincent.abriou@st.com>
      Cc: Thomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NThierry Reding <treding@nvidia.com>
      Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      88e72717
  4. 05 10月, 2015 2 次提交
  5. 02 10月, 2015 1 次提交
    • L
      vga_switcheroo: Add missing locking · 8f12a311
      Lukas Wunner 提交于
      The following functions iterate over the client list, invoke client
      callbacks or invoke handler callbacks without locking anything at all:
      
      - Introduced by c8e9cf7b ("vga_switcheroo: Add a helper function to
        get the client state"):
        vga_switcheroo_get_client_state()
      
      - Introduced by 0d69704a ("gpu/vga_switcheroo: add driver control
        power feature. (v3)"):
        vga_switcheroo_set_dynamic_switch()
        vga_switcheroo_runtime_suspend()
        vga_switcheroo_runtime_resume()
        vga_switcheroo_runtime_resume_hdmi_audio()
      
      Refactor vga_switcheroo_runtime_resume_hdmi_audio() a bit to be able to
      release vgasr_mutex immediately after iterating over the client list.
      Signed-off-by: NLukas Wunner <lukas@wunner.de>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      8f12a311
  6. 01 10月, 2015 3 次提交
  7. 30 9月, 2015 8 次提交
    • D
      drm/i915: Remove setparam ioctl · c668cde5
      Daniel Vetter 提交于
      This was only used for the ums+gem combo, so ripe for removal now that
      we only have kms code left.
      
      v2: Drop fence_reg_start since it's now unused, noticed by Ville.
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Acked-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      c668cde5
    • D
      drm: Remove dummy agp ioctl wrappers · 0731c65a
      Daniel Vetter 提交于
      They're only used in the drm ioctl table, and there they're excluded
      when AGP support is disabled. So this is just dead code ripe for
      removal.
      Reviewed-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
      0731c65a
    • D
      drm/vmwgfx: Stop checking for DRM_UNLOCKED · 87698c8a
      Daniel Vetter 提交于
      drm core enforces now for DRIVER_MODESET that all ioctls are unlocked.
      And all the old nasty ones from drm core aren't allowed for modern
      drivers any more. Hence this is no longer needed.
      Reviewed-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
      87698c8a
    • D
      drm/drm_ioctl.c: kerneldoc · 0aaf20cf
      Daniel Vetter 提交于
      As usual pull it into the drm docbook template, too. And again as
      usual I've decided to only document stuff exported to drivers, so all
      the old leftover markup from the shared drm repo days lost the magic
      ** signature.
      Reviewed-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Reviewed-by: NChristian König <christian.koenig@amd.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
      0aaf20cf
    • D
      drm: Define a drm_invalid_op ioctl implementation · 4b63539b
      Daniel Vetter 提交于
      And use it in radeon to replace all the ioctls no longer valid in kms
      mode. I plan to also use this later on when nuking the ums support for
      i915.
      
      Note that setting the function pointer in the ioctl table to NULL
      would amount to the same, but that results in some debug output from
      the drm_ioctl() function. I've figured it's cleaner to have a
      special-purpose function.
      
      Cc: Alex Deucher <alexdeucher@gmail.com>
      Reviewed-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Reviewed-by: NChristian König <christian.koenig@amd.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      4b63539b
    • D
      drm: Remove __OS_HAS_AGP · a7fb8a23
      Daniel Vetter 提交于
      We already express the drm/agp depencies correctly in Kconfig, so we
      can rip this remnant from the shared drm core days.
      
      Aside: Pretty much all the #ifdefs in radeon/nouveau could be killed
      if ttm would provide dummy functions. I'm not going to volunteer for
      that though.
      
      v2: Use IS_ENABLED(CONFIG_AGP) as suggested by Ville
      
      v3: Polish from Ville's review.
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: Christian König <christian.koenig@amd.com> (v2)
      Reviewed-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      a7fb8a23
    • D
      drm/doc: Update docs about device instance setup · 6e3f797c
      Daniel Vetter 提交于
      ->load is deprecated, bus functions are deprecated and everyone
      should use drm_dev_alloc&register.
      
      So update the .tmpl (and pull a bunch of the overview docs into the
      sourcecode to increase chances that it'll stay in sync in the future)
      and add notes to functions which are deprecated. I didn't bother to
      clean up and document the unload sequence similarly since that one is
      still a bit a mess: drm_dev_unregister does way too much,
      drm_unplug_dev does what _unregister should be doing but then has the
      complication of promising something it doesn't actually do (it doesn't
      unplug existing open fds for instance, only prevents new ones).
      
      Motivated since I don't want to hunt every new driver for usage of
      drm_platform_init any more ;-)
      
      v2: Reword the deprecation note for ->load a bit, using Laurent's
      suggestion as an example (but making the wording a bit stronger even).
      Fix spelling in commit message.
      
      v3: More spelling fixes from Laurent.
      
      Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
      Cc: David Herrmann <dh.herrmann@gmail.com>
      Acked-by: David Herrmann <dh.herrmann@gmail.com> (v2)
      Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      6e3f797c
    • D
      Merge tag 'topic/drm-misc-2015-09-25' of git://anongit.freedesktop.org/drm-intel into drm-next · 2d4df13c
      Dave Airlie 提交于
      Another attempt at drm-misc for 4.4 ...
      - better atomic helpers for runtime pm drivers
      - atomic fbdev
      - dp aux i2c STATUS_UPDATE handling (for short i2c replies from the sink)
      - bunch of constify patches
      - inital kerneldoc for vga switcheroo
      - some vblank code cleanups from Ville and Thierry
      - various polish all over
      
      * tag 'topic/drm-misc-2015-09-25' of git://anongit.freedesktop.org/drm-intel: (57 commits)
        drm/irq: Add drm_crtc_vblank_count_and_time()
        drm/irq: Rename drm_crtc -> crtc
        drm: drm_atomic_crtc_get_property should be static
        drm/gma500: Remove DP_LINK_STATUS_SIZE redefinition
        vga_switcheroo: Set active attribute to false for audio clients
        drm/core: Preserve the fb id on close.
        drm/core: Preserve the framebuffer after removing it.
        drm: Use vblank timestamps to guesstimate how many vblanks were missed
        drm: store_vblank() is never called with NULL timestamp
        drm: Clean up drm_calc_vbltimestamp_from_scanoutpos() vbl_status
        drm: Limit the number of .get_vblank_counter() retries
        drm: Pass flags to drm_update_vblank_count()
        drm/i915: Fix vblank count variable types
        drm: Kill pixeldur_ns
        drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps
        drm: Move timestamping constants into drm_vblank_crtc
        drm/fbdev: Update legacy plane->fb refcounting for atomic restore
        drm: fix kernel-doc warnings in drm_crtc.h
        vga_switcheroo: Sort headers alphabetically
        drm: Spell vga_switcheroo consistently
        ...
      2d4df13c
  8. 27 9月, 2015 7 次提交
    • L
      Linux 4.3-rc3 · 9ffecb10
      Linus Torvalds 提交于
      9ffecb10
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 162e6df4
      Linus Torvalds 提交于
      Pull x86 fixes from Thomas Gleixner:
       "Two bugfixes from Andy addressing at least some of the subtle NMI
        related wreckage which has been reported by Sasha Levin"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code
        x86/paravirt: Replace the paravirt nop with a bona fide empty function
      162e6df4
    • L
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5a6bdf06
      Linus Torvalds 提交于
      Pull irq fix from Thomass Gleixner:
       "A bugfix for the atmel aic5 irq chip driver which caches the wrong
        data and thereby breaking resume"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/atmel-aic5: Use per chip mask caches in mask/unmask()
      5a6bdf06
    • L
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · c905929a
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "Just two fixes: wire up the new system calls added during the last
        merge window, and fix another user access site"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: alignment: fix alignment handling for uaccess changes
        ARM: wire up new syscalls
      c905929a
    • L
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 685b5f1d
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Our first real batch of fixes this release cycle.  Nothing really
        concerning, and diffstat is a bit inflated due to some DT contents
        moving around on STi platforms.
      
        There's a collection of them here:
      
         - A fixup for a build breakage that hits on arm64 allmodconfig in
           QCOM SCM firmware drivers
         - MMC fixes for OMAP that had quite a bit of breakage this merge
           window.
         - Misc build/warning fixes on PXA and OMAP
         - A couple of minor fixes for Beagleboard X15 which is now starting
           to see a few more users in the wild"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
        ARM: sti: dt: adapt DT to fix probe/bind issues in DRM driver
        ARM: dts: fix omap2+ address translation for pbias
        firmware: qcom: scm: Add function stubs for ARM64
        ARM: dts: am57xx-beagle-x15: use palmas-usb for USB2
        ARM: omap2plus_defconfig: enable GPIO_PCA953X
        ARM: dts: omap5-uevm.dts: fix i2c5 pinctrl offsets
        ARM: OMAP2+: AM43XX: Enable autoidle for clks in am43xx_init_late
        ARM: dts: am57xx-beagle-x15: Update Phy supplies
        ARM: pxa: balloon3: Fix build error
        ARM: dts: Fixup model name for HP t410 dts
        ARM: dts: DRA7: fix a typo in ethernet
        ARM: omap2plus_defconfig: make PCF857x built-in
        ARM: dts: Use ti,pbias compatible string for pbias
        ARM: OMAP5: Cleanup options for SoC only build
        ARM: DRA7: Select missing options for SoC only build
        ARM: OMAP2+: board-generic: Remove stale of_irq macros
        ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
        ARM: dts: omap3-igep: Move eth IRQ pinmux to IGEPv2 common dtsi
        ARM: dts: am57xx-beagle-x15: Add wakeup irq for mcp79410
        ARM: dts: am335x-phycore-som: Fix mpu voltage
        ...
      685b5f1d
    • L
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 69ea8b85
      Linus Torvalds 提交于
      Pull CIFS fixes from Steve French:
       "Four fixes from testing at the recent SMB3 Plugfest including two
        important authentication ones (one fixes authentication problems to
        some popular servers when clock times differ more than two hours
        between systems, the other fixes Kerberos authentication for SMB3)"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        fix encryption error checks on mount
        [SMB3] Fix sec=krb5 on smb3 mounts
        cifs: use server timestamp for ntlmv2 authentication
        disabling oplocks/leases via module parm enable_oplocks broken for SMB3
      69ea8b85
    • O
      Merge tag 'pxa-fixes-v4.3' of https://github.com/rjarzmik/linux into fixes · e46fc90e
      Olof Johansson 提交于
      ARM: pxa: fixes for v4.3
      
      These fixes are mainly regression fixes triggered by irq changes,
      common clock framework introduction and sound side-effect of
      other platforms.
      
      * tag 'pxa-fixes-v4.3' of https://github.com/rjarzmik/linux:
        ARM: pxa: balloon3: Fix build error
        ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding
        ARM: pxa: fix DFI bus lockups on startup
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      e46fc90e