Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Plasma
KWin
Commits
cb9ccdb0
Commit
cb9ccdb0
authored
Nov 17, 2020
by
Xaver Hugl
Committed by
Vlad Zahorodnii
Nov 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't check atomic property non_desktop when not using atomic mode setting
parent
871611e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
plugins/platforms/drm/drm_gpu.cpp
plugins/platforms/drm/drm_gpu.cpp
+9
-7
plugins/platforms/drm/drm_object_connector.h
plugins/platforms/drm/drm_object_connector.h
+5
-1
No files found.
plugins/platforms/drm/drm_gpu.cpp
View file @
cb9ccdb0
...
...
@@ -131,13 +131,15 @@ bool DrmGpu::updateOutputs()
auto
it
=
std
::
find_if
(
m_connectors
.
constBegin
(),
m_connectors
.
constEnd
(),
[
currentConnector
]
(
DrmConnector
*
c
)
{
return
c
->
id
()
==
currentConnector
;
});
if
(
it
==
m_connectors
.
constEnd
())
{
auto
c
=
new
DrmConnector
(
currentConnector
,
m_fd
);
if
(
m_atomicModeSetting
&&
!
c
->
atomicInit
())
{
delete
c
;
continue
;
}
if
(
c
->
isNonDesktop
())
{
delete
c
;
continue
;
if
(
m_atomicModeSetting
)
{
if
(
!
c
->
atomicInit
())
{
delete
c
;
continue
;
}
if
(
c
->
isNonDesktop
())
{
delete
c
;
continue
;
}
}
m_connectors
<<
c
;
}
else
{
...
...
plugins/platforms/drm/drm_object_connector.h
View file @
cb9ccdb0
...
...
@@ -37,7 +37,11 @@ public:
bool
isConnected
();
bool
isNonDesktop
()
const
{
return
m_props
.
at
(
static_cast
<
int
>
(
PropertyIndex
::
NonDesktop
))
->
value
();
auto
prop
=
m_props
.
at
(
static_cast
<
int
>
(
PropertyIndex
::
NonDesktop
));
if
(
!
prop
)
{
return
false
;
}
return
prop
->
value
();
}
private:
QVector
<
uint32_t
>
m_encoders
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment