Jani Nikula 49cc17967b drm/i915/mso: using joiner is not possible with eDP MSO ... It's not possible to use the joiner at the same time with eDP MSO. When a panel needs MSO, it's not optional, so MSO trumps joiner. v3: Only change intel_dp_has_joiner(), leave debugfs alone (Ville) Fixes: bc71194e88 ("drm/i915/edp: enable eDP MSO during link training") Cc: <stable@vger.kernel.org> # v5.13+ Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1668 Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240614142311.589089-1-jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 8b5a92ca24) Signed-off-by: Jani Nikula <jani.nikula@intel.com>		2024-06-17 12:01:01 +03:00
..
display	drm/i915/mso: using joiner is not possible with eDP MSO	2024-06-17 12:01:01 +03:00
gem	drm/i915/dpt: Make DPT object unshrinkable	2024-05-29 11:35:43 +03:00
gt	drm/i915/gt: Fix CCS id's calculation for CCS mode setting	2024-05-29 11:35:38 +03:00
gvt	Driver core changes for 6.10-rc1	2024-05-22 12:13:40 -07:00
pxp	Merge tag 'drm-intel-gt-next-2023-12-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next	2023-12-13 11:20:49 +10:00
selftests	Merge tag 'drm-intel-gt-next-2024-04-26' of https://anongit.freedesktop.org/git/drm/drm-intel into drm-next	2024-04-30 14:40:43 +10:00
soc	drm/i915/display: Add meaningful traces for QGV point info error handling	2024-04-19 15:45:13 +03:00
.gitignore
i915_active_types.h
i915_active.c	drm/i915: Fix premature release of request's reusable memory	2023-08-01 10:56:34 +01:00
i915_active.h	drm/i915/active: fix kernel-doc for function parameters	2023-05-04 12:11:56 +03:00
i915_cmd_parser.c	drm/i915: Use kmap_local_page() in i915_cmd_parser.c	2023-12-15 09:34:30 +00:00
i915_cmd_parser.h
i915_config.c	drm/i915: add i915_config.h and move relevant declarations there	2023-01-20 10:13:50 +02:00
i915_config.h	drm/i915: add i915_config.h and move relevant declarations there	2023-01-20 10:13:50 +02:00
i915_debugfs_params.c	drm/i915: fix build with missing debugfs includes	2024-04-26 13:54:37 +10:00
i915_debugfs_params.h
i915_debugfs.c	drm/i915: fix build with missing debugfs includes	2024-04-26 13:54:37 +10:00
i915_debugfs.h
i915_deps.c
i915_deps.h
i915_driver.c	Core DRM:	2024-05-02 14:30:31 +10:00
i915_driver.h	drm/i915: Update DRIVER_DATE to 20230929	2023-09-29 12:43:23 +03:00
i915_drm_client.c	drm/i915: Update shared stats to use the new gem helper	2024-02-16 12:52:50 +01:00
i915_drm_client.h	drm/i915: remove i915_drm_client::id	2024-02-19 15:35:23 -05:00
i915_drv.h	drm/i915: move pipestat_irq_mask to display substruct	2024-04-09 11:31:21 +03:00
i915_file_private.h	drm/i915: Use i915 instead of dev_priv insied the file_priv structure	2023-03-23 01:53:44 +01:00
i915_gem_evict.c
i915_gem_evict.h
i915_gem_gtt.c
i915_gem_gtt.h	Merge drm/drm-next into drm-intel-next	2023-01-25 11:41:16 +02:00
i915_gem_ww.c
i915_gem_ww.h
i915_gem.c	Merge tag 'drm-intel-gt-next-2024-02-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next	2024-02-16 11:19:15 +10:00
i915_gem.h	drm/i915: move I915_GEM_GPU_DOMAINS to i915_gem.h	2023-01-20 10:14:31 +02:00
i915_getparam.c	Merge tag 'drm-intel-gt-next-2024-04-26' of https://anongit.freedesktop.org/git/drm/drm-intel into drm-next	2024-04-30 14:40:43 +10:00
i915_getparam.h
i915_gpu_error.c	drm/i915: fix build with missing debugfs includes	2024-04-26 13:54:37 +10:00
i915_gpu_error.h	Merge tag 'drm-intel-gt-next-2023-12-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next	2023-12-13 11:20:49 +10:00
i915_hwmon.c	UAPI Changes:	2024-04-24 10:51:29 +10:00
i915_hwmon.h	drm/i915/guc: Disable PL1 power limit when loading GuC firmware	2023-04-26 18:02:40 -04:00
i915_ioc32.c
i915_ioc32.h
i915_ioctl.c
i915_ioctl.h
i915_iosf_mbi.h
i915_irq.c	drm/i915: move display_irqs_enabled to display substruct	2024-04-09 11:31:15 +03:00
i915_irq.h	drm/i915/irq: split out display irq handling	2023-05-16 10:31:27 +03:00
i915_memcpy.c	drm/i915: Add includes for BUG_ON/BUILD_BUG_ON in i915_memcpy.c	2024-03-28 10:42:46 -04:00
i915_memcpy.h
i915_mitigations.c
i915_mitigations.h
i915_mm.c
i915_mm.h
i915_module.c
i915_params.c	drm/i915/display: move dmc_firmware_path to display params	2024-04-22 16:48:14 +03:00
i915_params.h	drm/i915/display: move dmc_firmware_path to display params	2024-04-22 16:48:14 +03:00
i915_pci.c	drm/i915: use fine grained -Woverride-init disable	2024-04-02 10:53:59 +03:00
i915_pci.h
i915_perf_oa_regs.h	drm/i915/mtl: Implement Wa_14019141245	2023-04-26 15:56:46 -07:00
i915_perf_types.h	drm/i915: remove i915_perf_stream::size_exponent	2024-02-19 15:35:30 -05:00
i915_perf.c	drm/i915: Update IP_VER(12, 50)	2024-03-22 14:14:52 -07:00
i915_perf.h	drm/i915/perf: Pass i915 object to perf revision helper	2023-03-24 08:50:16 -07:00
i915_pmu.c	drm/i915: Track gt pm wakerefs	2023-11-20 12:36:56 +01:00
i915_pmu.h	drm/i915: rename I915_PMU_MAX_GTS to I915_PMU_MAX_GT	2023-06-06 09:23:47 -07:00
i915_priolist_types.h
i915_pvinfo.h
i915_query.c	drm/i915: Update IP_VER(12, 50)	2024-03-22 14:14:52 -07:00
i915_query.h
i915_reg_defs.h	drm/i915: Add 16bit register/mask operators	2023-05-19 10:02:34 -07:00
i915_reg.h	drm/i915/dpio: Extract vlv_dpio_phy_regs.h	2024-04-30 21:20:52 +03:00
i915_request.c	drm/i915: remove execute_cb::signal	2024-02-19 15:36:28 -05:00
i915_request.h	drm/i915/request: drop kernel-doc	2023-05-04 12:11:29 +03:00
i915_scatterlist.c	Merge tag 'drm-intel-gt-next-2023-04-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-next	2023-04-06 14:21:00 +02:00
i915_scatterlist.h	drm/i915: Implement for_each_sgt_daddr_next	2023-09-30 13:49:22 +02:00
i915_scheduler_types.h
i915_scheduler.c
i915_scheduler.h
i915_selftest.h
i915_suspend.c
i915_suspend.h
i915_sw_fence_work.c
i915_sw_fence_work.h
i915_sw_fence.c
i915_sw_fence.h
i915_switcheroo.c	drm/i915: Allow switching away via vga-switcheroo if uninitialized	2023-01-18 17:12:23 +01:00
i915_switcheroo.h
i915_syncmap.c	drm/i915: Add flex arrays to struct i915_syncmap	2024-02-12 11:59:37 +00:00
i915_syncmap.h
i915_sysfs.c	drm/i915: move gpu error sysfs to i915_gpu_error.c	2023-11-02 14:12:45 +02:00
i915_sysfs.h
i915_tasklet.h
i915_trace_points.c
i915_trace.h	drm/i915: use direct alias for i915 in requests	2023-07-24 17:24:35 +02:00
i915_ttm_buddy_manager.c	drm/buddy: Implement tracking clear page feature	2024-04-22 19:44:16 +02:00
i915_ttm_buddy_manager.h
i915_user_extensions.c
i915_user_extensions.h
i915_utils.c	drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access	2024-02-07 01:58:54 +02:00
i915_utils.h	drm/i915: use check_add_overflow() and drop local variants	2024-04-09 11:49:32 +03:00
i915_vgpu.c
i915_vgpu.h
i915_vma_resource.c	drm/i915/vma: constify unbind_fence_ops	2023-08-25 09:02:55 +03:00
i915_vma_resource.h	drm/i915/vma: fix struct i915_vma_bindinfo kernel-doc	2023-05-05 11:28:09 +03:00
i915_vma_types.h	drm/i915: remove i915_vma::obj_hash	2024-02-19 15:36:34 -05:00
i915_vma.c	drm/i915/vma: Fix UAF on destroy against retire race	2024-03-28 12:16:16 -04:00
i915_vma.h	drm/i915/fbc: Moved fence related code away from intel_fbc	2023-08-07 08:28:28 +03:00
intel_clock_gating.c	drm/i915/display: split out intel_fbc_regs.h from i915_reg.h	2024-04-29 12:30:01 +03:00
intel_clock_gating.h	drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch]	2023-04-05 19:54:13 +03:00
intel_device_info.c	drm/i915: Drop dead code for pvc	2024-03-22 14:14:56 -07:00
intel_device_info.h	drm/i915: Drop dead code for pvc	2024-03-22 14:14:56 -07:00
intel_gvt_mmio_table.c	drm/i915/display: split out intel_sprite_regs.h from i915_reg.h	2024-04-29 12:30:01 +03:00
intel_gvt.c	fix missing vmalloc.h includes	2024-04-25 20:55:49 -07:00
intel_gvt.h
intel_mchbar_regs.h
intel_memory_region.c	drm/i915: Print memory region info during probe	2024-02-07 01:58:46 +02:00
intel_memory_region.h	drm/i915: remove intel_memory_region_ops::flags	2024-02-19 15:36:41 -05:00
intel_pci_config.h
intel_pcode.c	drm/i915/pcode: Give the punit time to settle before fatally failing	2023-02-07 18:29:43 +01:00
intel_pcode.h
intel_region_ttm.c	drm/i915: Use struct resource for memory region IO as well	2024-02-07 01:58:40 +02:00
intel_region_ttm.h
intel_runtime_pm.c	drm/i915: Convert intel_runtime_pm_get_noresume towards raw wakeref	2024-04-19 11:27:14 +03:00
intel_runtime_pm.h	Merge tag 'drm-intel-gt-next-2023-12-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next	2023-12-13 11:20:49 +10:00
intel_sbi.c
intel_sbi.h
intel_step.c	drm/i915: Drop dead code for pvc	2024-03-22 14:14:56 -07:00
intel_step.h	drm/i915: Add wrapper for getting display step	2023-10-11 15:19:48 +05:30
intel_uncore.c	drm/i915: Drop dead code for pvc	2024-03-22 14:14:56 -07:00
intel_uncore.h	drm/i915/uncore: add intel_uncore_regs() helper	2023-07-04 17:12:48 +03:00
intel_wakeref.c	drm/i915: Track gt pm wakerefs	2023-11-20 12:36:56 +01:00
intel_wakeref.h	drm/i915: Track gt pm wakerefs	2023-11-20 12:36:56 +01:00
Kconfig	Revert "drm: Switch DRM_DISPLAY_HELPER to depends on"	2024-05-02 17:58:23 +02:00
Kconfig.debug	drm/display: Make DisplayPort AUX Chardev Kconfig name consistent	2024-03-28 11:26:46 +01:00
Kconfig.profile
Makefile	Kbuild updates for v6.10	2024-05-18 12:39:20 -07:00
TODO.txt
vlv_sideband_reg.h
vlv_sideband.c	drm/i915/dpio: Derive the phy from the port rather than pipe in encoder hooks	2024-04-30 21:12:12 +03:00
vlv_sideband.h	drm/i915/iosf: Drop unused APIs	2023-11-22 19:13:02 +02:00
vlv_suspend.c	drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch]	2023-04-05 19:54:13 +03:00
vlv_suspend.h