1. 30 1月, 2014 7 次提交
  2. 29 1月, 2014 6 次提交
    • D
      Merge tag 'drm/for-3.14-rc1-20140123' of git://anongit.freedesktop.org/tegra/linux into drm-next · 45ab1e07
      Dave Airlie 提交于
      drm/tegra: Changes for v3.14-rc1 (update)
      
      These patches fix some issues caused by the DRM panel support from the
      previous pull request and add two more panels (for the Toshiba AC100 as
      well as the Seaboard and Ventana).
      
      * tag 'drm/for-3.14-rc1-20140123' of git://anongit.freedesktop.org/tegra/linux:
        drm/tegra: Obtain head number from DT
        drm/panel: update EDID BLOB in panel_simple_get_modes()
        gpu: host1x: Remove unnecessary include
        drm/tegra: Use proper data type
        drm/tegra: Clarify how panel modes override others
        drm/tegra: Fix possible CRTC mask for RGB outputs
        drm/i915: Use drm_encoder_crtc_ok()
        drm: Move drm_encoder_crtc_ok() to core
        drm: provide a helper for the encoder possible_crtcs mask
        drm/tegra: Don't check resource with devm_ioremap_resource()
        drm/panel: Add support for Chunghwa CLAA101WA01A panel
        drm/panel: Add support for Samsung LTN101NT05 panel
      45ab1e07
    • D
      drm: ast,cirrus,mgag200: use drm_can_sleep · f4b4718b
      Dave Airlie 提交于
      these 3 were checking in_interrupt but we have situations where
      calling vunmap under this could cause a BUG to be hit in
      smp_call_function_many. Use the drm_can_sleep macro instead,
      which should stop this path from been taken in this case.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      f4b4718b
    • D
      Merge tag 'drm-intel-fixes-2014-01-28' of... · 821b4db3
      Dave Airlie 提交于
      Merge tag 'drm-intel-fixes-2014-01-28' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
      
      Pile of -fixes all over the place. Lot's of cc: stable.
      
      Only big thing is that we've dropped the preliminary hw support tag for
      bdw - it seems to work. Which also means that I'll shovel a few more bdw
      patches through -fixes, there's 5 w/a patches from Ken already on
      intel-gfx.
      
      * tag 'drm-intel-fixes-2014-01-28' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: Fix the offset issue for the stolen GEM objects
        drm/i915: Decouple GPU error reporting from ring initialisation
        i915: remove pm_qos request on error
        Revert "drm/i915: Mask reserved bits in display/sprite address registers"
        drm/i915: VLV2 - Fix hotplug detect bits
        drm/i915: Allow reading the TIMESTAMP register on Gen8.
        drm/i915: Repeat evictions whilst pageflip completions are outstanding
        drm/i915: Wait for completion of pending flips when starved of fences
        drm/i915: don't disable DP port after a failed link training
        drm/i915: don't disable the DP port if the link is lost
        drm/i915: Eliminate lots of WARNs when there's no backlight present
        drm/i915: g4x/vlv: fix dp aux interrupt mask
        drm/i915/ppgtt: Defer request freeing on reset
        i915: send D1 opregion notification
        drm/i915/bdw: remove preliminary_hw_support flag from BDW
        drm/i915: Tune down reset_stat output from ERROR to debug
        drm/i915: Make semaphore modparam RO
        drm/i915: Fix disabled semaphores
        drm/i915: Clarify relocation errnos
        drm/i915: Spelling s/auxilliary/auxiliary/
      821b4db3
    • D
      Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next · a5bd4f8a
      Dave Airlie 提交于
      Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER
      which looks like it was missed in the initial merge.  Based on 3.13.
      
      * 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits)
        DRM: armada: fix missing DRM_KMS_FB_HELPER select
      a5bd4f8a
    • D
      Merge tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next · dee13f12
      Dave Airlie 提交于
      omapdrm patches for 3.14
      
      * tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        drm/omap: Enable DT support for DMM
        drm/omap: fix: change dev_unload order
        drm/omap: fix: disable encoder before destroying it
        drm/omap: fix: disconnect devices when omapdrm module is removed
        drm/omap: fix: Defer probe if an omapdss device requests for it at connect
        drm/omap: fix (un)registering irqs inside an irq handler
      
      Conflicts:
      	drivers/gpu/drm/omapdrm/omap_drv.c
      dee13f12
    • D
      Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next · 5a0abe30
      Dave Airlie 提交于
      Only two patches this time around. One trivial and one locking fix.
      
      * 'gma500-next' of git://github.com/patjak/drm-gma500:
        drm/gma500: Lock struct_mutex around cursor updates
        drivers: gpu: Mark function as static in cdv_intel_dp.c
      5a0abe30
  3. 28 1月, 2014 4 次提交
  4. 25 1月, 2014 2 次提交
    • S
      i915: remove pm_qos request on error · 22accca0
      Stanislaw Gruszka 提交于
      Not removing pm qos request and free memory for it can cause crash,
      when some other driver use pm qos. For example, this oops:
      
      BUG: unable to handle kernel paging request at fffffffffffffff8
      IP: [<ffffffff81307a6b>] plist_add+0x5b/0xd0
      Call Trace:
       [<ffffffff810acf25>] pm_qos_update_target+0x125/0x1e0
       [<ffffffff810ad071>] pm_qos_add_request+0x91/0x100
       [<ffffffffa053ec14>] e1000_open+0xe4/0x5b0 [e1000e]
      
      was caused by earlier i915 probe failure:
      
      [drm:i915_report_and_clear_eir] *ERROR* EIR stuck: 0x00000010, masking
      [drm:init_ring_common] *ERROR* render ring initialization failed ctl 0001f001 head 00003004 tail 00000000 start 00003000
      [drm:i915_driver_load] *ERROR* failed to init modeset
      i915: probe of 0000:00:02.0 failed with error -5
      
      Bug report:
      http://bugzilla.redhat.com/show_bug.cgi?id=1057533Reported-by: NGiandomenico De Tullio <ghisha@gmail.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NStanislaw Gruszka <sgruszka@redhat.com>
      [danvet: Drop unnecessary code movement.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      22accca0
    • D
      Revert "drm/i915: Mask reserved bits in display/sprite address registers" · 85ba7b7d
      Daniel Vetter 提交于
      This reverts commit 446f2545.
      
      I've left the masking in the pageflip code since that seems to be some
      useful piece of preemptive robustness.
      
      Iirc I've merged this patch under the assumption that the BIOS leaves
      some random gunk in the lower bits and gets unhappy if we trample on
      them. We have quite a few case like this, so this made sense.
      
      Now I've just learned that there's actual hardware features bits in
      the low 12 bits, and the kernel needs to preserve them to allow a
      userspace blob to do its job. Given Dave Airlie's clear stance on
      userspace blob drivers I've quickly chatted with him and he doesn't
      seem too happy. So let's revert this.
      
      If there are indeed bits that we must preserve in this range then we
      can ressurrect this patch, but with proper documentation for those
      bits supplied. And we probably also need to think a bit about
      interactions with our driver.
      
      Cc: Armin Reese <armin.c.reese@intel.com>
      Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
      Cc: Dave Airlie <airlied@linux.ie>
      Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      85ba7b7d
  5. 23 1月, 2014 21 次提交