yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

platforms/drm: move gamma blob ownership to DrmPipeline::Gamma

Browse source
This commit is contained in:
Xaver Hugl 2021-10-22 12:17:59 +02:00
parent 02bb276ebf
commit 3f62ea44dd
2 changed files with 48 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/backends/drm/drm_pipeline.cpp
View file

@ -263,13 +263,7 @@ bool DrmPipeline::populateAtomicValues(drmModeAtomicReq *req, uint32_t &flags)
pending.crtc->primaryPlane()->set(QPoint(0, 0), m_primaryBuffer ? m_primaryBuffer->size() : modeSize, QPoint(0, 0), modeSize); pending.crtc->primaryPlane()->set(QPoint(0, 0), m_primaryBuffer ? m_primaryBuffer->size() : modeSize, QPoint(0, 0), modeSize);
pending.crtc->primaryPlane()->setBuffer(activePending() ? m_primaryBuffer.get() : nullptr); pending.crtc->primaryPlane()->setBuffer(activePending() ? m_primaryBuffer.get() : nullptr);
pending.crtc->setPending(DrmCrtc::PropertyIndex::VrrEnabled, pending.syncMode == RenderLoopPrivate::SyncMode::Adaptive); pending.crtc->setPending(DrmCrtc::PropertyIndex::VrrEnabled, pending.syncMode == RenderLoopPrivate::SyncMode::Adaptive);
if (pending.gamma != m_current.gamma) { pending.crtc->setPending(DrmCrtc::PropertyIndex::Gamma_LUT, pending.gamma ? pending.gamma->blobId() : 0);
if (pending.gamma) {
pending.crtc->setPendingBlob(DrmCrtc::PropertyIndex::Gamma_LUT, pending.gamma->atomicLut, pending.gamma->size * sizeof(drm_color_lut));
} else {
pending.crtc->setPendingBlob(DrmCrtc::PropertyIndex::Gamma_LUT, nullptr, 256 * sizeof(drm_color_lut));
}
}
} }
return m_connector->atomicPopulate(req) && (!pending.crtc || (pending.crtc->atomicPopulate(req) && pending.crtc->primaryPlane()->atomicPopulate(req))); return m_connector->atomicPopulate(req) && (!pending.crtc || (pending.crtc->atomicPopulate(req) && pending.crtc->primaryPlane()->atomicPopulate(req)));
} }
@ -397,10 +391,8 @@ bool DrmPipeline::applyPendingChangesLegacy()
return false; return false;
} }
m_connector->getProp(DrmConnector::PropertyIndex::Dpms)->setCurrent(DRM_MODE_DPMS_ON); m_connector->getProp(DrmConnector::PropertyIndex::Dpms)->setCurrent(DRM_MODE_DPMS_ON);
if (pending.gamma && drmModeCrtcSetGamma(gpu()->fd(), pending.crtc->id(), pending.gamma->size, if (pending.gamma && drmModeCrtcSetGamma(gpu()->fd(), pending.crtc->id(), pending.gamma->size(),
const_cast<uint16_t*>(pending.gamma->lut.red()), pending.gamma->red(), pending.gamma->green(), pending.gamma->blue()) != 0) {
const_cast<uint16_t*>(pending.gamma->lut.blue()),
const_cast<uint16_t*>(pending.gamma->lut.green())) != 0) {
qCWarning(KWIN_DRM) << "Setting gamma failed!" << strerror(errno); qCWarning(KWIN_DRM) << "Setting gamma failed!" << strerror(errno);
return false; return false;
} }
@ -545,22 +537,52 @@ DrmCrtc *DrmPipeline::currentCrtc() const
} }
DrmGammaRamp::DrmGammaRamp(DrmGpu *gpu, const GammaRamp &lut) DrmGammaRamp::DrmGammaRamp(DrmGpu *gpu, const GammaRamp &lut)
: lut(lut) : m_gpu(gpu)
, size(lut.size()) , m_lut(lut)
{ {
if (gpu->atomicModeSetting()) { if (gpu->atomicModeSetting()) {
atomicLut = new drm_color_lut[size]; QVector<drm_color_lut> atomicLut(lut.size());
for (uint32_t i = 0; i < size; i++) { for (uint32_t i = 0; i < lut.size(); i++) {
atomicLut[i].red = lut.red()[i]; atomicLut[i].red = lut.red()[i];
atomicLut[i].green = lut.green()[i]; atomicLut[i].green = lut.green()[i];
atomicLut[i].blue = lut.blue()[i]; atomicLut[i].blue = lut.blue()[i];
} }
if (drmModeCreatePropertyBlob(gpu->fd(), atomicLut.data(), sizeof(drm_color_lut) * lut.size(), &m_blobId) != 0) {
qCWarning(KWIN_DRM) << "Failed to create gamma blob!" << strerror(errno);
}
} }
} }
DrmGammaRamp::~DrmGammaRamp() DrmGammaRamp::~DrmGammaRamp()
{ {
delete[] atomicLut; if (m_blobId != 0) {
drmModeDestroyPropertyBlob(m_gpu->fd(), m_blobId);
}
}
uint32_t DrmGammaRamp::blobId() const
{
return m_blobId;
}
uint32_t DrmGammaRamp::size() const
{
return m_lut.size();
}
uint16_t *DrmGammaRamp::red() const
{
return const_cast<uint16_t*>(m_lut.red());
}
uint16_t *DrmGammaRamp::green() const
{
return const_cast<uint16_t*>(m_lut.green());
}
uint16_t *DrmGammaRamp::blue() const
{
return const_cast<uint16_t*>(m_lut.blue());
} }
void DrmPipeline::printFlags(uint32_t flags) void DrmPipeline::printFlags(uint32_t flags)

13
src/backends/drm/drm_pipeline.h
View file

@ -37,9 +37,16 @@ public:
DrmGammaRamp(DrmGpu *gpu, const GammaRamp &lut); DrmGammaRamp(DrmGpu *gpu, const GammaRamp &lut);
~DrmGammaRamp(); ~DrmGammaRamp();
const GammaRamp lut; uint32_t size() const;
drm_color_lut *atomicLut = nullptr; uint16_t *red() const;
uint32_t size; uint16_t *green() const;
uint16_t *blue() const;
uint32_t blobId() const;
private:
DrmGpu *m_gpu;
const GammaRamp m_lut;
uint32_t m_blobId = 0;
}; };
class DrmPipeline class DrmPipeline