1. 18 Apr, 2014 10 commits
    • Gerd Hoffmann's avatar
      drm: bochs: drop unused struct fields · c044330b
      Gerd Hoffmann authored
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      c044330b
    • Gerd Hoffmann's avatar
      drm: bochs: add power management support · b8ccd70f
      Gerd Hoffmann authored
      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: default avatarGerd Hoffmann <kraxel@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b8ccd70f
    • Gerd Hoffmann's avatar
      drm: cirrus: add power management support · 2f1e8007
      Gerd Hoffmann authored
      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: default avatarGerd Hoffmann <kraxel@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      2f1e8007
    • Daniel Vetter's avatar
      drm: Split out drm_probe_helper.c from drm_crtc_helper.c · 8d754544
      Daniel Vetter authored
      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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      8d754544
    • Daniel Vetter's avatar
      drm/plane-helper: Don't fake-implement primary plane disabling · b6ccd7b9
      Daniel Vetter authored
      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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b6ccd7b9
    • Dave Airlie's avatar
      drm/ast: fix value check in cbr_scan2 · a82049b1
      Dave Airlie authored
      this is a typo vs the ums driver, fix to check correct value.
      
      Found initially by Coverity.
      Reported-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      a82049b1
    • Sergei Antonov's avatar
      drm/nouveau/bios: fix a bit shift error introduced by 457e77b2 · 9a118439
      Sergei Antonov authored
      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: default avatarSergei Antonov <saproj@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      9a118439
    • Dave Airlie's avatar
      Merge tag 'omapdrm-fixes-3.15' of... · d62c3e7a
      Dave Airlie authored
      Merge tag 'omapdrm-fixes-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next
      
      Fixes for omapdrm, some of which were already present in 3.14, and some which
      appeared in 3.15-rc1:
      
      - fixes for primary-plane handling which caused crashes
      - fix all kinds of uninit issues which prevented from unloading the omapdrm
        module.
      - fixes for HDMI enable/disable issues
      
      * tag 'omapdrm-fixes-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        drm/omap: fix the handling of fb ref counts
        drm/omap: protect omap_crtc's event with event_lock spinlock
        drm/omap: Use old_fb to synchronize between successive page flips
        drm/omap: Fix crash when using LCD3 overlay manager
        drm/omap: gem sync: wait on correct events
        drm/omap: Fix memory leak in omap_gem_op_async
        drm/omap: remove warn from debugfs
        drm/omap: remove extra plane->destroy from crtc destroy
        drm/omap: print warning when rotating non-TILER fb
        drm/omap: fix missing unref to fb's buf object
        drm/omap: fix plane rotation
        drm/omap: fix enabling/disabling of video pipeline
        drm/omap: fix missing disable for unused encoder
        drm/omap: fix race issue when unloading omapdrm
        drm/omap: fix DMM driver (un)registration
        drm/omap: fix uninit order in pdev_remove()
        drm/omap: fix output enable/disable sequence
      d62c3e7a
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-next · 90e48970
      Dave Airlie authored
      1. Fixing PLL regressions
      2. A couple of memory reclocking and DPM fixes
      3. Small cleanups
      
      * 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux:
        drm/radeon/ci: make sure mc ucode is loaded before checking the size
        drm/radeon/si: make sure mc ucode is loaded before checking the size
        drm/radeon: improve PLL params if we don't match exactly v2
        drm/radeon: memory leak on bo reservation failure. v2
        drm/radeon: fix VCE fence command
        drm/radeon: re-enable mclk dpm on R7 260X asics
        drm/radeon: add support for newer mc ucode on CI (v2)
        drm/radeon: add support for newer mc ucode on SI (v2)
        drm/radeon: apply more strict limits for PLL params v2
        drm/radeon: update CI DPM powertune settings
        drm/radeon: fix runpm handling on APUs (v4)
        drm/radeon: disable mclk dpm on R7 260X
      90e48970
    • Dave Airlie's avatar
      Merge tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/tegra/linux into drm-next · 95c7d351
      Dave Airlie authored
      drm/tegra: Fixes for v3.15-rc2
      
      This contains a fix for the host1x driver writing to non-existent syncpt
      registers.
      
      A second commit removes an excess pad field in the parameter structure
      for the DRM_TEGRA_SUBMIT IOCTL. Archeaology on earlier versions of this
      file indicates that this was once there to pad an uneven number of u32
      u32 fields, of which one was subsequently removed. Unfortunately nobody
      remembered to get rid of the padding when that happened.
      
      Both of these commits are Cc: stable because they fix issues that were
      introduced back in v3.10.
      
      * tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/tegra/linux:
        drm/tegra: Remove gratuitous pad field
        gpu: host1x: handle the correct # of syncpt regs
      95c7d351
  2. 17 Apr, 2014 12 commits
  3. 16 Apr, 2014 3 commits
    • Thierry Reding's avatar
      drm/tegra: Remove gratuitous pad field · cbfbbabb
      Thierry Reding authored
      The version of the drm_tegra_submit structure that was merged all the
      way back in 3.10 contains a pad field that was originally intended to
      properly pad the following __u64 field. Unfortunately it seems like a
      different field was dropped during review that caused this padding to
      become unnecessary, but the pad field wasn't removed at that time.
      
      One possible side-effect of this is that since the __u64 following the
      pad is now no longer properly aligned, the compiler may (or may not)
      introduce padding itself, which results in no predictable ABI.
      
      Rectify this by removing the pad field so that all fields are again
      naturally aligned. Technically this is breaking existing userspace ABI,
      but given that there aren't any (released) userspace drivers that make
      use of this yet, the fallout should be minimal.
      
      Fixes: d43f81cb ("drm/tegra: Add gr2d device")
      Cc: <stable@vger.kernel.org> # 3.10
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      cbfbbabb
    • Stephen Warren's avatar
      gpu: host1x: handle the correct # of syncpt regs · 22bbd5d9
      Stephen Warren authored
      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: default avatarStephen Warren <swarren@nvidia.com>
      Acked-By: default avatarTerje Bergstrom <tbergstrom@nvidia.com>
      Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
      22bbd5d9
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2014-04-11' of git://anongit.freedesktop.org/drm-intel into drm-next · 5df5242d
      Dave Airlie authored
      Some fixes from Intel.
      
      * tag 'drm-intel-fixes-2014-04-11' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Always use kref tracking for all contexts.
        drm/i915: do not setup backlight if not available according to VBT
        drm/i915: check VBT for supported backlight type
        drm/i915: Disable self-refresh for untiled fbs on i915gm
        drm/mm: Don't WARN if drm_mm_reserve_node
      5df5242d
  4. 15 Apr, 2014 9 commits
  5. 14 Apr, 2014 6 commits