1. 17 6月, 2015 1 次提交
  2. 16 6月, 2015 9 次提交
  3. 15 6月, 2015 26 次提交
  4. 12 6月, 2015 4 次提交
    • M
      drm/i915: Only enable cursor if it can be enabled. · c0165304
      Maarten Lankhorst 提交于
      The cursor should only be enabled if it's visible. This fixes
      igt/kms_cursor_crc, which may otherwise produce the following
      warning:
      
      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 3425 at drivers/gpu/drm/i915/intel_display.c:9995 intel_crtc_update_cursor+0x14c/0x4d0 [i915]()
      Missing switch case (0) in i9xx_update_cursor
      Modules linked in: i915
      CPU: 0 PID: 3425 Comm: kms_cursor_crc Tainted: G        W       4.1.0-rc7-patser+ #4079
      Hardware name: LENOVO 2349AV8/2349AV8, BIOS G1ETA5WW (2.65 ) 04/15/2014
       ffffffffc01aad10 ffff8800b083faa8 ffffffff817f7827 0000000080000001
       ffff8800b083faf8 ffff8800b083fae8 ffffffff81084955 ffff8800b083fad8
       ffff8800c4931148 0000000001200000 ffff8800c48b0000 0000000000000000
      Call Trace:
       [<ffffffff817f7827>] dump_stack+0x4f/0x7b
       [<ffffffff81084955>] warn_slowpath_common+0x85/0xc0
       [<ffffffff810849d1>] warn_slowpath_fmt+0x41/0x50
       [<ffffffffc0139f2c>] intel_crtc_update_cursor+0x14c/0x4d0 [i915]
       [<ffffffffc01497f4>] __intel_set_mode+0x6c4/0x750 [i915]
       [<ffffffffc0150143>] intel_crtc_set_config+0x473/0x5c0 [i915]
       [<ffffffff81467da9>] drm_mode_set_config_internal+0x69/0x120
       [<ffffffff8146c1b9>] drm_mode_setcrtc+0x189/0x540
       [<ffffffff8145c7e0>] drm_ioctl+0x1a0/0x6a0
       [<ffffffff810b3b41>] ? get_parent_ip+0x11/0x50
       [<ffffffff811e9c28>] do_vfs_ioctl+0x2f8/0x530
       [<ffffffff810d0f7d>] ? trace_hardirqs_on+0xd/0x10
       [<ffffffff812e7746>] ? selinux_file_ioctl+0x56/0x100
       [<ffffffff811e9ee1>] SyS_ioctl+0x81/0xa0
       [<ffffffff81801617>] system_call_fastpath+0x12/0x6f
      ---[ end trace abf0f71163290a96 ]---
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      c0165304
    • M
      drm/i915: Set hwmode during readout. · b8b7fade
      Maarten Lankhorst 提交于
      This was introduced after converting hw readout to atomic,
      so it should have been part of the revert too.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90929Reported-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Tested-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      b8b7fade
    • M
      drm/i915: get rid of intel_plane_restore in intel_crtc_page_flip · 02e0efb5
      Maarten Lankhorst 提交于
      Use a full atomic call instead. intel_crtc_page_flip will still
      have to live until async updates are allowed.
      
      This doesn't seem to be a regression from the convert to atomic,
      part 3 patch. During GPU reset it fixes the following warning:
      
       ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 752 at drivers/gpu/drm/drm_crtc.c:5337 drm_mode_page_flip_ioctl+0x27b/0x360()
      Modules linked in: i915
      CPU: 0 PID: 752 Comm: Xorg Not tainted 4.1.0-rc7-patser+ #4090
      Hardware name: NUC5i7RYB, BIOS RYBDWi35.86A.0246.2015.0309.1355 03/09/2015
       ffffffff81c90866 ffff8800d87c3ca8 ffffffff817f7d87 0000000080000001
       0000000000000000 ffff8800d87c3ce8 ffffffff81084955 ffff880000000000
       ffff8800d87c3dc0 ffff8800d93d1208 0000000000000000 ffff8800b7d1f3e0
      Call Trace:
       [<ffffffff817f7d87>] dump_stack+0x4f/0x7b
       [<ffffffff81084955>] warn_slowpath_common+0x85/0xc0
       [<ffffffff81084a35>] warn_slowpath_null+0x15/0x20
       [<ffffffff8146dffb>] drm_mode_page_flip_ioctl+0x27b/0x360
       [<ffffffff8145ccb0>] drm_ioctl+0x1a0/0x6a0
       [<ffffffff810b3b41>] ? get_parent_ip+0x11/0x50
       [<ffffffff812e5540>] ? avc_has_perm+0x20/0x280
       [<ffffffff810b3b41>] ? get_parent_ip+0x11/0x50
       [<ffffffff811ea0f8>] do_vfs_ioctl+0x2f8/0x530
       [<ffffffff811f6001>] ? expand_files+0x261/0x270
       [<ffffffff812e7c16>] ? selinux_file_ioctl+0x56/0x100
       [<ffffffff811ea3b1>] SyS_ioctl+0x81/0xa0
       [<ffffffff81801b97>] system_call_fastpath+0x12/0x6f
      ---[ end trace 9ce834560085bd64 ]---
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      02e0efb5
    • M
      drm/i915: Do not use atomic modesets in hw readout. · b17d48e2
      Maarten Lankhorst 提交于
      This should fix fallout caused by making intel_crtc_control
      and update_dpms atomic, which became a problem after reverting the
      atomic hw readout patch.
      
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90929Reported-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: NMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: NJani Nikula <jani.nikula@intel.com>
      b17d48e2