diff options
| author | Dave Airlie <airlied@gmail.com> | 2016-04-29 14:01:32 +1000 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2016-06-21 12:10:28 +0200 |
| commit | 69f9319568609f23cf313995cd65400180de9345 (patch) | |
| tree | 7a3f8086e6281c41ff837510bccfec3ae8f06a21 | |
| parent | 5b4ced6d3a4c309e1792ac49017fb961a7262e7f (diff) | |
xf86Crtc: don't set the root window property on slave GPUs.
Slave GPUs don't have a root window to set this on, so don't.
This fixes some crashes I saw just playing around.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 258588224d6b35de12f97d9092efa5cb3e426550)
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 6091b5e5b..4a13c1329 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -3285,7 +3285,8 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon) } /* Set the DDC properties for the 'compat' output */ - if (output == xf86CompatOutput(scrn)) + /* GPU screens don't have a root window */ + if (output == xf86CompatOutput(scrn) && !scrn->is_gpu) xf86SetDDCproperties(scrn, edid_mon); #ifdef RANDR_12_INTERFACE |