| Message ID | 20240709091012.3123409-1-make24@iscas.ac.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/amd/display: Add otg_master NULL check within init_pipe_slice_table_from_context | expand |
On 7/9/24 3:10 AM, Ma Ke wrote: > To avoid reports of NULL_RETURN warning, we should add > otg_master NULL check. > > Cc: stable@vger.kernel.org > Fixes: c51d87202d1f ("drm/amd/display: do not attempt ODM power optimization if minimal transition doesn't exist") > Signed-off-by: Ma Ke <make24@iscas.ac.cn> > --- > Changes in v2: > - added the recipient's email address, due to the prolonged absence of a > response from the recipient. > - added Cc stable. > --- > drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c > index f6fe0a64beac..8972598ca77f 100644 > --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c > +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c > @@ -1177,6 +1177,9 @@ static void init_pipe_slice_table_from_context( > stream = context->streams[i]; > otg_master = resource_get_otg_master_for_stream( > &context->res_ctx, stream); > + if (!otg_master) > + continue; > + > count = resource_get_odm_slice_count(otg_master); > update_slice_table_for_stream(table, stream, count); > Hi, Which repository and branch are you using? It looks like this issue is already fixed on amd-staging-drm-next. Thanks Siqueira
diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c index f6fe0a64beac..8972598ca77f 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c @@ -1177,6 +1177,9 @@ static void init_pipe_slice_table_from_context( stream = context->streams[i]; otg_master = resource_get_otg_master_for_stream( &context->res_ctx, stream); + if (!otg_master) + continue; + count = resource_get_odm_slice_count(otg_master); update_slice_table_for_stream(table, stream, count);
To avoid reports of NULL_RETURN warning, we should add otg_master NULL check. Cc: stable@vger.kernel.org Fixes: c51d87202d1f ("drm/amd/display: do not attempt ODM power optimization if minimal transition doesn't exist") Signed-off-by: Ma Ke <make24@iscas.ac.cn> --- Changes in v2: - added the recipient's email address, due to the prolonged absence of a response from the recipient. - added Cc stable. --- drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 3 +++ 1 file changed, 3 insertions(+)