xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/driver.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0663bb119a1199fa14846879cf22c59fe0814f7b
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 27 19:08:38 2024 +0100

    xfree86: modesetting: fix warning on unused variable
    
    Fix warning:
    
    ../hw/xfree86/drivers/modesetting/driver.c:1612:19: warning: unused variable ‘pEnt’ [-Wunused-variable]
     1612 |     EntityInfoPtr pEnt = ms->pEnt;
          |                   ^~~~
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1443>

diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index b33091cdc..66a074e0e 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -1609,7 +1609,6 @@ msEnableSharedPixmapFlipping(RRCrtcPtr crtc, PixmapPtr front, PixmapPtr back)
     ScreenPtr screen = crtc->pScreen;
     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
     modesettingPtr ms = modesettingPTR(scrn);
-    EntityInfoPtr pEnt = ms->pEnt;
     xf86CrtcPtr xf86Crtc = crtc->devPrivate;
 
     if (!xf86Crtc)
@@ -1624,9 +1623,9 @@ msEnableSharedPixmapFlipping(RRCrtcPtr crtc, PixmapPtr front, PixmapPtr back)
         return FALSE;
 
 #ifdef XSERVER_PLATFORM_BUS
-    if (pEnt->location.type == BUS_PLATFORM) {
-        char *syspath =
-            xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
+    if (ms->pEnt->location.type == BUS_PLATFORM) {
+        const char *syspath =
+            xf86_platform_device_odev_attributes(ms->pEnt->location.id.plat)->
             syspath;
 
         /* Not supported for devices using USB transport due to misbehaved