1. 23 3月, 2014 26 次提交
  2. 22 3月, 2014 3 次提交
    • D
      drm/helper: lock all around force mode restore · 3ea87855
      Dave Airlie 提交于
      Since Daniel documented things with a sledge hammer, we got lots of
      nice backtraces in suspend/resume operations, I've check the callers
      of this and they all seems safe to me,
      
      This fixes one set of warns I reported.
      Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      3ea87855
    • D
      drm/fb-helper: improve drm_fb_helper_initial_config locking · 53f1904b
      Daniel Vetter 提交于
      The locking in drm_fb_helper_initial_config is a bit troublesome for a
      few reasons:
      
      - We can't just wrap the entire function up into modeset locks since
        the fbdev registration might call down into fbcon code, which then
        through our ->set_par implementation needs to be able to grab all
        modeset locks. So we'd have a neat deadlock.
      
      - This implies though that all current callers don't hold any modeset
        locks by necessity, so we have free reign to grab any modeset locks
        we need to grab.
      
      - The private state of the fbdev helper doesn't need any protection
        through locks, since once we have the fbdev registered it is mostly
        invariant or protected through the modeset locking in ->set_par and
        other callbacks. We can fully rely on driver having non-racy setup
        sequences here. For the initial config computation we actually may
        not grab locks since drivers which provide their own magic sauce
        (like i915) might need to grab locks themselves.
      
      - We should grab locks though when we probe outputs. Currently there's
        not much risk, but already now userspace could start poking at sysfs
        files and so probe concurrently. I expect that in the future driver
        init will be much more async, and since probing is really
        time-consuming this is a prime candidate.
      
      - We must not hold any crtc->mutex locks while calling probe functions
        since those might need to lock a crtc for e.g. load detection. i915
        is such a driver.
      
      Also it's the probing calls which hit upon piles of new locking
      asserts I've recently added in
      
      commit 62ff94a5
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Thu Jan 23 22:18:47 2014 +0100
      
          drm/crtc-helper: remove LOCKING from kerneldoc
      
      and
      
      commit 63951385
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Thu Jan 23 15:14:15 2014 +0100
      
          drm/doc: Repleace LOCKING kerneldoc sections in drm_modes.c
      
      Hence the right fix is to grab the mode_config mutex, but only that
      and only right around the probe calls.
      
      It seems to be sufficient to shut up all the locking WARNINGs I see on
      i915 and nouveau in drm_fb_helper_initial_config.
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Tested-by: NThierry Reding <treding@nvidia.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      53f1904b
    • D
      drm/crtc-helper: fix locking for drm_helper_disable_unused_functions · b182cc59
      Daniel Vetter 提交于
      We have two calling contexts for thise function:
      
      - In the crtc helper code itself as part of the ->set_config
        implementation. In this calling context all modeset locks are
        already held, as they should.
      
      - In drivers not implementing fastboot before the fbdev/fbcon setup
        and initialization. This has been added for all drivers in
      
        commit 76a39dbf
        Author: Daniel Vetter <daniel.vetter@ffwll.ch>
        Date:   Sun Jan 20 23:12:54 2013 +0100
      
            drm/fb-helper: don't disable everything in initial_config
      
        In this calling context we do not hold any modeset locks since the
        immediately following call to initialize the fbev emulation grabs
        all these locks themselves.
      
      - There are two exceptions to the above rule: shmob doesn't have fbdev
        emulation support. I've manually checked the callchain up to the
        driver load function and no kms locks are held.
      
      The right fix therefore is to split this helper into an internal and
      external version and add the required locking to the function exported
      to drivers.
      
      This remedies locking inconsistencies exposed by me adding locking
      WARNs as part of the recent kerneldoc abi polishing done in
      
      commit 62ff94a5
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Thu Jan 23 22:18:47 2014 +0100
      
          drm/crtc-helper: remove LOCKING from kerneldoc
      
      and
      
      commit 63951385
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Thu Jan 23 15:14:15 2014 +0100
      
          drm/doc: Repleace LOCKING kerneldoc sections in drm_modes.c
      
      v2: It helps when I actually git add the entire thing.
      
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: NChris Wilson <chris@chris-wilson.co.uk>
      Tested-by: NThierry Reding <treding@nvidia.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      b182cc59
  3. 21 3月, 2014 1 次提交
    • D
      Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next · 55004938
      Dave Airlie 提交于
      Summary of what's included:
      
      - SGX MMU support
      - SGX IRQ handling (Page faults and blitter fences)
      - Minor Cedarview and Poulsbo unification
      - Work queue for ASLE interrupt work
      - Various cleanups, style fixes and removal of dead code
      
      * 'gma500-next' of git://github.com/patjak/drm-gma500:
        drm/gma500: remove stub .open/postclose
        drm/gma500: Code cleanup - inline documentation
        drm/gma500: Code cleanup - style fixes
        drm/gma500: Code cleanup - removal of centralized exiting of function
        drm/gma500/cdv: Cedarview display cleanups
        drm/gma500: Unify encoder mode fixup
        drm/gma500: Unify _get_core_freq for cdv and psb
        drm/gma500: Move asle interrupt work into a work task
        drm/gma500: Remove dead code
        drm/gma500: Add backing type and base align to psb_gem_create()
        drm/gma500: Remove unused ioctls
        drm/gma500: Always trap MMU page faults
        drm/gma500: Hook up the MMU
        drm/gma500: Add first piece of blitter code
        drm/gma500: Give MMU code it's own header file
        drm/gma500: Add support for SGX interrupts
        drm/gma500: Make SGX MMU driver actually do something
      55004938
  4. 20 3月, 2014 1 次提交
  5. 18 3月, 2014 9 次提交
    • D
      Merge branch 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel into drm-next · 5a08c075
      Dave Airlie 提交于
      Merge straggling core drm patches.
      
      * 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel:
        drm: Fix use-after-free in the shadow-attache exit code
        drm/fb-helper: Do the 'max_conn_count' zero check
        drm: Check if the allocation has succeeded before dereferencing newmode
        drm/fb-helper: Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par()
        drm/edid: request HDMI underscan by default
      5a08c075
    • J
      drm/cma: remove to make sg_table when gem cma is created · 7550e366
      Joonyoung Shim 提交于
      The sg_table made when gem cma is created isn't used anywhere. The sgt
      of struct drm_gem_cma_object will have only sg_tabel imported.
      Signed-off-by: NJoonyoung Shim <jy0922.shim@samsung.com>
      Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      7550e366
    • D
      Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next · d1583c99
      Dave Airlie 提交于
      This is the 3rd respin of the drm-anon patches. They allow module unloading, use
      the pin_fs_* helpers recommended by Al and are rebased on top of drm-next. Note
      that there are minor conflicts with the "drm-minor" branch.
      
      * 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
        drm: init TTM dev_mapping in ttm_bo_device_init()
        drm: use anon-inode instead of relying on cdevs
        drm: add pseudo filesystem for shared inodes
      d1583c99
    • D
      Merge tag 'v3.14-rc7' into drm-next · bcc298bc
      Dave Airlie 提交于
      Linux 3.14-rc7
      
      Backmerge to help out Intel guys.
      bcc298bc
    • D
      Merge branch 'drm-docs' of ssh://people.freedesktop.org/~danvet/drm into drm-next · 978c6050
      Dave Airlie 提交于
      Here's my drm documentation update and driver api polish pull request.
      Alex reviewed the entire pile, I've applied a little bit of spelling
      polish in a few places since then and otherwise the Usual Suspects (David,
      Rob, ...) don't seem up to have another look at it (I've poked them on
      irc). So I think it's as good as it gets ;-)
      
      Note that I've dropped the final imx breaker patch since that's blocked on
      imx getting sane. Once that's landed I'll ping you to pick up that
      straggler.
      
      * 'drm-docs' of ssh://people.freedesktop.org/~danvet/drm: (34 commits)
        drm/imx: remove drm_mode_connector_detach_encoder harder
        drm: kerneldoc polish for drm_crtc.c
        drm: kerneldoc polish for drm_crtc_helper.c
        drm: drop error code for drm_helper_resume_force_mode
        drm/crtc-helper: remove LOCKING from kerneldoc
        drm: remove return value from drm_helper_mode_fill_fb_struct
        drm/doc: Fix misplaced </para>
        drm: remove drm_display_mode->private_size
        drm: polish function kerneldoc for drm_modes.[hc]
        drm/modes: drop maxPitch from drm_mode_validate_size
        drm/modes: drop return value from drm_display_mode_from_videomode
        drm/modes: remove drm_mode_height/width
        drm: extract drm_modes.h for drm_crtc.h functions
        drm: move drm_mode related functions into drm_modes.c
        drm/doc: Repleace LOCKING kerneldoc sections in drm_modes.c
        drm/doc: Integrate drm_modes.c kerneldoc
        drm/kms: rip out drm_mode_connector_detach_encoder
        drm/doc: Add function reference documentation for drm_mm.c
        drm/doc: Overview documentation for drm_mm.c
        drm/mm: Remove MM_UNUSED_TARGET
        ...
      978c6050
    • D
      Merge branch 'drm-intel-next' of git://git.freedesktop.org/git/drm-intel into drm-next · 8ad2bc97
      Dave Airlie 提交于
      - fine-grained display power domains for byt (Imre)
      - runtime pm prep patches for !hsw from Paulo
      - WiZ hashing flag updates from Ville
      - ppgtt setup cleanup and enabling of full 4G range on bdw (Ben)
      - fixes from Jesse for the inherited intial config code
      - gpu reset code improvements from Mika
      - per-pipe num_planes refactoring from Damien
      - stability fixes around bdw forcewake handling and other bdw w/a from Mika
        Ken
      - and as usual a pile of smaller fixes all over
      
      * 'drm-intel-next' of git://git.freedesktop.org/git/drm-intel: (107 commits)
        drm/i915: Go OCD on the Makefile
        drm/i915: Implement command buffer parsing logic
        drm/i915: Refactor shmem pread setup
        drm/i915: Avoid div by zero when pixel clock is large
        drm/i915: power domains: add vlv power wells
        drm/i915: factor out intel_set_cpu_fifo_underrun_reporting_nolock
        drm/i915: vlv: factor out valleyview_display_irq_install
        drm/i915: sanity check power well sw state against hw state
        drm/i915: factor out reset_vblank_counter
        drm/i915: sanitize PUNIT register macro definitions
        drm/i915: vlv: keep first level vblank IRQs masked
        drm/i915: check pipe power domain when reading its hw state
        drm/i915: check port power domain when reading the encoder hw state
        drm/i915: get port power domain in connector detect handlers
        drm/i915: add port power domains
        drm/i915: add noop power well handlers instead of NULL checking them
        drm/i915: split power well 'set' handler to separate enable/disable/sync_hw
        drm/i915: add init power domain to always-on power wells
        drm/i915: move power domain macros to intel_pm.c
        drm/i915: Disable full ppgtt by default
        ...
      8ad2bc97
    • D
      Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next · e19b9137
      Daniel Vetter 提交于
      Conflicts:
      	drivers/gpu/drm/i915/Makefile
      
      Makefile cleanup in drm-intel-next conflicts with a build-fix to move
      intel_opregion under CONFIG_ACPI.
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      e19b9137
    • D
      drm/gma500: remove stub .open/postclose · 75144097
      David Herrmann 提交于
      These are unused and can safely be dropped. DRM core verifies they're
      non-NULL before it calls them.
      
      Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
      Signed-off-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: NPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
      75144097
    • A
      drm/gma500: Code cleanup - inline documentation · 9083eb38
      Arthur Borsboom 提交于
      Improve readability by adding/changing inline documentation
      Signed-off-by: NArthur Borsboom <arthurborsboom@gmail.com>
      Signed-off-by: NPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
      9083eb38