st/dri2: fix kms_swrast driconf option handling
Commite794f8bf8b
("gallium: move loading of drirc to pipe-loader") moved the option cache to the pipe_loader_device. However, the screen->dev pointer is not set when dri_init_options() is called. Move the call to after the pipe_loader_sw_probe_kms() call so screen->dev is set. This mirrors the code flow for dri2_init_screen(). Fixes:e794f8bf8b
("gallium: move loading of drirc to pipe-loader") Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> Cc: Marek Olšák <marek.olsak@amd.com> Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
parent
bbfad34606
commit
cc43c4a9e5
|
@ -2061,10 +2061,10 @@ dri_kms_init_screen(__DRIscreen * sPriv)
|
||||||
if (screen->fd < 0 || (fd = fcntl(screen->fd, F_DUPFD_CLOEXEC, 3)) < 0)
|
if (screen->fd < 0 || (fd = fcntl(screen->fd, F_DUPFD_CLOEXEC, 3)) < 0)
|
||||||
goto free_screen;
|
goto free_screen;
|
||||||
|
|
||||||
dri_init_options(screen);
|
if (pipe_loader_sw_probe_kms(&screen->dev, fd)) {
|
||||||
|
dri_init_options(screen);
|
||||||
if (pipe_loader_sw_probe_kms(&screen->dev, fd))
|
|
||||||
pscreen = pipe_loader_create_screen(screen->dev);
|
pscreen = pipe_loader_create_screen(screen->dev);
|
||||||
|
}
|
||||||
|
|
||||||
if (!pscreen)
|
if (!pscreen)
|
||||||
goto release_pipe;
|
goto release_pipe;
|
||||||
|
|
Loading…
Reference in New Issue