Applied. Thanks! On Thu, Mar 6, 2025 at 9:13 AM Aliaksei Urbanski <aliaksei.urbanski@xxxxxxxxx> wrote: > > Starting from 6.11, AMDGPU driver, while being loaded with amdgpu.dc=1, > due to lack of .is_two_pixels_per_container function in dce60_tg_funcs, > causes a NULL pointer dereference on PCs with old GPUs, such as R9 280X. > > So this fix adds missing .is_two_pixels_per_container to dce60_tg_funcs. > > Reported-by: Rosen Penev <rosenp@xxxxxxxxx> > Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3942 > Fixes: e6a901a00822 ("drm/amd/display: use even ODM slice width for two pixels per container") > Cc: <stable@xxxxxxxxxxxxxxx> # 6.11+ > Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski@xxxxxxxxx> > --- > drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c b/drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c > index e5fb0e8333..e691a1cf33 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c > +++ b/drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c > @@ -239,6 +239,7 @@ static const struct timing_generator_funcs dce60_tg_funcs = { > dce60_timing_generator_enable_advanced_request, > .configure_crc = dce60_configure_crc, > .get_crc = dce110_get_crc, > + .is_two_pixels_per_container = dce110_is_two_pixels_per_container, > }; > > void dce60_timing_generator_construct( > -- > 2.48.1 >
