Skip to content

modeset: honor forced FRL rate during link assessment #1186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Rohithmatham12 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −7
Draft

modeset: honor forced FRL rate during link assessment #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion kernel-open/nvidia-modeset/nvidia-modeset-linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ static bool malloc_verbose = false;
module_param_named(malloc_verbose, malloc_verbose, bool, 0400);

MODULE_PARM_DESC(force_frl_rate,
"Override the default FRL rate selection (2 = max FRL rate w/ DSC, 1 = max FRL rate, 0 = default rate)");
"Override the default FRL rate selection and use EDID-declared "
"FRL link capabilities (2 = max FRL rate w/ DSC, "
"1 = max FRL rate, 0 = default rate)");
static int force_frl_rate = 0;
module_param_named(force_frl_rate, force_frl_rate, int, 0400);

Expand Down
12 changes: 6 additions & 6 deletions src/nvidia-modeset/src/nvkms-hdmi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1978,8 +1978,10 @@ NvBool nvHdmiFrlAssessLink(NVDpyEvoPtr pDpyEvo)
NVDevEvoPtr pDevEvo = pDispEvo->pDevEvo;
NVHDMIPKT_RESULT ret;
const NvU32 displayId = nvDpyIdToNvU32(pDpyEvo->pConnectorEvo->displayId);
const enum NvKmsFrlRateForce forceFrlRate = nvkms_force_frl_rate();
NvBool bIsDisplayActive = NV_FALSE;
NvBool bPerformLinkTrainingToAssess = NV_TRUE;
NvBool bPerformLinkTrainingToAssess =
(forceFrlRate == NVKMS_FRL_RATE_FORCE_NONE);
HDMI_FRL_DATA_RATE currFRLRate = HDMI_FRL_DATA_RATE_NONE;

nvAssert(nvDpyIsHdmiEvo(pDpyEvo) && nvHdmiDpySupportsFrl(pDpyEvo));
Expand All @@ -1991,11 +1993,9 @@ NvBool nvHdmiFrlAssessLink(NVDpyEvoPtr pDpyEvo)
const HDMI_FRL_CONFIG *pFrlConfig = &pHeadState->hdmiFrlConfig;

bIsDisplayActive = NV_TRUE;
if (pFrlConfig->frlRate == HDMI_FRL_DATA_RATE_NONE) {
bPerformLinkTrainingToAssess = NV_FALSE;
} else {
bPerformLinkTrainingToAssess = NV_TRUE;
}
bPerformLinkTrainingToAssess =
(pFrlConfig->frlRate != HDMI_FRL_DATA_RATE_NONE) &&
(forceFrlRate == NVKMS_FRL_RATE_FORCE_NONE);
currFRLRate = pFrlConfig->frlRate;
}

Expand Down