st/dri2: fix kms_swrast driconf option handling
authorRob Herring <robh@kernel.org>
Tue, 8 Aug 2017 16:42:02 +0000 (11:42 -0500)
committerRob Herring <robh@kernel.org>
Wed, 9 Aug 2017 14:09:39 +0000 (09:09 -0500)
commitcc43c4a9e56a5f6dd66e6e67074c219e6f87ba26
treeaa4c4f03fb85e54255317c855cabb1f06e47a1e6
parentbbfad34606b8fc91c3671bb9a6e6545d669e6f81
st/dri2: fix kms_swrast driconf option handling

Commit e794f8bf8bdb ("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: e794f8bf8bdb ("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>
src/gallium/state_trackers/dri/dri2.c