mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 12:52:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/display/vdsc: Add ultrajoiner support with DSC

Browse Source 
Add changes to DSC which are required for Ultrajoiner.

v2:
-Use correct helper for setting bits for bigjoiner secondary. (Ankit)
-Use primary/secondary instead of master/slave. (Suraj)
v3: Add the ultrajoiner helpers and use it for setting ultrajoiner
bits (Ankit)
v4: Use num_vdsc_instances *= num_joined_pipes (Ville)
v5: Align the helper to get ultrajoiner enabled pipes with other helpers
(Ville)

Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930163549.416410-7-ankit.k.nautiyal@intel.com
This commit is contained in:
Stanislav Lisovskiy
2024-09-30 22:05:42 +05:30
committed by Ankit Nautiyal
parent 2e45a87eab
commit dc393d478d
3 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/gpu/drm/i915/display/intel_display.c
View File

@@ -312,6 +312,48 @@ u8 _intel_modeset_secondary_pipes(const struct intel_crtc_state *crtc_state)
return bigjoiner_secondary_pipes(crtc_state);
}
bool intel_crtc_is_ultrajoiner(const struct intel_crtc_state *crtc_state)
{
return intel_crtc_num_joined_pipes(crtc_state) >= 4;
}
static u8 ultrajoiner_primary_pipes(const struct intel_crtc_state *crtc_state)
{
if (!intel_crtc_is_ultrajoiner(crtc_state))
return 0;
return crtc_state->joiner_pipes & (0b00010001 << joiner_primary_pipe(crtc_state));
}
bool intel_crtc_is_ultrajoiner_primary(const struct intel_crtc_state *crtc_state)
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
return intel_crtc_is_ultrajoiner(crtc_state) &&
BIT(crtc->pipe) & ultrajoiner_primary_pipes(crtc_state);
}
/*
* The ultrajoiner enable bit doesn't seem to follow primary/secondary logic or
* any other logic, so lets just add helper function to
* at least hide this hassle..
*/
static u8 ultrajoiner_enable_pipes(const struct intel_crtc_state *crtc_state)
{
if (!intel_crtc_is_ultrajoiner(crtc_state))
return 0;
return crtc_state->joiner_pipes & (0b01110111 << joiner_primary_pipe(crtc_state));
}
bool intel_crtc_ultrajoiner_enable_needed(const struct intel_crtc_state *crtc_state)
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
return intel_crtc_is_ultrajoiner(crtc_state) &&
BIT(crtc->pipe) & ultrajoiner_enable_pipes(crtc_state);
}
u8 intel_crtc_joiner_secondary_pipes(const struct intel_crtc_state *crtc_state)
{
if (crtc_state->joiner_pipes)

3
drivers/gpu/drm/i915/display/intel_display.h
View File

@@ -441,6 +441,9 @@ bool intel_crtc_is_joiner_secondary(const struct intel_crtc_state *crtc_state);
bool intel_crtc_is_joiner_primary(const struct intel_crtc_state *crtc_state);
bool intel_crtc_is_bigjoiner_primary(const struct intel_crtc_state *crtc_state);
bool intel_crtc_is_bigjoiner_secondary(const struct intel_crtc_state *crtc_state);
bool intel_crtc_is_ultrajoiner(const struct intel_crtc_state *crtc_state);
bool intel_crtc_is_ultrajoiner_primary(const struct intel_crtc_state *crtc_state);
bool intel_crtc_ultrajoiner_enable_needed(const struct intel_crtc_state *crtc_state);
u8 intel_crtc_joiner_secondary_pipes(const struct intel_crtc_state *crtc_state);
u8 _intel_modeset_primary_pipes(const struct intel_crtc_state *crtc_state);
u8 _intel_modeset_secondary_pipes(const struct intel_crtc_state *crtc_state);

11
drivers/gpu/drm/i915/display/intel_vdsc.c
View File

@@ -385,9 +385,9 @@ static int intel_dsc_get_vdsc_per_pipe(const struct intel_crtc_state *crtc_state
int intel_dsc_get_num_vdsc_instances(const struct intel_crtc_state *crtc_state)
{
int num_vdsc_instances = intel_dsc_get_vdsc_per_pipe(crtc_state);
int num_joined_pipes = intel_crtc_num_joined_pipes(crtc_state);
if (crtc_state->joiner_pipes)
num_vdsc_instances *= 2;
num_vdsc_instances *= num_joined_pipes;
return num_vdsc_instances;
}
@@ -776,7 +776,14 @@ void intel_dsc_enable(const struct intel_crtc_state *crtc_state)
dss_ctl1_val |= JOINER_ENABLE;
}
if (crtc_state->joiner_pipes) {
if (intel_crtc_ultrajoiner_enable_needed(crtc_state))
dss_ctl1_val |= ULTRA_JOINER_ENABLE;
if (intel_crtc_is_ultrajoiner_primary(crtc_state))
dss_ctl1_val |= PRIMARY_ULTRA_JOINER_ENABLE;
dss_ctl1_val |= BIG_JOINER_ENABLE;
if (intel_crtc_is_bigjoiner_primary(crtc_state))
dss_ctl1_val |= PRIMARY_BIG_JOINER_ENABLE;
}