1. 18 11月, 2013 2 次提交
  2. 15 11月, 2013 2 次提交
    • D
      drm: check for !kdev in drm_unplug_minor() · a3483353
      David Herrmann 提交于
      We moved minor deallocation to drm_dev_free() in:
        commit 8f6599da
        Author: David Herrmann <dh.herrmann@gmail.com>
        Date:   Sun Oct 20 18:55:45 2013 +0200
      
            drm: delay minor destruction to drm_dev_free()
      
      However, this causes a call to drm_unplug_minor(), which should just do
      nothing as drm_dev_unregister() already called this.
      
      But a separate patch caused kdev lifetime changes:
        commit 5bdebb18
        Author: Dave Airlie <airlied@redhat.com>
        Date:   Fri Oct 11 14:07:25 2013 +1000
      
            drm/sysfs: sort out minor and connector device object lifetimes.
      
      Thus making our dev_is_registered() call useles (and even segfault if it
      is NULL). Replace it with a simple !kdev test and we're fine.
      Reported-by: NHuax Lu <huax.lu@intel.com>
      Reported-by: NDaniel Vetter <daniel@ffwll.ch>
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71208Tested-by: Nlu hua <huax.lu@intel.com>
      Reviewed-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NDavid Herrmann <dh.herrmann@gmail.com>
      Signed-off-by: NDave Airlie <airlied@gmail.com>
      a3483353
    • D
      Merge branch 'drm-nouveau-next' of... · 0846c728
      Dave Airlie 提交于
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
      
      - Page flipping fixes, with support for syncing them to vblank (finally...).
      - Misc other general fixes
      
      * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
        drm/nouveau: do not map evicted vram buffers in nouveau_bo_vma_add
        drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
        drm/nouveau/pwr: fix missing mutex unlock in a failure path
        drm/nv40/therm: fix slowing down fan when pstate undefined
        drm/nv11-: synchronise flips to vblank, unless async flip requested
        drm/nvc0-: remove nasty fifo swmthd hack for flip completion method
        drm/nv10-: we no longer need to create nvsw object on user channels
        drm/nouveau: always queue flips relative to kernel channel activity
        drm/nouveau: there is no need to reserve/fence the new fb when flipping
        drm/nouveau: when bailing out of a pushbuf ioctl, do not remove previous fence
        drm/nouveau: allow nouveau_fence_ref() to be a noop
        drm/nvc8/mc: msi rearm is via the nvc0 method
      0846c728
  3. 14 11月, 2013 16 次提交
  4. 13 11月, 2013 3 次提交
  5. 12 11月, 2013 1 次提交
  6. 11 11月, 2013 1 次提交
    • D
      Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next · cf0613d2
      Dave Airlie 提交于
      SDVO support for minnowboard
      
      * 'gma500-next' of git://github.com/patjak/drm-gma500:
        drm/gma500/mrst: Add SDVO to output init
        drm/gma500/mrst: Don't blindly guess a mode for LVDS
        drm/gma500/mrst: Setup GMBUS for oaktrail/mrst
        drm/gma500/mrst: Replace WMs and chickenbits with values from EMGD
        drm/gma500/mrst: Add aux register writes to SDVO
        drm/gma500/mrst: Properly route oaktrail hdmi hooks
        drm/gma500/mrst: Add aux register writes when programming pipe
        drm/gma500/mrst: Add SDVO clock calculation
        drm/gma500: Add aux device support for gmbus
        drm/gma500: Add support for aux pci vdc device
        drm/gma500: Add chip specific sdvo masks
        drm/gma500: Add Minnowboard to the IS_MRST() macro
      cf0613d2
  7. 10 11月, 2013 5 次提交
    • L
      drm: shmob_drm: Convert to clk_prepare/unprepare · 8d01e1ef
      Laurent Pinchart 提交于
      Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
      clk_disable_unprepare() to get ready for the migration to the common
      clock framework.
      
      Cc: David Airlie <airlied@linux.ie>
      Cc: dri-devel@lists.freedesktop.org
      Signed-off-by: NLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      8d01e1ef
    • D
      Merge tag 'bdw-stage1-2013-11-08-v2' of... · ab0169bb
      Dave Airlie 提交于
      Merge tag 'bdw-stage1-2013-11-08-v2' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
      
      So here's the Broadwell pull request. From a kernel driver pov there's
      two areas with big changes in Broadwell:
      - Completely new enumerated interrupt bits. On the plus side it now looks
        fairly unform and sane.
      - Completely new pagetable layout.
      
      To ensure minimal impact on existing platforms we've refactored both the
      irq and low-level gtt handling code a lot in anticipation of the bdw push.
      So now bdw enabling in these areas just plugs in a bunch of vfuncs.
      
      Otherwise it's all fairly harmless adjusting of switch cases and
      if-ladders to shovel bdw into the right blocks. So minimized impact on
      existing platforms. I've also merged the bdw-stage1 branch into our
      -nightly integration branch for the past week to make sure we don't break
      anything.
      
      Note that there's still quite a flurry or patches floating around, but
      I've figured I'll push this out. I plan to keep the bdw fixes separate
      from my usual -fixes stream so that you can reject them easily in case it
      still looks like too much churn. Also, bdw is for now hidden behind the
      preliminary hw enabling module option. So there's no real pressure to get
      follow-up patches all into 3.13.
      
      * tag 'bdw-stage1-2013-11-08-v2' of git://people.freedesktop.org/~danvet/drm-intel: (75 commits)
        drm/i915: Mask the vblank interrupt on bdw by default
        drm/i915: Wire up cpu fifo underrun reporting support for bdw
        drm/i915: Optimize gen8_enable|disable_vblank functions
        drm/i915: Wire up pipe CRC support for bdw
        drm/i915: Wire up PCH interrupts for bdw
        drm/i915: Wire up port A aux channel
        drm/i915: Fix up the bdw pipe interrupt enable lists
        drm/i915: Optimize pipe irq handling on bdw
        drm/i915/bdw: Take render error interrupt out of the mask
        drm/i915/bdw: Add BDW PCH check first
        drm/i915: Use hsw_crt_get_config on BDW
        drm/i915/bdw: Change dp aux timeout to 600us on DDIA
        drm/i915/bdw: Enable trickle feed on Broadwell
        drm/i915/bdw: WaSingleSubspanDispatchOnAALinesAndPoints
        drm/i915/bdw: conservative SBE VUE cache mode
        drm/i915/bdw: Limit SDE poly depth FIFO to 2
        drm/i915/bdw: Sampler power bypass disable
        ddrm/i915/bdw: Disable centroid pixel perf optimization
        drm/i915/bdw: BWGTLB clock gate disable
        drm/i915/bdw: Implement edp PSR workarounds
        ...
      ab0169bb
    • D
      Merge branch 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux into drm-next · 8d0a2215
      Dave Airlie 提交于
      A few more patches for 3.13.  The big one here is Hawaii support.
      I wanted to get that out sooner, but was sick earlier this week.  That
      said, it's mostly self contained, so it shouldn't impact other asics.
      The rest are just bug fixes and a merge fix.
      
      * 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux: (23 commits)
        Revert "drm/radeon/audio: don't set speaker allocation on DCE4+"
        drm/radeon/audio: improve ACR calculation
        drm/radeon/audio: correct ACR table
        drm/radeon: fix mismerge of drm-next with 3.12
        drm/radeon: add pci ids for hawaii
        drm/radeon: fill in radeon_asic_init for hawaii
        drm/radeon: modesetting updates for hawaii
        drm/radeon: atombios.h updates for hawaii
        drm/radeon: update cik_get_csb_buffer for hawaii
        drm/radeon: add hawaii dpm support
        drm/radeon/cik: add hawaii UVD support
        drm/radeon: update firmware loading for hawaii
        drm/radeon: update rb setup for hawaii
        drm/radeon: add golden register settings for hawaii
        drm/radeon: update cik_tiling_mode_table_init() for hawaii
        drm/radeon: minor updates to cik.c for hawaii
        drm/radeon: update cik_gpu_init() for hawaii
        drm/radeon: add Hawaii chip family
        drm/radeon: fix-up some float to fixed conversion thinkos
        drm/radeon: use HDP_MEM_COHERENCY_FLUSH_CNTL for sdma as well
        ...
      8d0a2215
    • D
      Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next · c4b3a81f
      Dave Airlie 提交于
      prime support, inactive rework, render nodes
      * 'msm-next' of git://people.freedesktop.org/~robclark/linux:
        drm/msm/mdp4: page_flip cleanups/fixes
        drm/msm: EBUSY status handling in msm_gem_fault()
        drm/msm: rework inactive-work
        drm/msm: add plane support
        drm/msm: resync generated headers
        drm/msm: support render nodes
        drm/msm: prime support
      c4b3a81f
    • D
      drm/nouveau: fix 32-bit build · 98706ea9
      Dave Airlie 提交于
      This uses the proper div macro.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      98706ea9
  8. 09 11月, 2013 10 次提交