1. 18 4月, 2014 7 次提交
    • G
      drm: bochs: drop unused struct fields · c044330b
      Gerd Hoffmann 提交于
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      c044330b
    • G
      drm: bochs: add power management support · b8ccd70f
      Gerd Hoffmann 提交于
      bochs kms driver lacks power management support, thus
      the vga display doesn't work any more after S3 resume.
      
      Fix this by adding suspend and resume functions.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      b8ccd70f
    • G
      drm: cirrus: add power management support · 2f1e8007
      Gerd Hoffmann 提交于
      cirrus kms driver lacks power management support, thus
      the vga display doesn't work any more after S3 resume.
      
      Fix this by adding suspend and resume functions.
      Also make the mode_set function unblank the screen.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      2f1e8007
    • D
      drm: Split out drm_probe_helper.c from drm_crtc_helper.c · 8d754544
      Daniel Vetter 提交于
      This is leftover stuff from my previous doc round which I kinda wanted
      to do but didn't yet due to rebase hell.
      
      The modeset helpers and the probing helpers a independent and e.g.
      i915 uses the probing stuff but has its own modeset infrastructure. It
      hence makes to split this up. While at it add a DOC: comment for the
      probing libraray.
      
      It would be rather neat to pull some of the DocBook documenting these
      two helpers into in-line DOC: comments. But unfortunately kerneldoc
      doesn't support markdown or something similar to make nice-looking
      documentation, so the current state is better.
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      8d754544
    • D
      drm/plane-helper: Don't fake-implement primary plane disabling · b6ccd7b9
      Daniel Vetter 提交于
      After thinking about this topic a bit more I've reached the conclusion
      that implementing this doesn't make sense:
      
      - The locking is all wrong: set_config(NULL) will also unlink encoders
        and connectors, but those links are protected with the mode_config
        mutex. In the ->disable_plane callback we only hold all modeset
        locks, but eventually we want to switch to just grabbing the
        per-crtc (and maybe per-plane) locks as needed, maybe based on
        ww_mutexes. Having a callback which absolutely needs all modeset
        locks is bad for this conversion.
      
        Note that the same isn't true for the provided ->update_plane since
        we've audited the crtc helpers to make sure that not encoder or
        connector links are changed.
      
      - There's no way to re-enable the plane with an ->update_plane: The
        connectors/encoder links are lost and so we can't re-enable the
        CRTC. Even without that issue the driver might have reassigned some
        shared resources (as opposed to e.g. DPMS off, where drivers are not
        allowed to do that to make sure the CRTC can be enabled again).
      
      - The semantics don't make much sense: Userspace asked to scan out
        black (or some other color if the driver supports a background
        color), not that the screen be disabled.
      
      - Implementing proper primary plane support (i.e. actually disabling
        the primary plane without disabling the CRTC) is really simple, at
        least if all the hw needs is flipping a bit. The big task is
        auditing all the interactions with other ioctls when the CRTC is on
        but there's no primary plane (e.g. pageflips). And some of that work
        still needs to be done.
      
      Cc: Matt Roper <matthew.d.roper@intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: NMatt Roper <matthew.d.roper@intel.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      b6ccd7b9
    • D
      drm/ast: fix value check in cbr_scan2 · a82049b1
      Dave Airlie 提交于
      this is a typo vs the ums driver, fix to check correct value.
      
      Found initially by Coverity.
      Reported-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      a82049b1
    • S
      drm/nouveau/bios: fix a bit shift error introduced by 457e77b2 · 9a118439
      Sergei Antonov 提交于
      Commit 457e77b2 added two checks applied to a
      value received from nv_rd32(bios, 0x619f04). But after this new piece of code
      is executed, the addr local variable does not hold the same value it used to
      hold before the commit. Here is what is was assigned in the original code:
      	(u64)(nv_rd32(bios, 0x619f04) & 0xffffff00) << 8
      in the committed code it ends up with this value:
      	(u64)(nv_rd32(bios, 0x619f04) >> 8) << 8
      These expressions are obviously not equivalent.
      
      My Nvidia video card does not show anything on the display when I boot a
      kernel containing this commit.
      
      The patch fixes the code so that the new checks are still done, but the
      side effect of an incorrect addr value is gone.
      
      Cc: Ben Skeggs <bskeggs@redhat.com>
      Cc: Dave Airlie <airlied@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NSergei Antonov <saproj@gmail.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      9a118439
  2. 17 4月, 2014 12 次提交
  3. 16 4月, 2014 1 次提交
    • S
      gpu: host1x: handle the correct # of syncpt regs · 22bbd5d9
      Stephen Warren 提交于
      BIT_WORD() truncates rather than rounds, so the loops in
      syncpt_thresh_isr() and _host1x_intr_disable_all_syncpt_intrs() use <=
      rather than < in an attempt to process the correct number of registers
      when rounding of the conversion of count of bits to count of words is
      necessary. However, when rounding isn't necessary because the value is
      already a multiple of the divisor (as is the case for all values of
      nb_pts the code actually sees), this causes one too many registers to
      be processed.
      
      Solve this by using and explicit DIV_ROUND_UP() call, rather than
      BIT_WORD(), and comparing with < rather than <=.
      
      Fixes: 7ede0b0b ("gpu: host1x: Add syncpoint wait and interrupts")
      Cc: <stable@vger.kernel.org> # 3.10
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-By: NTerje Bergstrom <tbergstrom@nvidia.com>
      Signed-off-by: NThierry Reding <treding@nvidia.com>
      22bbd5d9
  4. 15 4月, 2014 9 次提交
  5. 14 4月, 2014 8 次提交
    • T
      drm/omap: fix missing unref to fb's buf object · 5e19c06d
      Tomi Valkeinen 提交于
      omap_fbdev_create() takes a reference to the fb's gem object with
      omap_gem_get_paddr(). However, it never releases it with
      omap_gem_put_paddr().
      
      This patch adds the missing omap_gem_put_paddr() to omap_fbdev_free().
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      5e19c06d
    • G
      drm/omap: fix plane rotation · d4586604
      Grazvydas Ignotas 提交于
      Plane rotation with omapdrm is currently broken.
      It seems omap_plane_mode_set() expects width and height in screen
      coordinates, so pass it like that.
      Signed-off-by: NGrazvydas Ignotas <notasas@gmail.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      d4586604
    • T
      drm/omap: fix enabling/disabling of video pipeline · 506096a1
      Tomi Valkeinen 提交于
      At the moment the omap_crtc_pre_apply() handles the enabling, disabling
      and configuring of encoders and panels separately from the CRTC (i.e.
      the overlay manager).
      
      However, this doesn't work correctly. The encoder driver has to be in
      control of its video input (i.e. the crtc) for correct operation.
      
      This problem causes bugs with (at least) HDMI: the HDMI encoder supplies
      pixel clock for DISPC, and DISPC supplies video stream for HDMI. The
      current code first enables the HDMI encoder, and CRTC after that.
      However, the encoder expects the video stream to start during the
      encoder's enable, and if it doesn't, there will be sync lost errors.
      
      The encoder enables its video source by calling src->enable(), and this
      call goes to omapdrm (omap_crtc_enable), but omapdrm doesn't do anything
      in that function. Similarly for disable, which goes to
      omap_crtc_disable().
      
      This patch moves the code to setup and enable/disable the crtc to
      omap_crtc_enable. and omap_crtc_disable().
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      506096a1
    • T
      drm/omap: fix missing disable for unused encoder · c7aef12f
      Tomi Valkeinen 提交于
      When an encoder is no longer connected to a crtc, the driver will leave
      the encoder enabled.
      
      This patch adds code to track the encoder used for a crtc, and when the
      encoder changes, the old one is disabled.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      c7aef12f
    • T
      drm/omap: fix race issue when unloading omapdrm · e2f8fd74
      Tomi Valkeinen 提交于
      At module unload, omap_fbdev_free() gets called which releases the
      framebuffers. However, the framebuffers are still used by crtcs, and
      will be released only later at vsync. The driver doesn't wait for this,
      and goes on to release the rest of the resources, which often
      causes a crash.
      
      This patchs adds a omap_crtc_flush() function which waits until the crtc
      has finished with its apply queue and page flips.
      
      The function utilizes a simple polling while-loop, as the performance is
      not an issue here.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      e2f8fd74
    • T
      drm/omap: fix DMM driver (un)registration · ea7e3a66
      Tomi Valkeinen 提交于
      At the moment the DMM driver is never unregistered, even if it's
      registered in the omapdrm module's init function. This means we'll get
      errors when reloading the omapdrm module.
      
      Fix this by unregistering the DMM driver properly, and also change the
      module init to fail if DMM driver cannot be registered, simplifying the
      unregister path as we don't need to keep the state whether we registered
      the DMM driver or not.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      ea7e3a66
    • T
      drm/omap: fix uninit order in pdev_remove() · 707cf58a
      Tomi Valkeinen 提交于
      When unloading omapdrm driver, the omapdrm platform device is
      uninitialized last, after the displays have been disconnected omap_crtc
      callbacks have been removed. As the omapdrm pdev uninitialization needs
      the features uninitialized in earlier steps, a crash is guaranteed.
      
      This patch fixes the uninitialize order so that the omapdrm pdev is
      removed first.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      707cf58a
    • T
      drm/omap: fix output enable/disable sequence · 2ec8e378
      Tomi Valkeinen 提交于
      At the moment it's quite easy to get the following errors when the HDMI
      output is enabled or disabled:
      
      [drm:omap_crtc_error_irq] *ERROR* tv: errors: 00008000
      
      The reason for the errors is that the omapdrm driver doesn't properly
      handle the sync-lost irqs that happen when enabling the DIGIT crtc,
      which is used for HDMI and analog TV. The driver does disable the
      sync-lost irq properly, but it fails to wait until the output has been
      fully enabled (i.e. the first vsync), so the sync-lost errors are still
      seen occasionally.
      
      This patch makes the omapdrm act the same way as the omapfb does:
      
      - When enabling a display, we'll wait for the first vsync.
      - When disabling a display, we'll wait for framedone if available, or
        odd and even vsyncs.
      
      These changes make sure the output is fully enabled or disabled at the
      end of the function.
      Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
      Reported-by: NSanjay Singh Rawat <sanjay.rawat@linaro.org>
      Reviewed-by: NRob Clark <robdclark@gmail.com>
      2ec8e378
  6. 13 4月, 2014 2 次提交
    • M
      sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue · fd1232b2
      Mikulas Patocka 提交于
      This patch fixes I/O errors with the sym53c8xx_2 driver when the disk
      returns QUEUE FULL status.
      
      When the controller encounters an error (including QUEUE FULL or BUSY
      status), it aborts all not yet submitted requests in the function
      sym_dequeue_from_squeue.
      
      This function aborts them with DID_SOFT_ERROR.
      
      If the disk has full tag queue, the request that caused the overflow is
      aborted with QUEUE FULL status (and the scsi midlayer properly retries
      it until it is accepted by the disk), but the sym53c8xx_2 driver aborts
      the following requests with DID_SOFT_ERROR --- for them, the midlayer
      does just a few retries and then signals the error up to sd.
      
      The result is that disk returning QUEUE FULL causes request failures.
      
      The error was reproduced on 53c895 with COMPAQ BD03685A24 disk
      (rebranded ST336607LC) with command queue 48 or 64 tags.  The disk has
      64 tags, but under some access patterns it return QUEUE FULL when there
      are less than 64 pending tags.  The SCSI specification allows returning
      QUEUE FULL anytime and it is up to the host to retry.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Cc: Matthew Wilcox <matthew@wil.cx>
      Cc: James Bottomley <JBottomley@Parallels.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fd1232b2
    • V
      drivers: net: xen-netfront: fix array initialization bug · 810d8ced
      Vincenzo Maffione 提交于
      This patch fixes the initialization of an array used in the TX
      datapath that was mistakenly initialized together with the
      RX datapath arrays. An out of range array access could happen
      when RX and TX rings had different sizes.
      Signed-off-by: NVincenzo Maffione <v.maffione@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      810d8ced
  7. 12 4月, 2014 1 次提交