From: Rohith Iyer <quic_rohii...@quicinc.com>

Fix null pointer deference caused by drmModeAtomicReq being
allocated before set_property was called when modetest was run
with the atomic flag.

Reviewed-by: Rob Clark <robdcl...@gmail.com>
Signed-off-by: Rohith Iyer <quic_rohii...@quicinc.com>
Signed-off-by: Jessica Zhang <quic_jessz...@quicinc.com>
---
 tests/modetest/modetest.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c
index 42e2d1f4..2c31c4fc 100644
--- a/tests/modetest/modetest.c
+++ b/tests/modetest/modetest.c
@@ -2186,11 +2186,13 @@ int main(int argc, char **argv)
        dump_resource(&dev, planes);
        dump_resource(&dev, framebuffers);
 
+       if (dev.use_atomic)
+               dev.req = drmModeAtomicAlloc();
+
        for (i = 0; i < prop_count; ++i)
                set_property(&dev, &prop_args[i]);
 
        if (dev.use_atomic) {
-               dev.req = drmModeAtomicAlloc();
 
                if (set_preferred || (count && plane_count)) {
                        uint64_t cap = 0;
-- 
2.31.0

Reply via email to