From 0af04dccaac1f412d6dedf08a3cb495e3a054203 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Sat, 19 Jun 2021 13:52:40 +0000 Subject: [PATCH] intel_extreme: only access ports pipe if it has one assigned. --- src/add-ons/accelerants/intel_extreme/Ports.cpp | 5 +++++ src/add-ons/accelerants/intel_extreme/dpms.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/add-ons/accelerants/intel_extreme/Ports.cpp b/src/add-ons/accelerants/intel_extreme/Ports.cpp index 0cc4a93691..f0101de5b6 100644 --- a/src/add-ons/accelerants/intel_extreme/Ports.cpp +++ b/src/add-ons/accelerants/intel_extreme/Ports.cpp @@ -163,6 +163,11 @@ Port::SetPipe(Pipe* pipe) status_t Port::Power(bool enabled) { + if (fPipe == NULL) { + ERROR("%s: Setting power mode without assigned pipe!\n", __func__); + return B_ERROR; + } + fPipe->Enable(enabled); return B_OK; diff --git a/src/add-ons/accelerants/intel_extreme/dpms.cpp b/src/add-ons/accelerants/intel_extreme/dpms.cpp index 474984d2cb..fa9fbf2957 100644 --- a/src/add-ons/accelerants/intel_extreme/dpms.cpp +++ b/src/add-ons/accelerants/intel_extreme/dpms.cpp @@ -32,6 +32,8 @@ enable_all_pipes(bool enable) continue; if (!gInfo->ports[i]->IsConnected()) continue; + if (gInfo->ports[i]->GetPipe() == NULL) + continue; gInfo->ports[i]->Power(enable); }