1. 22 Jul, 2014 10 commits
  2. 21 Jul, 2014 6 commits
    • Dave Airlie's avatar
      drm/i915: split conversion function out into separate function · d05410f9
      Dave Airlie authored
      for MST I need to reuse this, so just move it now.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      d05410f9
    • Dave Airlie's avatar
      drm/i915: check connector->encoder before using it. · 36cd7444
      Dave Airlie authored
      DP MST will need connectors that aren't connected to specific
      encoders, add some checks in advance to avoid oopses.
      Reviewed-by: default avatarTodd Previte <tprevite@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      36cd7444
    • Dave Airlie's avatar
      i915: split some DP modesetting code into a separate function · 44905a27
      Dave Airlie authored
      this is just prep work for mst support.
      Reviewed-by: default avatarTodd Previte <tprevite@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      44905a27
    • Dave Airlie's avatar
      drm/i915: add some registers need for displayport MST support. · 01b887c3
      Dave Airlie authored
      These are just from the Haswell spec.
      Reviewed-by: default avatarTodd Previte <tprevite@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      01b887c3
    • Sachin Kamat's avatar
      drm: gem_cma: Use ERR_CAST helper · e7c36347
      Sachin Kamat authored
      Makes the code a bit more readable.
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@samsung.com>
      Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e7c36347
    • Dave Airlie's avatar
      drm/i915: fix psr match conditions screw ups. · b1972961
      Dave Airlie authored
      Not enough brown paper bags, you'll have to share one.
      (oops below).
      
      The initial match condition code was racy (locking is coming I hear).
      
      then along came:
      cd234b0b
      drm/i915: Do not dereference NULL crtc or fb until after checking
      
      Chris made an attempt to fix it, Ben "reviewed" it.
      Daniel merged it.
      
      Then
      drm/i915: Make use of intel_fb_obj() (v2)
      2ff8fde1
      
      made it worse by removing the obj check later.
      
      All in all, my laptop can't barely turn off the display
      without hitting this.
      
      Posted to #intel-gfx out of niceness, but I've merged
      this already into drm-next.
      
      Here's an oops.
      [   11.528185] BUG: unable to handle kernel NULL pointer dereference at 00000000000000d0
      [   11.528233] IP: [<ffffffffa0161fde>] intel_edp_psr_match_conditions+0x1e/0x2e0 [i915]
      [   11.528294] PGD 35bc0067 PUD c997c067 PMD 0
      [   11.528321] Oops: 0000 [#1] SMP
      [   11.528916] CPU: 3 PID: 244 Comm: kworker/3:2 Not tainted 3.16.0-rc4+ #17
      [   11.528949] Hardware name: LENOVO 20ARS25701/20ARS25701, BIOS GJET72WW (2.22 ) 02/21/2014
      [   11.529004] Workqueue: events intel_edp_psr_work [i915]
      [   11.529031] task: ffff8803079fdaa0 ti: ffff8803079c4000 task.ti: ffff8803079c4000
      [   11.529067] RIP: 0010:[<ffffffffa0161fde>]  [<ffffffffa0161fde>] intel_edp_psr_match_conditions+0x1e/0x2e0 [i915]
      [   11.529129] RSP: 0018:ffff8803079c7d40  EFLAGS: 00010246
      [   11.529155] RAX: 0000000000000000 RBX: ffff88030c11c000 RCX: c000000000000000
      [   11.529189] RDX: 0000000000000001 RSI: 1df0000000000000 RDI: ffff88030c1190d8
      [   11.529222] RBP: ffff8803079c7d60 R08: ffffffff82691140 R09: 0000000000000000
      [   11.529256] R10: ffff8803079fdaa0 R11: 3e00000000000000 R12: ffff88030c11c728
      [   11.529290] R13: ffff88030c1190d8 R14: ffff88031e2d8e00 R15: 00000000000000c0
      [   11.529324] FS:  0000000000000000(0000) GS:ffff88031e2c0000(0000) knlGS:0000000000000000
      [   11.529361] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [   11.529389] CR2: 00000000000000d0 CR3: 00000000c8d9d000 CR4: 00000000001407e0
      [   11.529423] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      [   11.529457] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
      [   11.529489] Stack:
      [   11.529500]  ffff88030c119000 ffff88030c11c728 ffff88030c1190d8 ffff88031e2d8e00
      [   11.529541]  ffff8803079c7d88 ffffffffa01679b2 ffff880035b29a80 ffff880307909f00
      [   11.529583]  ffff88031e2d4740 ffff8803079c7df8 ffffffff810a78ab ffffffff810a7849
      [   11.529624] Call Trace:
      [   11.529654]  [<ffffffffa01679b2>] intel_edp_psr_work+0x52/0x90 [i915]
      [   11.529689]  [<ffffffff810a78ab>] process_one_work+0x1db/0x540
      [   11.529719]  [<ffffffff810a7849>] ? process_one_work+0x179/0x540
      [   11.529750]  [<ffffffff810a81ed>] worker_thread+0x11d/0x520
      [   11.529779]  [<ffffffff810a80d0>] ? create_and_start_worker+0x60/0x60
      [   11.529810]  [<ffffffff810aeb04>] kthread+0xe4/0x100
      [   11.529836]  [<ffffffff810aea20>] ? kthread_create_on_node+0x200/0x200
      [   11.529870]  [<ffffffff81705ebc>] ret_from_fork+0x7c/0xb0
      [   11.529896]  [<ffffffff810aea20>] ? kthread_create_on_node+0x200/0x200
      [   11.529926] Code: ba 31 13 f0 c9 85 f6 75 84 eb d0 66 90 0f 1f 44 00 00 55 48 89 e5 41 56 41 55 41 54 53 48 8b 87 68 ff ff ff 48 8b 9f 28 ff ff ff <48> 8b 80 d0 00 00 00 4c 8b 63 28 48 8b 40 48 48 85 c0 0f 84 1a
      [   11.530110] RIP  [<ffffffffa0161fde>] intel_edp_psr_match_conditions+0x1e/0x2e0 [i915]
      [   11.530163]  RSP <ffff8803079c7d40>
      [   11.530180] CR2: 00000000000000d0
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b1972961
  3. 19 Jul, 2014 2 commits
    • Dave Airlie's avatar
      Merge tag 'topic/core-stuff-2014-07-18' of git://anongit.freedesktop.org/drm-intel into drm-next · 322c1c03
      Dave Airlie authored
      misc core patches.
      
      * tag 'topic/core-stuff-2014-07-18' of git://anongit.freedesktop.org/drm-intel:
        drm: Check for connection_mutex in drm_select_eld
        drm/dp-mst-helper: Don't use uninitialized fields of the sideband message header
        drm/dp-mst-helper: Avoid reading uninitialized value
        drm/plane-helper: Use proper plane init function
        drivers/gpu/drm/drm_buffer.c: remove unnecessary null test before kfree
        drm: Fix function names in kerneldoc
      322c1c03
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next · c51f7167
      Dave Airlie authored
      - fbc improvements when stolen memory is tight (Ben)
      - cdclk handling improvements for vlv/chv (Ville)
      - proper fix for stuck primary planes on gmch platforms with cxsr (Imre&Ebgert
        Eich)
      - gen8 hw semaphore support (Ben)
      - more execlist prep work from Oscar Mateo
      - locking fixes for primary planes (Matt Roper)
      - code rework to support runtime pm for dpms on hsw/bdw (Paulo, Imre & me), but
        not yet enabled because some fixes from Paulo haven't made the cut
      - more gpu boost tuning from Chris
      - as usual piles of little things all over
      
      * tag 'drm-intel-next-2014-07-11' of git://anongit.freedesktop.org/drm-intel: (93 commits)
        drm/i915: Make the RPS interrupt generation mask handle the vlv wa
        drm/i915: Move RPS evaluation interval counters to i915->rps
        drm/i915: Don't cast a pointer to void* unnecessarily
        drm/i915: don't read LVDS regs at compute_config time
        drm/i915: check the power domains in intel_lvds_get_hw_state()
        drm/i915: check the power domains in ironlake_get_pipe_config()
        drm/i915: don't skip shared DPLL assertion on LPT
        drm/i915: Only touch WRPLL hw state in enable/disable hooks
        drm/i915: Switch to common shared dpll framework for WRPLLs
        drm/i915: ->enable hook for WRPLLs
        drm/i915: ->disable hook for WRPLLs
        drm/i915: State readout support for WRPLLs
        drm/i915: add POWER_DOMAIN_PLLS
        drm/i915: Document that the pll->mode_set hook is optional
        drm/i915: Basic shared dpll support for WRPLLs
        drm/i915: Precompute static ddi_pll_sel values in encoders
        drm/i915: BDW also has special-purpose DP DDI clocks
        drm/i915: State readout and cross-checking for ddi_pll_sel
        drm/i915: Move ddi_pll_sel into the pipe config
        drm/i915: Add a debugfs file for the shared dpll state
        ...
      c51f7167
  4. 18 Jul, 2014 16 commits
  5. 10 Jul, 2014 6 commits