1. 17 7月, 2015 13 次提交
  2. 13 7月, 2015 1 次提交
    • L
      Revert "drm/i915: Use crtc_state->active in primary check_plane func" · 01e2d062
      Linus Torvalds 提交于
      This reverts commit dec4f799.
      
      Jörg Otte reports a NULL pointder dereference due to this commit, as
      'crtc_state' very much can be NULL:
      
              crtc_state = state->base.state ?
                      intel_atomic_get_crtc_state(state->base.state, intel_crtc) : NULL;
      
      So the change to test 'crtc_state->base.active' cannot possibly be
      correct as-is.
      
      There may be some other minimal fix (like just checking crtc_state for
      NULL), but I'm just reverting it now for the rc2 release, and people
      like Daniel Vetter who actually know this code will figure out what the
      right solution is in the longer term.
      Reported-and-bisected-by: NJörg Otte <jrg.otte@gmail.com>
      Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: Daniel Vetter <daniel.vetter@intel.com>
      CC: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      01e2d062
  3. 09 7月, 2015 17 次提交
  4. 08 7月, 2015 3 次提交
  5. 06 7月, 2015 1 次提交
  6. 04 7月, 2015 1 次提交
  7. 02 7月, 2015 4 次提交
    • F
      drm/omap: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN · 743c1671
      Fabian Frederick 提交于
      use mm.h definition
      
      Cc: David Airlie <airlied@linux.ie>
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      Cc: dri-devel@lists.freedesktop.org
      Signed-off-by: NFabian Frederick <fabf@skynet.be>
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      743c1671
    • T
      drm/omap: fix align_pitch() for 24 bits per pixel · d642d3ac
      Tomi Valkeinen 提交于
      align_pitch() uses ALIGN() to ensure the pitch is aligned to SGX's
      requirement of 8 pixels. However, ALIGN() expects the alignment value to
      be a power of two, which is not the case for 24 bits per pixels.
      
      Use roundup() instead, which works for all alignments.
      
      This fixes the error seen with 24 bits per pixel modes:
      
      "buffer pitch (2176 bytes) is not a multiple of pixel size (3 bytes)"
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      d642d3ac
    • T
      drm/omap: fix omap_gem_put_paddr() error handling · 393a949f
      Tomi Valkeinen 提交于
      If tiler_unpin() call in omap_gem_put_paddr() fails,
      omap_gem_put_paddr() will immediately stop processing and return an
      error.
      
      This patch remoes that error checking, and also removes
      omap_gem_put_paddr()'s return value, because:
      
       * The caller of omap_gem_put_paddr() can do nothing if an error
         happens, so it's pointless to return an error value
      
       * If tiler_unpin() fails, the GEM object will possibly be left in an
         undefined state, where the DMM mapping may have been removed, but the
         GEM object still thinks everything is as it should be, leading to
         crashes later.
      
       * There's no point in returning an error from a "free" call, as the
         caller can do nothing about it. So it's better to clean up as much as
         possible.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      393a949f
    • T
      drm/omap: fix omap_framebuffer_unpin() error handling · 9c368506
      Tomi Valkeinen 提交于
      omap_framebuffer_unpin() check the return value of omap_gem_put_paddr()
      and return immediately if omap_gem_put_paddr() fails.
      
      This patch removes the check for the return value, and also removes the
      return value of omap_framebuffer_unpin(), because:
      
       * Nothing checks the return value of omap_framebuffer_unpin(), and even
         something did check it, there's nothing the caller can do to handle
         the error.
      
       * If a omap_gem_put_paddr() fails, the framebuffer's other planes will
         be left unreleased. So it's better to call omap_gem_put_paddr() for
         all the planes, even if one would fail.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      9c368506