Differential D2370 Diff 6176 plugins/platforms/drm/drm_backend.cpp

Changeset View

Standalone View

View Options

plugins/platforms/drm/drm_backend.cpp

Context not available.
19*********************************************************************/ 19​*********************************************************************/
20#include "drm_backend.h" 20​#include "drm_backend.h"
21#include "drm_output.h" 21​#include "drm_output.h"
22​#include "drm_object_connector.h"
23​#include "drm_object_crtc.h"
24​#include "drm_object_plane.h"
22#include "composite.h" 25​#include "composite.h"
23#include "cursor.h" 26​#include "cursor.h"
24#include "logging.h" 27​#include "logging.h"
Context not available.
78 while (m_pageFlipsPending != 0) { 81​ while (m_pageFlipsPending != 0) {
79 QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); 82​ QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
80 } 83​ }
84​ qDeleteAll(m_planes);
81 qDeleteAll(m_outputs); 85​ qDeleteAll(m_outputs);
82 delete m_cursor[0]; 86​ delete m_cursor[0];
83 delete m_cursor[1]; 87​ delete m_cursor[1];
Context not available.
236 } 240​ }
237 ); 241​ );
238 m_drmId = device->sysNum(); 242​ m_drmId = device->sysNum();
243​
244​ // trying to activate Atomic Mode Setting (this means also Universal Planes)
245​ if (qEnvironmentVariableIsSet("KWIN_DRM_AMS")) {
246​ if (drmSetClientCap(m_fd, DRM_CLIENT_CAP_ATOMIC, 1) == 0) {
247​ qCDebug(KWIN_DRM) << "Using Atomic Mode Setting.";
248​ m_atomicModeSetting = true;
249​
250​ ScopedDrmPointer<drmModePlaneRes, &drmModeFreePlaneResources> planeResources(drmModeGetPlaneResources(m_fd));
251​ if (!planeResources) {
252​ qCWarning(KWIN_DRM) << "Failed to get plane resources. Falling back to legacy mode";
253​ m_atomicModeSetting = false;
254​ }
255​
256​ if (m_atomicModeSetting) {
257​ qCDebug(KWIN_DRM) << "Number of planes:" << planeResources->count_planes;
258​
259​ // create the plane objects
260​ for (unsigned int i = 0; i < planeResources->count_planes; ++i) {
261​ drmModePlane *kplane = drmModeGetPlane(m_fd, planeResources->planes[i]);
262​ DrmPlane *p = new DrmPlane(kplane->plane_id, m_fd);
263​
264​ if (p->init()) {
265​ p->setPossibleCrtcs(kplane->possible_crtcs);
266​ p->setFormats(kplane->formats, kplane->count_formats);
267​ m_planes << p;
268​ } else {
269​ delete p;
270​ }
271​ }
272​
273​ if (m_planes.isEmpty()) {
274​ qCWarning(KWIN_DRM) << "Failed to create any plane. Falling back to legacy mode";
275​ m_atomicModeSetting = false;
276​ }
277​ }
278​ } else {
279​ qCWarning(KWIN_DRM) << "drmSetClientCap for Atomic Mode Setting failed. Using legacy mode.";
280​ }
281​ }
282​
239 queryResources(); 283​ queryResources();
240 if (m_outputs.isEmpty()) { 284​ if (m_outputs.isEmpty()) {
241 qCWarning(KWIN_DRM) << "No outputs, cannot render, will terminate now"; 285​ qCWarning(KWIN_DRM) << "No outputs, cannot render, will terminate now";
graesslinUnsubmitted
Done

nitpick

graesslin: nitpick
graesslinUnsubmitted
Done

nitpick

graesslin: nitpick
Context not available.
314 DrmOutput *drmOutput = new DrmOutput(this); 358​ DrmOutput *drmOutput = new DrmOutput(this);
315 connect(drmOutput, &DrmOutput::dpmsChanged, this, &DrmBackend::outputDpmsChanged); 359​ connect(drmOutput, &DrmOutput::dpmsChanged, this, &DrmBackend::outputDpmsChanged);
316 drmOutput->m_crtcId = crtcId; 360​ drmOutput->m_crtcId = crtcId;
361​ drmOutput->m_connector = connector->connector_id;
362​
363​ if (m_atomicModeSetting) {
364​ drmOutput->m_crtc = new DrmCrtc(crtcId, m_fd);
365​ if (drmOutput->m_crtc->init()) {
366​ drmOutput->m_crtc->setOutput(drmOutput);
graesslinUnsubmitted
Done

would it make sense to also create the Crtc and Connector in the non AMS mode? My thinking is to reduce the differences

graesslin: would it make sense to also create the Crtc and Connector in the non AMS mode? My thinking is…
romanggAuthorUnsubmitted
Done

I think we talked about this topic already. The problem is, that DrmCrtc and DrmConnector ask the kernel for properties, which are only available in AMS, specifically DrmConnector asks for the atomic property CRTC_ID, which I know of being atomic. The properties MODE_ID and ACTIVE of DrmCrtc could also be atomically, but I couldn't find any informations in this regard.
On second thought, as long as the objects can call drmModeObjectGetProperties, the code in DrmObject should be robust enough, to ask for properties, which are not available, without crashing. I'll try it out.

romangg: I think we talked about this topic already. The problem is, that DrmCrtc and DrmConnector ask…
romanggAuthorUnsubmitted
Done

I encountered a second more severe problem when trying it out: drmModeSetCrtc in "drm_output.cpp" expects a pointer to the id of a connector. But until now we use in DrmObject only a getter function for obtaining the object id as a value.

We could in general change it for giving back a pointer on the value, but this would circumvent the safeguard of the encapsulation. And we would need to change all calls for it. I really don't think this is proportional to the result: Disposing the two member variables m_crtcId and m_connector in DrmOutput. What do you think?

romangg: I encountered a second more severe problem when trying it out: drmModeSetCrtc in "drm_output.
graesslinUnsubmitted
Done

hmm yes that second problem is more severe. So disposing the two members might be the best idea.

graesslin: hmm yes that second problem is more severe. So disposing the two members might be the best idea.
367​ } else {
368​ qCWarning(KWIN_DRM) << "Crtc object failed, skipping output on connector" << connector->connector_id;
369​ delete drmOutput->m_crtc;
370​ delete drmOutput;
371​ continue;
372​ }
373​
374​ drmOutput->m_conn = new DrmConnector(connector->connector_id, m_fd);
375​ if (drmOutput->m_conn->init()) {
376​ drmOutput->m_conn->setOutput(drmOutput);
377​ } else {
378​ qCWarning(KWIN_DRM) << "Connector object failed, skipping output on connector" << connector->connector_id;
379​ delete drmOutput->m_conn;
380​ delete drmOutput;
381​ continue;
382​ }
383​ }
384​
317 if (crtc->mode_valid) { 385​ if (crtc->mode_valid) {
318 drmOutput->m_mode = crtc->mode; 386​ drmOutput->m_mode = crtc->mode;
319 } else { 387​ } else {
320 drmOutput->m_mode = connector->modes[0]; 388​ drmOutput->m_mode = connector->modes[0];
321 } 389​ }
322 drmOutput->m_connector = connector->connector_id; 390​ qCDebug(KWIN_DRM) << "For new output use mode " << drmOutput->m_mode.name;
391​
323 if (!drmOutput->init(connector.data())) { 392​ if (!drmOutput->init(connector.data())) {
324 qCWarning(KWIN_DRM) << "Failed to create output for connector " << connector->connector_id; 393​ qCWarning(KWIN_DRM) << "Failed to create output for connector " << connector->connector_id;
325 delete drmOutput; 394​ delete drmOutput;
Context not available.
619{ 688​{
620#if HAVE_GBM 689​#if HAVE_GBM
621 DrmBuffer *b = new DrmBuffer(this, surface); 690​ DrmBuffer *b = new DrmBuffer(this, surface);
691​ b->m_deleteAfterPageFlip = true;
622 m_buffers << b; 692​ m_buffers << b;
623 return b; 693​ return b;
624#else 694​#else
Context not available.