1. 17 Feb, 2023 1 commit
  2. 16 Feb, 2023 27 commits
  3. 15 Feb, 2023 8 commits
    • Jani Nikula's avatar
      drm/i915/wm: add .get_hw_state to watermark funcs · 0e7a16f9
      Jani Nikula authored
      Get rid of the if ladder in intel_modeset_setup_hw_state() and hide a
      number of functions by adding a .get_hw_state() hook to watermark
      functions. At least for now, combine the platform specific sanitization
      to the hw state readouts on the relevant platforms instead of adding a
      separate hook for that.
      
      There's a functional change on PCH split platforms: If i9xx_wm_init()
      fails to read plane latency and chooses the nop functions,
      ilk_wm_get_hw_state() won't get called for readout. Add the
      ilk_init_lp_watermarks() call on that path which now won't be called in
      .get_hw_state(), as it looks like the only thing that could make a
      difference.
      
      v2:
      - Add missing static (kernel test robot)
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/6da32831e40606cc8b90491b83196917f2ce36ab.1676317696.git.jani.nikula@intel.com
      0e7a16f9
    • Jani Nikula's avatar
      drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch] · 284c5baa
      Jani Nikula authored
      Move the wrappers to call watermark hooks into intel_wm.[ch]. This
      declutters intel_display.c nicely.
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/2c8243c5c81b8cd8e34d51f55f3533373c305d0e.1676317696.git.jani.nikula@intel.com
      284c5baa
    • Jani Nikula's avatar
      drm/i915/wm: move remaining watermark code out of intel_pm.c · 94b49d53
      Jani Nikula authored
      Add new files intel_wm.[ch] and i9xx_wm.[ch] under display/ to hold
      generic and pre-SKL watermark code, respectively. SKL+ watermark code
      has already been split out to skl_watermark.[ch].
      
      Use the _wm.[ch] naming for brevity; we may want to rename
      skl_watermark.[ch] later accordingly.
      
      Add new intel_wm_init() to call either skl_wm_init() or
      i9xx_wm_init(i915) depending on the platform, the latter comprising of
      the remains of intel_init_pm().
      
      Sprinkle in some minor checkpatch fixes while moving the code.
      
      v2:
      - Rebase
      - Fix copyright year
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/ddf04a07a37f0368b3fef85d4ebb924082fec6cd.1676317696.git.jani.nikula@intel.com
      94b49d53
    • Jani Nikula's avatar
      drm/i915: move memory frequency detection to intel_dram.c · 1b2146de
      Jani Nikula authored
      The memory frequency detection is a bit spread out here and
      there. Consolidate to intel_dram.c.
      
      v2:
      - Remove inaccurate comment (Ville)
      - Call detect_mem_freq() unconditionally (Ville)
      
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/8a862eeca8b42a98e04b3c52637851d33531abb6.1676317696.git.jani.nikula@intel.com
      1b2146de
    • Imre Deak's avatar
      drm/i915: Sanitize the display fused-off check on GEN7/8 · f9dfa87c
      Imre Deak authored
      Detecting in intel_device_info_runtime_init() that the display is fused
      off or not present should only zero intel_runtime_info::pipe_mask, while
      the other related masks will be accordingly zeroed later in the
      function. Remove the redundant zeroing of the related fields on GEN7/8.
      
      Cc: Jani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20230208114300.3123934-5-imre.deak@intel.com
      f9dfa87c
    • Imre Deak's avatar
      drm/i915/dgfx, mtl+: Disable display functionality if the display is not present · 273e1daa
      Imre Deak authored
      DG1/DG2 and MTL+ has added a new display-present HW flag. Check this
      flag and if cleared, disable the driver's display functionality.
      
      So far the missing check resulted in running the display initialization
      sequence, and the WARNs below, due to the display register accesses
      timing out:
      
      [    3.902843] ------------[ cut here ]------------
      [    3.902848] i915 0000:03:00.0: drm_WARN_ON(intel_de_wait_for_set(dev_priv, ((const i915_reg_t){ .reg = (0x42000) }), (1 << (27 - (pg))), 1))
      [    3.902879] WARNING: CPU: 6 PID: 462 at drivers/gpu/drm/i915/display/intel_display_power_well.c:326 gen9_wait_for_power_well_fuses+0x71/0x80 [i915]
      [    3.903009] Modules linked in: hid_sensor_hub intel_ishtp_hid i915(+) rtsx_pci_sdmmc drm_buddy mmc_core drm_display_helper crct10dif_pclmul nvme cec crc32_pclmul intel_ish_ipc crc32c_intel ucsi_acpi hid_multitouch nvme_core ghash_clmulni_intel typec_ucsi rtsx_pci ttm sha512_ssse3 serio_raw intel_ishtp typec video i2c_hid_acpi i2c_hid wmi pinctrl_tigerlake ip6_tables ip_tables x_tables fuse
      [    3.903021] CPU: 6 PID: 462 Comm: systemd-udevd Tainted: G     U             6.2.0-rc6+ #50
      [    3.903023] Hardware name: LENOVO 82VB/LNVNB161216, BIOS KMCN09WW 04/26/2022
      [    3.903023] RIP: 0010:gen9_wait_for_power_well_fuses+0x71/0x80 [i915]
      [    3.903105] Code: 48 8b 5f 50 48 85 db 75 03 48 8b 1f e8 98 bb 0d e9 48 c7 c1 00 65 a1 c0 48 89 da 48 c7 c7 4b c5 a3 c0 48 89 c6 e8 e3 df 53 e9 <0f> 0b 5b c3 cc cc cc cc 0f 1f 80 00 00 00 00 90 90 90 90 90 90 90
      [    3.903106] RSP: 0018:ffffa7cec0b07a98 EFLAGS: 00010292
      [    3.903107] RAX: 0000000000000080 RBX: ffff9a05430eaaa0 RCX: 0000000000000000
      [    3.903108] RDX: 0000000000000001 RSI: ffffffffaa7ab69e RDI: 00000000ffffffff
      [    3.903108] RBP: ffff9a0552ba2020 R08: ffffffffab062ce0 R09: 00000000abd3ffc2
      [    3.903109] R10: ffffffffffffffff R11: 0000000000000081 R12: 0000000000000000
      [    3.903109] R13: ffff9a05532a9cb0 R14: ffffffffc09e1670 R15: ffff9a0543132000
      [    3.903110] FS:  00007f24d0fe5b40(0000) GS:ffff9a0ccf780000(0000) knlGS:0000000000000000
      [    3.903110] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [    3.903111] CR2: 00005643d7a31a28 CR3: 0000000111614002 CR4: 0000000000770ee0
      [    3.903112] PKRU: 55555554
      [    3.903112] Call Trace:
      [    3.903113]  <TASK>
      [    3.903114]  hsw_power_well_enable+0x12f/0x1a0 [i915]
      [    3.903191]  intel_power_well_enable+0x21/0x70 [i915]
      [    3.903265]  icl_display_core_init+0x92/0x6a0 [i915]
      [    3.903346]  intel_power_domains_init_hw+0x1da/0x5b0 [i915]
      [    3.903422]  intel_modeset_init_noirq+0x60/0x250 [i915]
      [    3.903497]  i915_driver_probe+0x562/0xe10 [i915]
      [    3.903557]  ? i915_pci_probe+0x87/0x180 [i915]
      [    3.903617]  local_pci_probe+0x3e/0x80
      [    3.903621]  pci_device_probe+0xb3/0x210
      [    3.903622]  really_probe+0xdb/0x380
      [    3.903624]  ? pm_runtime_barrier+0x50/0x90
      [    3.903626]  __driver_probe_device+0x78/0x170
      [    3.903627]  driver_probe_device+0x1f/0x90
      [    3.903628]  __driver_attach+0xce/0x1c0
      [    3.903629]  ? __pfx___driver_attach+0x10/0x10
      [    3.903630]  bus_for_each_dev+0x5f/0x90
      [    3.903631]  bus_add_driver+0x1ae/0x200
      [    3.903632]  driver_register+0x89/0xe0
      [    3.903634]  i915_init+0x1f/0x7f [i915]
      [    3.903695]  ? __pfx_init_module+0x10/0x10 [i915]
      [    3.903751]  do_one_initcall+0x43/0x220
      [    3.903753]  ? kmalloc_trace+0x26/0x90
      [    3.903756]  do_init_module+0x4a/0x200
      [    3.903758]  __do_sys_init_module+0x157/0x180
      [    3.903760]  do_syscall_64+0x58/0xc0
      [    3.903762]  ? do_syscall_64+0x67/0xc0
      [    3.903762]  ? exc_page_fault+0x70/0x170
      [    3.903764]  entry_SYSCALL_64_after_hwframe+0x72/0xdc
      
      Bspec: 49189, 53112
      
      v2: (Jani)
      - Change "Display fused off" dmesg info to "Display not present".
      - Zero only runtime->pipe_mask, other fields being zeroed based on this
        later.
      - Detect display presence already before the fused-off checks and only for
        HAS_DISPLAY().
      v3: Fix "preset" vs "present" typo.
      Reported-and-tested-by: default avatariczero <iczero@hellomouse.net>
      Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8015
      Cc: iczero <iczero@hellomouse.net>
      Cc: Jani Nikula <jani.nikula@intel.com>
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20230208114300.3123934-4-imre.deak@intel.com
      273e1daa
    • Imre Deak's avatar
      drm/i915: Move display power initialization during driver probing later · 2bf91341
      Imre Deak authored
      Determining whether the display engine is present on a platform happens
      only in intel_device_info_runtime_init(). Initializing the display power
      functionality depends on this condition, so move
      intel_power_domains_init() later after the runtime init function has
      been called.
      
      The next patch fixing platforms without display, depends on this patch.
      Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20230208114300.3123934-3-imre.deak@intel.com
      2bf91341
    • Imre Deak's avatar
      drm/i915: Fix system suspend without fbdev being initialized · 9542d708
      Imre Deak authored
      If fbdev is not initialized for some reason - in practice on platforms
      without display - suspending fbdev should be skipped during system
      suspend, fix this up. While at it add an assert that suspending fbdev
      only happens with the display present.
      
      This fixes the following:
      
      [   91.227923] PM: suspend entry (s2idle)
      [   91.254598] Filesystems sync: 0.025 seconds
      [   91.270518] Freezing user space processes
      [   91.272266] Freezing user space processes completed (elapsed 0.001 seconds)
      [   91.272686] OOM killer disabled.
      [   91.272872] Freezing remaining freezable tasks
      [   91.274295] Freezing remaining freezable tasks completed (elapsed 0.001 seconds)
      [   91.659622] BUG: kernel NULL pointer dereference, address: 00000000000001c8
      [   91.659981] #PF: supervisor write access in kernel mode
      [   91.660252] #PF: error_code(0x0002) - not-present page
      [   91.660511] PGD 0 P4D 0
      [   91.660647] Oops: 0002 [#1] PREEMPT SMP NOPTI
      [   91.660875] CPU: 4 PID: 917 Comm: bash Not tainted 6.2.0-rc7+ #54
      [   91.661185] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS edk2-20221117gitfff6d81270b5-9.fc37 unknown
      [   91.661680] RIP: 0010:mutex_lock+0x19/0x30
      [   91.661914] Code: 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0f 1f 44 00 00 53 48 89 fb e8 62 d3 ff ff 31 c0 65 48 8b 14 25 00 15 03 00 <f0> 48 0f b1 13 75 06 5b c3 cc cc cc cc 48 89 df 5b eb b4 0f 1f 40
      [   91.662840] RSP: 0018:ffffa1e8011ffc08 EFLAGS: 00010246
      [   91.663087] RAX: 0000000000000000 RBX: 00000000000001c8 RCX: 0000000000000000
      [   91.663440] RDX: ffff8be455eb0000 RSI: 0000000000000001 RDI: 00000000000001c8
      [   91.663802] RBP: ffff8be459440000 R08: ffff8be459441f08 R09: ffffffff8e1432c0
      [   91.664167] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000001
      [   91.664532] R13: 00000000000001c8 R14: 0000000000000000 R15: ffff8be442f4fb20
      [   91.664905] FS:  00007f28ffc16740(0000) GS:ffff8be4bb900000(0000) knlGS:0000000000000000
      [   91.665334] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [   91.665626] CR2: 00000000000001c8 CR3: 0000000114926006 CR4: 0000000000770ee0
      [   91.665988] PKRU: 55555554
      [   91.666131] Call Trace:
      [   91.666265]  <TASK>
      [   91.666381]  intel_fbdev_set_suspend+0x97/0x1b0 [i915]
      [   91.666738]  i915_drm_suspend+0xb9/0x100 [i915]
      [   91.667029]  pci_pm_suspend+0x78/0x170
      [   91.667234]  ? __pfx_pci_pm_suspend+0x10/0x10
      [   91.667461]  dpm_run_callback+0x47/0x150
      [   91.667673]  __device_suspend+0x10a/0x4e0
      [   91.667880]  dpm_suspend+0x134/0x270
      [   91.668069]  dpm_suspend_start+0x79/0x80
      [   91.668272]  suspend_devices_and_enter+0x11b/0x890
      [   91.668526]  pm_suspend.cold+0x270/0x2fc
      [   91.668737]  state_store+0x46/0x90
      [   91.668916]  kernfs_fop_write_iter+0x11b/0x200
      [   91.669153]  vfs_write+0x1e1/0x3a0
      [   91.669336]  ksys_write+0x53/0xd0
      [   91.669510]  do_syscall_64+0x58/0xc0
      [   91.669699]  ? syscall_exit_to_user_mode_prepare+0x18e/0x1c0
      [   91.669980]  ? syscall_exit_to_user_mode_prepare+0x18e/0x1c0
      [   91.670278]  ? syscall_exit_to_user_mode+0x17/0x40
      [   91.670524]  ? do_syscall_64+0x67/0xc0
      [   91.670717]  ? __irq_exit_rcu+0x3d/0x140
      [   91.670931]  entry_SYSCALL_64_after_hwframe+0x72/0xdc
      [   91.671202] RIP: 0033:0x7f28ffd14284
      
      v2: CC stable. (Jani)
      
      Fixes: f8cc091e ("drm/i915/fbdev: suspend HPD before fbdev unregistration")
      References: https://gitlab.freedesktop.org/drm/intel/-/issues/8015Reported-and-tested-by: default avatariczero <iczero@hellomouse.net>
      Cc: Andrzej Hajda <andrzej.hajda@intel.com>
      Cc: iczero <iczero@hellomouse.net>
      Cc: <stable@vger.kernel.org> # v6.1+
      Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
      Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20230208114300.3123934-2-imre.deak@intel.com
      9542d708
  4. 14 Feb, 2023 4 commits