1. 03 9月, 2013 1 次提交
    • M
      drm/i915: Don't mask EI UP interrupt on IVB|SNB · a9c1f90c
      Mika Kuoppala 提交于
      Submitting a batchbuffer which simulates a gpu
      hang by doing MI_BATCH_BUFFER_START into itself,
      to test hangcheck, started to hard hang the whole box
      (IVB). Bisecting lead to this commit:
      
      commit 664b422c2966cd39b8f67e8d53a566ea8c877cd6
      Author: Vinit Azad <vinit.azad@intel.com>
      Date:   Wed Aug 14 13:34:33 2013 -0700
      
          drm/i915: Only unmask required PM interrupts
      
      Experimenting with the mask register showed that
      unmasking EI UP will prevent the hard hang in IVB and SNB.
      HSW doesn't hang with EI UP masked.
      
      Considering we are just disabling interrupts that aren't even
      delivered to driver, this change is more likely to paper over some
      weirdness in gpu's internal state machine. But until better
      explanation can be found, let's trade little bit of power
      for stability on these architectures.
      
      v2: - Unmask EI_EXPIRED directly in I915_WRITE (Vinit)
      v3: - Only unmask on SNB and IVB
      
      Cc: Vinit Azad <vinit.azad@intel.com>
      Signed-off-by: NMika Kuoppala <mika.kuoppala@intel.com>
      Acked-by: NVinit Azad <vinit.azad@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      a9c1f90c
  2. 02 9月, 2013 9 次提交
    • C
      drm/radeon: support render nodes · f33bcab9
      Christian König 提交于
      Enable support for drm render nodes for radeon by flagging the ioctls that
      are safe and just needed for rendering.
      Signed-off-by: NChristian König <christian.koenig@amd.com>
      Signed-off-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      f33bcab9
    • M
      drm/nouveau: Support render nodes · 7d761258
      Martin Peres 提交于
      Enable support for drm render nodes for nouveau by flagging the ioctls that
      are safe and just needed for rendering.
      
      Cc: Ben Skeggs <bskeggs@redhat.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
      Signed-off-by: NMartin Peres <martin.peres@labri.fr>
      Signed-off-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      7d761258
    • K
      drm/i915: Support render nodes · 10ba5012
      Kristian Høgsberg 提交于
      Enable support for drm render nodes for i915 by flagging the ioctls that
      are safe and just needed for rendering.
      
      v2: mark reg_read, set_caching and get_caching (ickle, danvet)
      Signed-off-by: NKristian Høgsberg <krh@bitplanet.net>
      Signed-off-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      10ba5012
    • D
      drm: fix DRM_IOCTL_MODE_GETFB handle-leak · 101b96f3
      David Herrmann 提交于
      DRM_IOCTL_MODE_GETFB is used to retrieve information about a given
      framebuffer ID. It is a read-only helper and was thus declassified for
      unprivileged access in:
      
        commit a14b1b42
        Author: Mandeep Singh Baines <mandeep.baines@gmail.com>
        Date:   Fri Jan 20 12:11:16 2012 -0800
      
            drm: remove master fd restriction on mode setting getters
      
      However, alongside width, height and stride information,
      DRM_IOCTL_MODE_GETFB also passes back a handle to the underlying buffer of
      the framebuffer. This handle allows users to mmap() it and read or write
      into it. Obviously, this should be restricted to DRM-Master.
      
      With the current setup, *any* process with access to /dev/dri/card0 (which
      means any process with access to hardware-accelerated rendering) can
      access the current screen framebuffer and modify it ad libitum.
      
      For backwards-compatibility reasons we want to keep the
      DRM_IOCTL_MODE_GETFB call unprivileged. Besides, it provides quite useful
      information regarding screen setup. So we simply test whether the caller
      is the current DRM-Master and if not, we return 0 as handle, which is
      always invalid. A following DRM_IOCTL_GEM_CLOSE on this handle will fail
      with EINVAL, but we accept this. Users shouldn't test for errors during
      GEM_CLOSE, anyway. And it is still better as a failing MODE_GETFB call.
      
      v2: add capable(CAP_SYS_ADMIN) check for compatibility with i-g-t
      
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Reviewed-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      101b96f3
    • R
      drm/msm: convert to drm_bridge · a3376e3e
      Rob Clark 提交于
      Drop the msm_connector base class, and special calls to base class
      methods from the encoder, and use instead drm_bridge.  This allows for a
      cleaner division between the hdmi (and in future dsi) blocks, from the
      mdp block.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      a3376e3e
    • S
      drm: Add drm_bridge · 3b336ec4
      Sean Paul 提交于
      This patch adds the notion of a drm_bridge. A bridge is a chained
      device which hangs off an encoder. The drm driver using the bridge
      should provide the association between encoder and bridge. Once a
      bridge is associated with an encoder, it will participate in mode
      set, and dpms (via the enable/disable hooks).
      Signed-off-by: NSean Paul <seanpaul@chromium.org>
      Acked-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      3b336ec4
    • D
      drm/nouveau: fix up 32-bit ioctls and device wake up. · 2254f637
      Dave Airlie 提交于
      Noticed by kbuild test robot.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      2254f637
    • D
      drm/tegra: fix up page flip flags. · a5b6f74e
      Dave Airlie 提交于
      This was one level away from where I'd grepped.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      a5b6f74e
    • D
      Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-next · 9c725e5b
      Dave Airlie 提交于
      Alex writes:
      This is the radeon drm-next request.  Big changes include:
      - support for dpm on CIK parts
      - support for ASPM on CIK parts
      - support for berlin GPUs
      - major ring handling cleanup
      - remove the old 3D blit code for bo moves in favor of CP DMA or sDMA
      - lots of bug fixes
      
      [airlied: fix up a bunch of conflicts from drm_order removal]
      
      * 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux: (898 commits)
        drm/radeon/dpm: make sure dc performance level limits are valid (CI)
        drm/radeon/dpm: make sure dc performance level limits are valid (BTC-SI) (v2)
        drm/radeon: gcc fixes for extended dpm tables
        drm/radeon: gcc fixes for kb/kv dpm
        drm/radeon: gcc fixes for ci dpm
        drm/radeon: gcc fixes for si dpm
        drm/radeon: gcc fixes for ni dpm
        drm/radeon: gcc fixes for trinity dpm
        drm/radeon: gcc fixes for sumo dpm
        drm/radeonn: gcc fixes for rv7xx/eg/btc dpm
        drm/radeon: gcc fixes for rv6xx dpm
        drm/radeon: gcc fixes for radeon_atombios.c
        drm/radeon: enable UVD interrupts on CIK
        drm/radeon: fix init ordering for r600+
        drm/radeon/dpm: only need to reprogram uvd if uvd pg is enabled
        drm/radeon: check the return value of uvd_v1_0_start in uvd_v1_0_init
        drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume
        radeon kms: fix uninitialised hotplug work usage in r100_irq_process()
        drm/radeon/audio: set up the sads on DCE3.2 asics
        drm/radeon: fix handling of variable sized arrays for router objects
        ...
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_dma.c
      	drivers/gpu/drm/i915/i915_gem_dmabuf.c
      	drivers/gpu/drm/i915/intel_pm.c
      	drivers/gpu/drm/radeon/cik.c
      	drivers/gpu/drm/radeon/ni.c
      	drivers/gpu/drm/radeon/r600.c
      9c725e5b
  3. 31 8月, 2013 30 次提交