diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-03-18 18:15:34 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-03-23 18:58:54 +0900 |
| commit | da4e0c66fcbcf63143372720e3d606a462332e3a (patch) | |
| tree | a7838d0e45711467b599726845460d574a748190 /src | |
| parent | 0bbf09dd7ef54133b3e534becb3ba15c0cf3eed2 (diff) | |
Consolidate pScreen usage in drmmode_set_mode_major
We were already relying on pScrn->pScreen being non-NULL in some cases,
which is supposedly always true ever since this function is no longer
getting called from ScreenInit.
(Ported from radeon commit eb611a2e4ecce7a1ab85fd72b9b78e3269311dd5)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drmmode_display.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 9a2c70b..67cfe8a 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -571,6 +571,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, int x, int y) { ScrnInfoPtr pScrn = crtc->scrn; + ScreenPtr pScreen = pScrn->pScreen; AMDGPUInfoPtr info = AMDGPUPTR(pScrn); AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); @@ -622,8 +623,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, goto done; } - ScreenPtr pScreen = pScrn->pScreen; - for (i = 0; i < xf86_config->num_output; i++) { xf86OutputPtr output = xf86_config->output[i]; drmmode_output_private_ptr drmmode_output; @@ -719,8 +718,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, } else ret = TRUE; - if (crtc->scrn->pScreen) - xf86CrtcSetScreenSubpixelOrder(crtc->scrn->pScreen); + if (pScreen) + xf86CrtcSetScreenSubpixelOrder(pScreen); drmmode_crtc->need_modeset = FALSE; @@ -735,9 +734,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, } } - if (pScrn->pScreen && - !xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) - xf86_reload_cursors(pScrn->pScreen); + if (!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) + xf86_reload_cursors(pScreen); done: free(output_ids); |