1. 03 12月, 2014 34 次提交
  2. 02 12月, 2014 6 次提交
    • T
      drm/i915: Don't pin LRC in GGTT when dumping in debugfs · 064ca1d2
      Thomas Daniel 提交于
      LRC object does not need to be mapped into the GGTT when dumping. A side-effect
      of this patch is that a compiler warning goes away (not checking return value
      of i915_gem_obj_ggtt_pin).
      
      v2: Broke out individual context dumping into a new function as the indentation
      was getting a bit crazy.  Added notification of contexts with no gem object for
      debugging purposes.  Removed unnecessary pin_pages and unpin_pages, replaced
      with explicit get_pages for the context object as there may be no backing store
      allocated at this time (Comment for get_pages says "Ensure that the associated
      pages are gathered from the backing storage and pinned into our object").
      Improved error checking - get_pages and get_page are checked for failure.
      Signed-off-by: NThomas Daniel <thomas.daniel@intel.com>
      [danvet: Align paramter continuation lines properly. Also add some
      braces to the nested loops again for readability.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      064ca1d2
    • D
      Merge branch 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next · 1a92b7a2
      Dave Airlie 提交于
      - Tegra K1 voltage support, and coherency improvements
      - GM204 support (modesetting, still waiting on NVIDIA for signed fw to
      proceed further), and a lot of bios/i2c/devinit adjustments needed to
      support it
      - GT21x memory reclocking work
      - Various other bits and pieces, most of which are prep-work for a
      couple of bigger projects I didn't get finished in time
      
      * 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (73 commits)
        drm/nv50/kms: drop requirement that framebuffer bos be contig up-front
        drm/nv50/kms: directly use cursor image from userspace buffer
        drm/nouveau/kms: when pinning display-related buffers, force contig vram
        drm/nouveau: teach nouveau_bo_pin() how to force a contig vram allocation
        drm/nouveau/volt: add support for GK20A
        drm/nouveau/platform: add GPU speedo information to nouveau platform
        drm/nouveau/volt: allow non-bios voltage scaling
        drm/gf100-/gr: return non-fatal error code when fw not present
        drm/nouveau/devinit: bump priv ring timeouts before executing scripts
        drm/nouveau/bios: translate ramcfg strap through M0203
        drm/nouveau/fb: make use of M0203 routines for ram type determination
        drm/nouveau/bios: add parsing of BIT M(v2) +0x03 table
        drm/nouveau/core: allow vbios parsing without knowing chipset type
        drm/nouveau/lib: add null backend
        drm/nouveau/device: store revision
        drm/nouveau/core: add some forgotten subdevs to disable mask
        drm/gk20a/clk: fix max VCO value
        drm/nouveau: we need pin_refcnt for nouveau_bo_placement_set()
        drm/nv50-/kms: add some evo tracing ability for debugging
        drm/nv50/kms: use sclass() instead of trial-and-error
        ...
      1a92b7a2
    • B
      drm/nv50/kms: drop requirement that framebuffer bos be contig up-front · 9f6d2ce3
      Ben Skeggs 提交于
      We'll move them at pin() time if necessary.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      9f6d2ce3
    • B
      drm/nv50/kms: directly use cursor image from userspace buffer · 5a560252
      Ben Skeggs 提交于
      Preparation for transition to planes, which use framebuffers for the
      cursor image.  We've always done copies from the userspace buffer up
      until now for legacy reasons, there's no good reason to do so on the
      chipsets this code covers.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      5a560252
    • B
    • B
      drm/nouveau: teach nouveau_bo_pin() how to force a contig vram allocation · ad76b3f7
      Ben Skeggs 提交于
      We have the ability to move buffers around in the kernel if necessary,
      and should probably use it rather than failing if userspace passes us
      a non-contig buffer for a plane.
      
      The NOUVEAU_GEM_TILE_NONCONTIG flag from userspace will become a mere
      initial placement hint once all the relevant paths have been updated.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      ad76b3f7