Skip to content

Commit bd4b125

Browse files
Jamimalexdeucher
authored andcommitted
drm/amd/display: fix missing .is_two_pixels_per_container
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@gmail.com> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3942 Fixes: e6a901a ("drm/amd/display: use even ODM slice width for two pixels per container") Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent ba79523 commit bd4b125

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/gpu/drm/amd/display/dc/dce60/dce60_timing_generator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ static const struct timing_generator_funcs dce60_tg_funcs = {
239239
dce60_timing_generator_enable_advanced_request,
240240
.configure_crc = dce60_configure_crc,
241241
.get_crc = dce110_get_crc,
242+
.is_two_pixels_per_container = dce110_is_two_pixels_per_container,
242243
};
243244

244245
void dce60_timing_generator_construct(

0 commit comments

Comments
 (0)