diff options
| author | Vignesh Raghavendra <vigneshr@ti.com> | 2023-02-16 15:41:14 +0530 |
|---|---|---|
| committer | Vignesh Raghavendra <vigneshr@ti.com> | 2023-02-16 15:41:14 +0530 |
| commit | 8ffeeca907557f941a0dd873f3ad7a63d130b6fa (patch) | |
| tree | f1629bee72e4adb24d64464dfbe911818023edfc /drivers/gpu/drm/i915/display/intel_dsi_vbt.c | |
| parent | 76b3e88d569210a51399e8d8c8babd995af29d11 (diff) | |
| parent | 179624a57b78c02de833370b7bdf0b0f4a27ca31 (diff) | |
Merge tag 'v5.10.165' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into ti-linux-5.10.y-cicd
This is the 5.10.165 stable release
* tag 'v5.10.165' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: (951 commits)
Linux 5.10.165
io_uring/rw: remove leftover debug statement
io_uring/rw: ensure kiocb_end_write() is always called
io_uring: fix double poll leak on repolling
io_uring: Clean up a false-positive warning from GCC 9.3.0
mm/khugepaged: fix collapse_pte_mapped_thp() to allow anon_vma
Bluetooth: hci_qca: Fixed issue during suspend
Bluetooth: hci_qca: check for SSR triggered flag while suspend
Bluetooth: hci_qca: Wait for SSR completion during suspend
soc: qcom: apr: Make qcom,protection-domain optional again
Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()"
net/mlx5: fix missing mutex_unlock in mlx5_fw_fatal_reporter_err_work()
net/ulp: use consistent error code when blocking ULP
io_uring/net: fix fast_iov assignment in io_setup_async_msg()
io_uring: io_kiocb_update_pos() should not touch file for non -1 offset
tracing: Use alignof__(struct {type b;}) instead of offsetof()
x86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN
Revert "drm/amdgpu: make display pinning more flexible (v2)"
efi: rt-wrapper: Add missing include
arm64: efi: Execute runtime services from a dedicated stack
...
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
# Conflicts:
# net/hsr/hsr_device.c
# net/hsr/hsr_forward.c
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dsi_vbt.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 8777d35ac7a7..117ea44fd8be 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -133,9 +133,9 @@ static enum port intel_dsi_seq_port_to_port(struct intel_dsi *intel_dsi, return ffs(intel_dsi->ports) - 1; if (seq_port) { - if (intel_dsi->ports & PORT_B) + if (intel_dsi->ports & BIT(PORT_B)) return PORT_B; - else if (intel_dsi->ports & PORT_C) + else if (intel_dsi->ports & BIT(PORT_C)) return PORT_C; } |