mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 02:32:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Use helper to set CRTC state's mode

Browse Source 
We need to call drm_atomic_set_mode_for_crtc() rather than copying the
mode in manually.  As of commit

        commit 99cf4a29fa
        Author: Daniel Stone <daniels@collabora.com>
        Date:   Mon May 25 19:11:51 2015 +0100

            drm/atomic: Add current-mode blob to CRTC state

the helper now also takes care of setting up the mode property blob for
us; if we don't use the helper and never setup the mode blob, this will
also trigger a failure in drm_atomic_crtc_check() when we have the
DRIVER_ATOMIC flag set (i.e., when using the nuclear pageflip support
via i915.nuclear_pageflip kernel command line parameter).

Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Matt Roper
2015-06-05 15:08:24 -07:00
committed by Daniel Vetter
parent e7d66d89bc
commit ce52299ca6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/intel_display.c
View File

@@ -13264,8 +13264,9 @@ intel_modeset_stage_output_state(struct drm_device *dev,
if (IS_ERR(crtc_state))
return PTR_ERR(crtc_state);
if (set->mode)
drm_mode_copy(&crtc_state->mode, set->mode);
ret = drm_atomic_set_mode_for_crtc(crtc_state, set->mode);
if (ret)
return ret;
if (set->num_connectors)
crtc_state->active = true;