<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Tue, Aug 30, 2016 at 6:54 PM, Christophe Fergeau <<a href="mailto:cfergeau@redhat.com" target="_blank">cfergeau@redhat.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Shouldn't this be merged with patch 14 somehow as it is introducing these #ifdef USE_FRAMEBUFFER in the first place? </blockquote><div>Ture, thanks! </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Christophe <div><div class="h5"> On Tue, Aug 09, 2016 at 06:31:06PM +0300, Sameeh Jubran wrote: > From: Dmitry Fleytman <<a href="mailto:dmitry@daynix.com">dmitry@daynix.com</a>> > > Framebuffer should only be used in VGA mode, > however the mode is only known at runtime therefore > framebuffer logic should be active when the driver > is operating in vga mode only. > > Signed-off-by: Sameeh Jubran <<a href="mailto:sameeh@daynix.com">sameeh@daynix.com</a>> > Signed-off-by: Dmitry Fleytman <<a href="mailto:dmitry@daynix.com">dmitry@daynix.com</a>> > --- > qxldod/QxlDod.cpp | 21 +++++++++++---------- > qxldod/QxlDod.h | 1 + > 2 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/qxldod/QxlDod.cpp b/qxldod/QxlDod.cpp > index 74cd259..557d796 100755 > --- a/qxldod/QxlDod.cpp > +++ b/qxldod/QxlDod.cpp > @@ -218,9 +218,10 @@ VOID QxlDod::CleanUp(VOID) > { > if (m_CurrentModes[Source].FrameBuffer.Ptr) > { > -#ifdef USE_FRAMEBUFFER > - UnmapFrameBuffer(m_CurrentModes[Source].FrameBuffer.Ptr, m_CurrentModes[Source].DispInfo.Height * m_CurrentModes[Source].DispInfo.Pitch); > -#endif > + if (m_pHWDevice->GetType() == VGA_DEVICE) > + { > + UnmapFrameBuffer(m_CurrentModes[Source].FrameBuffer.Ptr, m_CurrentModes[Source].DispInfo.Height * m_CurrentModes[Source].DispInfo.Pitch); > + } > m_CurrentModes[Source].FrameBuffer.Ptr = NULL; > m_CurrentModes[Source].Flags.FrameBufferIsActive = FALSE; > } > @@ -1395,10 +1396,11 @@ NTSTATUS QxlDod::CommitVidPn(_In_ CONST DXGKARG_COMMITVIDPN* CONST pCommitVidPn) > if (m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].FrameBuffer.Ptr && > !m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].Flags.DoNotMapOrUnmap) > { > -#ifdef USE_FRAMEBUFFER > - Status = UnmapFrameBuffer(m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].FrameBuffer.Ptr, > - m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].DispInfo.Pitch * m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].DispInfo.Height); > -#endif > + if (m_pHWDevice->GetType() == VGA_DEVICE) > + { > + Status = UnmapFrameBuffer(m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].FrameBuffer.Ptr, > + m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].DispInfo.Pitch * m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].DispInfo.Height); > + } > m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].FrameBuffer.Ptr = NULL; > m_CurrentModes[pCommitVidPn->AffectedVidPnSourceId].Flags.FrameBufferIsActive = FALSE; > > @@ -1525,8 +1527,7 @@ NTSTATUS QxlDod::SetSourceModeAndPath(CONST D3DKMDT_VIDPN_SOURCE_MODE* pSourceMo > pCurrentBddMode->DispInfo.Height = pSourceMode-><a href="http://Format.Graphics.PrimSurfSize.cy" rel="noreferrer" target="_blank">Format.Graphics.PrimSurfSize.cy</a>; > pCurrentBddMode->DispInfo.Pitch = pSourceMode-><a href="http://Format.Graphics.PrimSurfSize.cx" rel="noreferrer" target="_blank">Format.Graphics.PrimSurfSize.cx</a> * BPPFromPixelFormat(pCurrentBddMode->DispInfo.ColorFormat) / BITS_PER_BYTE; > > -#ifdef USE_FRAMEBUFFER > - if (!pCurrentBddMode->Flags.DoNotMapOrUnmap) > + if (m_pHWDevice->GetType() == VGA_DEVICE && !pCurrentBddMode->Flags.DoNotMapOrUnmap) > { > // Map the new frame buffer > QXL_ASSERT(pCurrentBddMode->FrameBuffer.Ptr == NULL); > @@ -1534,7 +1535,7 @@ NTSTATUS QxlDod::SetSourceModeAndPath(CONST D3DKMDT_VIDPN_SOURCE_MODE* pSourceMo > pCurrentBddMode->DispInfo.Pitch * pCurrentBddMode->DispInfo.Height, > &(pCurrentBddMode->FrameBuffer.Ptr)); > } > -#endif > + > if (NT_SUCCESS(Status)) > { > > diff --git a/qxldod/QxlDod.h b/qxldod/QxlDod.h > index 19d172f..e5cb410 100755 > --- a/qxldod/QxlDod.h > +++ b/qxldod/QxlDod.h > @@ -263,6 +263,7 @@ public: > virtual NTSTATUS SetPointerPosition(_In_ CONST DXGKARG_SETPOINTERPOSITION* pSetPointerPosition) = 0; > virtual NTSTATUS Escape(_In_ CONST DXGKARG_ESCAPE* pEscap) = 0; > ULONG GetId(void) { return m_Id; } > + WIN_QXL_DEVICE_TYPE GetType(void) { return m_type; } > protected: > virtual NTSTATUS GetModeList(DXGK_DISPLAY_INFORMATION* pDispInfo) = 0; > protected: > -- > 2.7.0.windows.1 > </div></div>> _______________________________________________ > Spice-devel mailing list > <a href="mailto:Spice-devel@lists.freedesktop.org">Spice-devel@lists.freedesktop.org</a> > <a href="https://lists.freedesktop.org/mailman/listinfo/spice-devel" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/spice-devel</a> </blockquote></div> <div> </div>-- <div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">Respectfully, <div style="font-size:12.8px;color:rgb(136,136,136)">Sameeh Jubran</div><div style="font-size:12.8px;color:rgb(136,136,136)"><a href="https://il.linkedin.com/pub/sameeh-jubran/87/747/a8a" title="View public profile" name="UNIQUE_ID_SafeHtmlFilter_UNIQUE_ID_SafeHtmlFilter_UNIQUE_ID_SafeHtmlFilter_UNIQUE_ID_SafeHtmlFilter_14e2c1de96f8c195_UNIQUE_ID_SafeHtmlFilter_SafeHtmlFilter_SafeHtmlFilter_webProfileURL" style="color:rgb(17,85,204);margin:0px;padding:0px;border-width:0px;outline:none;vertical-align:baseline;text-decoration:none" target="_blank">Linkedin</a> </div><div style="font-size:12.8px;color:rgb(136,136,136)">Junior Software Engineer @ <a href="http://www.daynix.com" target="_blank">Daynix</a>.</div></div></div></div></div></div></div> </div></div>