frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: remove unnecessary error message, fix zaphod leases 

I introduced this error with the MST hotplug code, but it can trigger
on zaphod setups, and is perfectly fine. There is no support for
MST/hotplug on zaphod setups currently, so we can just skip over
the dynamic connector handling here. However we shouldn't skip
over the lease handling so move it into the codepath.

Fixes: 9257b1252d ("modesetting: add dynamic connector hotplug support (MST) (v3)")
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 1cfdd1a965)
This commit is contained in:
Dave Airlie 2020-02-06 17:59:08 +01:00 committed by Michel Dänzer
parent 1c3e51daba
commit 948afd7683
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -3677,7 +3677,7 @@ drmmode_handle_uevents(int fd, void *closure)
goto out; goto out;
if (mode_res->count_crtcs != config->num_crtc) { if (mode_res->count_crtcs != config->num_crtc) {
ErrorF("number of CRTCs changed - failed to handle, %d vs %d\n", mode_res->count_crtcs, config->num_crtc); /* this triggers with Zaphod mode where we don't currently support connector hotplug or MST. */
goto out_free_res; goto out_free_res;
} }
@ -3726,15 +3726,16 @@ drmmode_handle_uevents(int fd, void *closure)
drmmode_output_init(scrn, drmmode, mode_res, i, TRUE, 0); drmmode_output_init(scrn, drmmode, mode_res, i, TRUE, 0);
} }
/* Check to see if a lessee has disappeared */
drmmode_validate_leases(scrn);
if (changed) { if (changed) {
RRSetChanged(xf86ScrnToScreen(scrn)); RRSetChanged(xf86ScrnToScreen(scrn));
RRTellChanged(xf86ScrnToScreen(scrn)); RRTellChanged(xf86ScrnToScreen(scrn));
} }
out_free_res: out_free_res:
/* Check to see if a lessee has disappeared */
drmmode_validate_leases(scrn);
drmModeFreeResources(mode_res); drmModeFreeResources(mode_res);
out: out:
RRGetInfo(xf86ScrnToScreen(scrn), TRUE); RRGetInfo(xf86ScrnToScreen(scrn), TRUE);