1. 18 12月, 2013 28 次提交
    • B
      drm/i915: Reorganize intel_enable_ppgtt · 246cbfb5
      Ben Widawsky 提交于
      This patch consolidates the way in which we handle the various supported
      PPGTT by module parameter in addition to what the hardware supports. It
      strives to make doing the right thing in the code as simple as possible,
      with the USES_ macros.
      
      I've opted to add the full PPGTT argument simply so one can see how I
      intend to use this function. It will not/cannot be used until later.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      246cbfb5
    • B
      drm/i915: Generalize PPGTT init · d6660add
      Ben Widawsky 提交于
      Rearrange the initialization code to try to special case the aliasing
      PPGTT less, and provide usable interfaces for the general case later.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      d6660add
    • B
      drm/i915: Flush TLBs after !RCS PP_DIR_BASE · 90252e5c
      Ben Widawsky 提交于
      I've found this by accident. The docs don't really come out and say you
      need to do this. What the docs do tell you is you need to flush the TLBs
      before you set the PP_DIR_BASE, and that the RCS will invalidate its
      TLBs upon setting the new PP_DIR_BASE. It makes no such comment about
      any of the other rings.
      
      Empirically, this indeed fixes a really obvious bug whereby the batches
      being sent to the blitter were not executing (we were executing the
      HSWP somehow instead).
      
      NOTE: This should make no difference with the current code. It only
      applies when we start using multiple VMs.
      
      NOTE2: HSW appears to be immune to this.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      90252e5c
    • B
      drm/i915: Use LRI for switching PP_DIR_BASE · 48a10389
      Ben Widawsky 提交于
      The docs seem to suggest this is the appropriate method (though it
      doesn't say so outright). In other words, we probably should have done
      this before. We certainly must do this for switching VMs on the fly,
      since synchronizing the rings to MMIO updates isn't acceptable.
      
      v2:
      Make the reset code actually work for all rings. Note that this was
      fixed in subsequent commits, but was indeed broken for this commit.
      
      Add a posting read to the reset case. It probably should have existed
      before hand, but since we have no failures; there is no reason to make
      it a separate commit.
      
      Make IS_GEN6 not use the ring because I am seeing crashes when using it.
      It is a bit of a hack in this patch, it will get fixed up in a couple of
      patches.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      48a10389
    • B
      drm/i915: Extract mm switching to function · eeb9488e
      Ben Widawsky 提交于
      In order to do the full context switch with address space, it's
      convenient to have a way to switch the address space. We already have
      this in our code - just pull it out to be called by the context switch
      code later.
      
      v2: Rebased on BDW support. Required adding BDW.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      eeb9488e
    • B
      drm/i915: Use platform specific ppgtt enable · b4a74e3a
      Ben Widawsky 提交于
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      b4a74e3a
    • B
      drm/i915: One hopeful eviction on PPGTT alloc · e3cc1995
      Ben Widawsky 提交于
      The patch before this changed the way in which we allocate space for the
      PPGTT PDEs. It began carving out the PPGTT PDEs (which live in the
      Global GTT) from the GGTT's drm_mm. Prior to that patch, the PDEs were
      hidden from the drm_mm, and therefore could never fail to be allocated.
      
      In unfortunate cases, the drm_mm may be full when we want to allocate
      the space. This can technically occur whenever we try to allocate, which
      happens in two places currently. Practically, it can only really ever
      happen at GPU reset.
      
      Later, when we allocate more PDEs for multiple PPGTTs this will
      potentially even more useful.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      e3cc1995
    • B
      drm/i915: Use drm_mm for PPGTT PDEs · c8d4c0d6
      Ben Widawsky 提交于
      When PPGTT support was originally enabled, it was only designed to
      support 1 PPGTT. It therefore made sense to simply hide the GGTT space
      required to enable this from the drm_mm allocator.
      
      Since we intend to support full PPGTT, which means more than 1, and they
      can be created and destroyed ad hoc it will be required to use the
      proper allocation techniques we already have.
      
      The first step here is to make the existing single PPGTT use the
      allocator.
      
      The astute observer will notice that we are reserving space in the GGTT
      for the PDEs for the lifetime of the address space, and would be right
      to question whether or not this is a good idea. It does not make a
      difference with this current patch only the aliasing PPGTT (indeed the
      PDEs should still be hidden from the shrinker). For the future, we are
      allocating from top to bottom to avoid using the precious "gtt
      space" The GGTT space at that point should only be used for scanout, HW
      contexts, ringbuffers, HWSP, PDEs, and a couple of other small buffers
      (potentially) used by the kernel. Everything else should be mapped into
      a PPGTT. To put the consumption in more tangible terms, it takes
      approximately 4 sets of PDEs to equal one 19x10 framebuffer (with no
      fancy stride or alignment constraints). 3/4 of the total [average] GGTT
      can be used for PDEs, and hopefully never touch the 1/4 that the
      framebuffer needs.
      
      The astute, and persistent observer might ask about the page tables
      which are also pinned for the address space. This waste is unfortunate.
      We use 2MB of memory per address space. We leave wrapping the PDEs as a
      real GEM object as a TODO.
      
      v2: Align PDEs to 64b in GTT
      Allocate the node dynamically so we can use drm_mm_put_block
      Now tested on IGT
      Allocate node at the top to avoid fragmentation (Chris)
      
      v3: Use Chris' top down allocator
      
      v4: Embed drm_mm_node into ppgtt struct (Jesse)
      Remove hunks which didn't belong (Jesse)
      
      v5: Don't subtract guard page since we now killed the guard page prior
      to this patch. (Ben)
      
      v6: Rebased and removed guard page stuff.
      Added a chunk to the commit message
      Allow adding a context to mappable region
      
      v7: Undo v3, so we can make the drm patch last in the series
      
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> (v4)
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      
      squash: drm/i915: allow PPGTT to use mappable
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      c8d4c0d6
    • B
      a3d67d23
    • B
      drm/i915: Generalize default context setup · a45d0f6a
      Ben Widawsky 提交于
      The plan to to make every file descriptor have a default context. To
      accommodate this, generalize out default context setup function so it
      can be used at file open time.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      a45d0f6a
    • B
      drm/i915: Split context enabling from init · 2fa48d8d
      Ben Widawsky 提交于
      We **need** to do this for exactly 1 reason, because we want to embed a
      PPGTT into the context, but we don't want to special case the default
      context.
      
      To achieve that, we must be able to initialize contexts after the GTT is
      setup (so we can allocate and pin the default context's BO), but before
      the PPGTT and rings are initialized. This is because, currently, context
      initialization requires ring usage. We don't have rings until after the
      GTT is setup. If we split the enabling part of context initialization,
      the part requiring the ringbuffer, we can untangle this, and then later
      embed the PPGTT
      
      Incidentally this allows us to also adhere to the original design of
      context init/fini in future patches: they were only ever meant to be
      called at driver load and unload.
      
      v2: Move hw_contexts_disabled test in i915_gem_context_enable() (Chris)
      
      v3: BUG_ON after checking for disabled contexts. Or else it blows up pre
      gen6 (Ben)
      
      v4: Forward port
      Modified enable for each ring, since that patch is earlier in the series
      Dropped ring arg from create_default_context so it can be used by others
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      2fa48d8d
    • B
      drm/i915: Better reset handling for contexts · acce9ffa
      Ben Widawsky 提交于
      This patch adds to changes for contexts on reset:
      Sets last context to default - this will prevent the context switch
      happening after a reset. That switch is not possible because the
      rings are hung during reset and context switch requires reset. This
      behavior will need to be reworked in the future, but this is what we
      want for now.
      
      In the future, we'll also want to reset the guilty context to
      uninitialized. We should wait for ARB_Robustness related code to land
      for that.
      
      This is somewhat for paranoia.  Because we really don't know what the
      GPU was doing when it hung, or the state it was in (mid context write,
      for example), later restoring the context is a bad idea. By setting the
      flag to not initialized, the next load of that context will not restore
      the state, and thus on the subsequent switch away from the context will
      overwrite the old data.
      
      NOTE: This code needs a fixup when we actually have multiple VMs. The
      issue that can occur is inactive objects in a VM will need to be
      destroyed before the last context unref. This can now happen via the
      fake switch introduced in this patch (and it other ways in the future)
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      acce9ffa
    • B
      drm/i915: Track which ring a context ran on · 0009e46c
      Ben Widawsky 提交于
      Previously we dropped the association of a context to a ring. It is
      however very important to know which ring a context ran on (we could
      have reused the other member, but I was nitpicky).
      
      This is very important when we switch address spaces, which unlike
      context objects, do change per ring.
      
      As an example, if we have:
      
              RCS   BCS
      ctx            A
      ctx      A
      ctx      B
      ctx            B
      
      Without tracking the last ring B ran on, we wouldn't know to switch the
      address space on BCS in the last row.
      
      As a result, we no longer need to track which ring a context "belongs"
      to, as it never really made much sense anyway.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      0009e46c
    • B
      drm/i915: Permit contexts on all rings · 67e3d297
      Ben Widawsky 提交于
      If we want to use contexts in more abstract terms (specifically with
      PPGTT in mind), we need to allow them to be specified for any ring.
      
      Since the upcoming patches will bring about the use of multiple address
      spaces, and each ring needs to have an address space programmed (which
      we intend to do at context switch time), we can no longer only use RCS.
      
      With multiple rings having a last context, we must now unreference these
      contexts.
      
      NOTE: This commit requires an update to intel-gpu-tools to make it not
      fail.
      
      v2: Rebased with some logical conflicts.
      Squashed in the context fini refcount patch
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      67e3d297
    • B
      drm/i915: Simplify ring handling in execbuf · ca01b12b
      Ben Widawsky 提交于
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      ca01b12b
    • B
      drm/i915: relax context alignment · b731d33d
      Ben Widawsky 提交于
      With the introduction of contexts per fd in the future, one can easily
      envision more contexts being used. We do not have an easy remedy to
      reduce the space requirements of the contexts, we can make things
      slightly better by using less stringent alignments on later hardware.
      
      Ville: Since I can almost predict you'll point this out. I can no longer
      find the docs which specify the 64k requirement on certain gen6 SKUs. If
      you'd like to change that too, be my guest.
      
      CC: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      b731d33d
    • B
      drm/i915: Add a context open function · e422b888
      Ben Widawsky 提交于
      We'll be doing a bit more stuff with each file, so having our own open
      function should make things clean.
      
      This also allows us to easily add conditionals for stuff we don't want
      to do when we don't have HW contexts.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      e422b888
    • B
      drm/i915: Remove vm arg from relocate entry · 3e7a0322
      Ben Widawsky 提交于
      The only place we were using it was for GEN6, which won't have PPGTT
      support anyway (ie. the VM is always the same). To clear things up,
      (it only added confusion for me since it doesn't allow us to assert
      vma->vm is what we always want, when just looking at the code).
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      3e7a0322
    • B
      drm/i915: Create bind/unbind abstraction for VMAs · 6f65e29a
      Ben Widawsky 提交于
      To sum up what goes on here, we abstract the vma binding, similarly to
      the previous object binding. This helps for distinguishing legacy
      binding, versus modern binding. To keep the code churn as minimal as
      possible, I am leaving in insert_entries(). It serves as the per
      platform pte writing basically. bind_vma and insert_entries do share a
      lot of similarities, and I did have designs to combine the two, but as
      mentioned already... too much churn in an already massive patchset.
      
      What follows are the 3 commits which existed discretely in the original
      submissions. Upon rebasing on Broadwell support, it became clear that
      separation was not good, and only made for more error prone code. Below
      are the 3 commit messages with all their history.
      
      drm/i915: Add bind/unbind object functions to VMA
      drm/i915: Use the new vm [un]bind functions
      drm/i915: reduce vm->insert_entries() usage
      
      drm/i915: Add bind/unbind object functions to VMA
      
      As we plumb the code with more VM information, it has become more
      obvious that the easiest way to deal with bind and unbind is to simply
      put the function pointers in the vm, and let those choose the correct
      way to handle the page table updates. This change allows many places in
      the code to simply be vm->bind, and not have to worry about
      distinguishing PPGTT vs GGTT.
      
      Notice that this patch has no impact on functionality. I've decided to
      save the actual change until the next patch because I think it's easier
      to review that way. I'm happy to squash the two, or let Daniel do it on
      merge.
      
      v2:
      Make ggtt handle the quirky aliasing ppgtt
      Add flags to bind object to support above
      Don't ever call bind/unbind directly for PPGTT until we have real, full
      PPGTT (use NULLs to assert this)
      Make sure we rebind the ggtt if there already is a ggtt binding.  This
      happens on set cache levels.
      Use VMA for bind/unbind (Daniel, Ben)
      
      v3: Reorganize ggtt_vma_bind to be more concise and easier to read
      (Ville). Change logic in unbind to only unbind ggtt when there is a
      global mapping, and to remove a redundant check if the aliasing ppgtt
      exists.
      
      v4: Make the bind function a bit smarter about the cache levels to avoid
      unnecessary multiple remaps. "I accept it is a wart, I think unifying
      the pin_vma / bind_vma could be unified later" (Chris)
      Removed the git notes, and put version info here. (Daniel)
      
      v5: Update the comment to not suck (Chris)
      
      v6:
      Move bind/unbind to the VMA. It makes more sense in the VMA structure
      (always has, but I was previously lazy). With this change, it will allow
      us to keep a distinct insert_entries.
      Reviewed-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      
      drm/i915: Use the new vm [un]bind functions
      
      Building on the last patch which created the new function pointers in
      the VM for bind/unbind, here we actually put those new function pointers
      to use.
      
      Split out as a separate patch to aid in review. I'm fine with squashing
      into the previous patch if people request it.
      
      v2: Updated to address the smart ggtt which can do aliasing as needed
      Make sure we bind to global gtt when mappable and fenceable. I thought
      we could get away without this initialy, but we cannot.
      
      v3: Make the global GTT binding explicitly use the ggtt VM for
      bind_vma(). While at it, use the new ggtt_vma helper (Chris)
      
      At this point the original mailing list thread diverges. ie.
      
      v4^:
      use target_obj instead of obj for gen6 relocate_entry
      vma->bind_vma() can be called safely during pin. So simply do that
      instead of the complicated conditionals.
      Don't restore PPGTT bound objects on resume path
      Bug fix in resume path for globally bound Bos
      Properly handle secure dispatch
      Rebased on vma bind/unbind conversion
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      
      drm/i915: reduce vm->insert_entries() usage
      
      FKA: drm/i915: eliminate vm->insert_entries()
      
      With bind/unbind function pointers in place, we no longer need
      insert_entries. We could, and want, to remove clear_range, however it's
      not totally easy at this point. Since it's used in a couple of place
      still that don't only deal in objects: setup, ppgtt init, and restore
      gtt mappings.
      
      v2: Don't actually remove insert_entries, just limit its usage. It will
      be useful when we introduce gen8. It will always be called from the vma
      bind/unbind.
      
      Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      6f65e29a
    • B
      drm/i915: Make pin count per VMA · d7f46fc4
      Ben Widawsky 提交于
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      d7f46fc4
    • B
      drm/i915: Identify active VM for batchbuffer capture · 685987c6
      Ben Widawsky 提交于
      Using the current state of the page directory registers, we can
      determine which of our address spaces was active when the hang occurred.
      This allows us to scan through all the address spaces to identify the
      "active" one during error capture.
      
      v2: Rebased for BDW error detection. BDW error detection is similar
      except instead of PP_DIR_BASE, we can use the PDP registers.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      [danvet: Add FIXME about global gtt misuse.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      685987c6
    • B
      drm/i915: Don't use gtt mapping for !gtt error objects · 496bfcb9
      Ben Widawsky 提交于
      The existing check was insufficient to determine whether we can use the
      GTT mapping to read out the object during error capture.
      
      The previous condition was, if the object has a GGTT mapping, and the
      reloc is in the GTT range... the can happen with opjects mapped into
      multiple vms (one of which being the GTT).
      
      There are two solutions to this problem:
      1. This patch, which avoid reading the io mapping
      2. Use the GGTT offset with the io mapping.
      
      Since error capture is about recording the most accurate possible error
      state, and the error was caused by the object not in the GGTT - I opted
      for the former.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      496bfcb9
    • B
      drm/i915: Add vm to error BO capture · a7b91078
      Ben Widawsky 提交于
      formerly: drm/i915: Create VMAs (part 6) - finish error plumbing
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      a7b91078
    • B
      drm/i915: Handle inactivating objects for all VMAs · feb822cf
      Ben Widawsky 提交于
      This came from a patch called, "drm/i915: Move active to vma"
      
      When moving an object to the inactive list, we do it for all VMs for
      which the object is bound.
      
      The primary difference from that patch is this time around we don't not
      track 'active' per vma, but rather by object. Therefore, we only need
      one unref.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      feb822cf
    • B
      drm/i915: Takedown drm_mm on failed gtt setup · c39538a8
      Ben Widawsky 提交于
      This was found by code inspection. If the GTT setup fails then we are
      left without properly tearing down the drm_mm.
      
      Hopefully this never happens.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      c39538a8
    • B
      drm/i915: Allow ggtt lookups to not WARN · 6e164c33
      Ben Widawsky 提交于
      To be able to effectively use the GGTT object lookup function, we don't
      want to warn when there is no GGTT mapping. Let the caller deal with it
      instead.
      
      Originally, I had intended to have this behavior, and has not
      introduced the WARN. It was introduced during review with the addition
      of the follow commit
      
      commit 5c2abbea
      Author: Ben Widawsky <benjamin.widawsky@intel.com>
      Date:   Tue Sep 24 09:57:57 2013 -0700
      
          drm/i915: Provide a cheap ggtt vma lookup
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      6e164c33
    • B
      drm/i915: Don't unconditionally try to deref aliasing ppgtt · 6f425321
      Ben Widawsky 提交于
      Since the beginning, the functions which try to properly reference the
      aliasing PPGTT have deferences a potentially null aliasing_ppgtt member.
      Since the accessors are meant to be global, this will not do.
      
      Introduced originally in:
      commit a70a3148
      Author: Ben Widawsky <ben@bwidawsk.net>
      Date:   Wed Jul 31 16:59:56 2013 -0700
      
          drm/i915: Make proper functions for VMs
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      6f425321
    • B
      drm/i915: Provide PDP updates via MMIO · e178f705
      Ben Widawsky 提交于
      The initial implementation of this function used MMIO to write the PDPs.
      Upon review it was determined (correctly) that the docs say to use LRI.
      The issue is there are times where we want to do a synchronous write
      (GPU reset).
      
      I've tested this, and it works. I've verified with as many people as
      possible that it should work.
      
      This should fix the failing reset problems.
      Signed-off-by: NBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      e178f705
  2. 07 12月, 2013 1 次提交
    • P
      drm/i915: change CRTC assertion on LCPLL disable · 798183c5
      Paulo Zanoni 提交于
      Currently, PC8 is enabled at modeset_global_resources, which is called
      after intel_modeset_update_state. Due to this, there's a small race
      condition on the case where we start enabling PC8, then do a modeset
      while PC8 is still being enabled. The racing condition triggers a WARN
      because intel_modeset_update_state will mark the CRTC as enabled, then
      the thread that's still enabling PC8 might look at the data structure
      and think that PC8 is being enabled while a pipe is enabled. Despite
      the WARN, this is not really a bug since we'll wait for the
      PC8-enabling thread to finish when we call modeset_global_resources.
      
      The spec says the CRTC cannot be enabled when we disable LCPLL, so we
      had a check for crtc->base.enabled. If we change to crtc->active we
      will still prevent disabling LCPLL while the CRTC is enabled, and we
      will also prevent the WARN above.
      
      This is a replacement for the previous patch named
          "drm/i915: get/put PC8 when we get/put a CRTC"
      
      Testcase: igt/pm_pc8/modeset-lpsp-stress-no-wait
      Signed-off-by: NPaulo Zanoni <paulo.r.zanoni@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      798183c5
  3. 05 12月, 2013 1 次提交
  4. 04 12月, 2013 10 次提交