Skip to content

drm/i915/display: Fix mode private_flags comparison at atomic_check - #1939

Merged
kv2019i merged 1 commit into
thesofproject:topic/sof-devfrom
kv2019i:fix/boot-with-hdmi-fix-backport
Mar 27, 2020
Merged

drm/i915/display: Fix mode private_flags comparison at atomic_check#1939
kv2019i merged 1 commit into
thesofproject:topic/sof-devfrom
kv2019i:fix/boot-with-hdmi-fix-backport

Conversation

@kv2019i

Copy link
Copy Markdown
Collaborator

This patch fixes the private_flags of mode to be checked and
compared against uapi.mode and not from hw.mode. This helps
properly trigger modeset at boot if desired by driver.

It helps resolve audio_codec initialization issues if display
is connected at boot. Initial discussion on this issue has happened
on below thread:
https://patchwork.freedesktop.org/series/74828/

Fixes: #1792

This patch fixes the private_flags of mode to be checked and
compared against uapi.mode and not from hw.mode. This helps
properly trigger modeset at boot if desired by driver.
It helps resolve audio_codec initialization issues if display
is connected at boot. Initial discussion on this issue has happened
on below thread:
https://patchwork.freedesktop.org/series/74828/
v2: No functional change. Fixed the Closes tag and added
Maarten's RB.
v3: Added Fixes tag.
Cc: Ville Syrjä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: Souza, Jose <jose.souza@intel.com>
Fixes: 58d124e ("drm/i915: Complete crtc hw/uapi split, v6.")
Closes: https://gitlab.freedesktop.org/drm/intel/issues/1363
Suggested-by: Ville Syrjä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: SweeAun Khor <swee.aun.khor@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200326125111.11081-1-uma.shankar@intel.com
@kv2019ikv2019i added upstream Patch has been sent to upstream (e.g. alsa-devel) GFX GFX driver restriction labels Mar 26, 2020
@kv2019i

Copy link
Copy Markdown
CollaboratorAuthor

This is a backport of the final approved fix for #1792 . If @Liviali155 this fixes the problem also in SOF environment, let's go ahead and merge this to sof-dev as it will take a long time to get this back via upstream.

@kv2019i
kv2019i requested a review from libinyangMarch 26, 2020 16:59
@kv2019i

kv2019i commented Mar 27, 2020

Copy link
Copy Markdown
CollaboratorAuthor

@juimonen@lyakh can you give an ack so we can merge? (upstream merged, fixes a P1 bug for us.. just need two approvals for a clean merge)

@kv2019i
kv2019i requested review from juimonen and lyakhMarch 27, 2020 08:52
@kv2019i
kv2019i merged commit eb7d9fe into thesofproject:topic/sof-devMar 27, 2020
@kv2019i

Copy link
Copy Markdown
CollaboratorAuthor

Thanks all, one more P1 bug less!

oder-chiou pushed a commit to oder-chiou/linux-soundwire that referenced this pull request May 5, 2026
This patch fix the follwing checkpatch warnings:
WARNING: quoted string split across lines
thesofproject#129: FILE: drivers/staging/vme_user/vme_tsi148.c:129:
+ dev_err(tsi148_bridge->parent, "VME Mailbox %d received"
+ ": 0x%x\n", i, val);
WARNING: quoted string split across lines
thesofproject#147: FILE: drivers/staging/vme_user/vme_tsi148.c:147:
+	dev_err(tsi148_bridge->parent, "PCI Exception at address: 0x%08x:%08x, "
+ "attributes: %08x\n",
WARNING: quoted string split across lines
thesofproject#153: FILE: drivers/staging/vme_user/vme_tsi148.c:153:
+	dev_err(tsi148_bridge->parent, "PCI-X attribute reg: %08x, PCI-X split "
+ "completion reg: %08x\n",
WARNING: quoted string split across lines
thesofproject#185: FILE: drivers/staging/vme_user/vme_tsi148.c:185:
+ dev_err(tsi148_bridge->parent, "VME Bus Exception Overflow "
+ "Occurred\n");
WARNING: quoted string split across lines
thesofproject#321: FILE: drivers/staging/vme_user/vme_tsi148.c:321:
+ dev_err(tsi148_bridge->parent, "Can't get assigned pci irq "
+ "vector %02X\n", pdev->irq);
WARNING: quoted string split across lines
thesofproject#533: FILE: drivers/staging/vme_user/vme_tsi148.c:533:
+ dev_err(tsi148_bridge->parent, "Invalid PCI Offset "
+ "alignment\n");
WARNING: space prohibited before semicolon
thesofproject#591: FILE: drivers/staging/vme_user/vme_tsi148.c:591:
+ temp_ctl |= TSI148_LCSR_ITAT_SUPR ;
WARNING: quoted string split across lines
thesofproject#766: FILE: drivers/staging/vme_user/vme_tsi148.c:766:
+ dev_err(tsi148_bridge->parent, "Failed to allocate mem "
+ "resource for window %d size 0x%lx start 0x%lx\n",
WARNING: quoted string split across lines
thesofproject#831: FILE: drivers/staging/vme_user/vme_tsi148.c:831:
+ dev_err(tsi148_bridge->parent, "Invalid VME Window "
+ "alignment\n");
WARNING: quoted string split across lines
thesofproject#838: FILE: drivers/staging/vme_user/vme_tsi148.c:838:
+ dev_err(tsi148_bridge->parent, "Size must be non-zero for "
+ "enabled windows\n");
WARNING: quoted string split across lines
thesofproject#853: FILE: drivers/staging/vme_user/vme_tsi148.c:853:
+ dev_err(tsi148_bridge->parent, "Unable to allocate memory for "
+ "resource\n");
WARNING: quoted string split across lines
thesofproject#894: FILE: drivers/staging/vme_user/vme_tsi148.c:894:
+ dev_err(tsi148_bridge->parent, "Invalid VME Offset "
+ "alignment\n");
WARNING: quoted string split across lines
thesofproject#941: FILE: drivers/staging/vme_user/vme_tsi148.c:941:
+ dev_warn(tsi148_bridge->parent, "Currently not setting "
+ "Broadcast Select Registers\n");
WARNING: quoted string split across lines
thesofproject#1455: FILE: drivers/staging/vme_user/vme_tsi148.c:1455:
+ dev_err(dev, "Currently not setting Broadcast Select "
+ "Registers\n");
WARNING: quoted string split across lines
thesofproject#1554: FILE: drivers/staging/vme_user/vme_tsi148.c:1554:
+ dev_err(dev, "Currently not setting Broadcast Select "
+ "Registers\n");
WARNING: quoted string split across lines
thesofproject#1643: FILE: drivers/staging/vme_user/vme_tsi148.c:1643:
+ dev_err(tsi148_bridge->parent, "Descriptor not aligned to 8 "
+ "byte boundary as required: %p\n",
WARNING: else is not generally useful after a break or return
thesofproject#1830: FILE: drivers/staging/vme_user/vme_tsi148.c:1830:
+ return -EBUSY;
+	} else {
warning: quoted string split across lines
thesofproject#1939: file: drivers/staging/vme_user/vme_tsi148.c:1939:
+ dev_err(tsi148_bridge->parent, "location monitor "
+ "callback attached, can't reset\n");
WARNING: space prohibited before semicolon
thesofproject#1964: FILE: drivers/staging/vme_user/vme_tsi148.c:1964:
+ lm_ctl |= TSI148_LCSR_LMAT_SUPR ;
WARNING: quoted string split across lines
thesofproject#2055: FILE: drivers/staging/vme_user/vme_tsi148.c:2055:
+ dev_err(tsi148_bridge->parent, "Location monitor not properly "
+ "configured\n");
WARNING: quoted string split across lines
thesofproject#2200: FILE: drivers/staging/vme_user/vme_tsi148.c:2200:
+ dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
+ "CR/CSR image\n");
WARNING: quoted string split across lines
thesofproject#2241: FILE: drivers/staging/vme_user/vme_tsi148.c:2241:
+ dev_err(tsi148_bridge->parent, "Configuring flush image"
+ " failed\n");
Signed-off-by: Mingyi Kang <jerrykang026@gmail.com>
Link: https://lore.kernel.org/r/20220730045726.55452-1-jerrykang026@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

GFXGFX driver restrictionupstreamPatch has been sent to upstream (e.g. alsa-devel)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG][tgl] Jack detection is off in amixer contents after reboot with HDMI connected

5 participants

@kv2019i@juimonen@lyakh@ranj063@uma-intel