drm/i915: Use helper to set CRTC state's mode
Subsystems (2)
PATCH 1/1 drm/i915: Use helper to set CRTC state's mode
We need to call drm_atomic_set_mode_for_crtc() rather than copying the mode in manually. As of commit
commit 99cf4a29fa24461bbfe22125967188a18383eb5c
Author: Daniel Stone <[email protected]>
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).
--- drivers/gpu/drm/i915/intel_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +3 -2
@@ -13192,8 +13192,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;
Signature · 6 lines
1.8.5.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6547 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 303/303 303/303 SNB 312/312 312/312 IVB 343/343 343/343 BYT 287/287 287/287 BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hey,
Op 06-06-15 om 00:08 schreef Matt Roper:
Quoted 9 lines
We need to call
drm_atomic_set_mode_for_crtc()rather than copying the mode in manually. As of commitcommit
99cf4a29fa24461bbfe22125967188a18383eb5c
Author: Daniel Stone <[email protected]>
Date: Mon May 25 19:11:51 2015 +0100drm/atomic: Add current-mode blob to CRTC state
Quoted 8 lines
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 theDRIVER_ATOMICflag set (i.e., when using the nuclear pageflip support via i915.nuclear_pageflip kernel command line parameter).Cc Maarten Lankhorst <[email protected]>Signed-off-by Matt Roper <[email protected]>
You're probably correct, but convert to atomic part 3 removes this code entirely. :-)
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Maarten Lankhorst
Hey,
Op 06-06-15 om 00:08 schreef Matt Roper:
Quoted 15 lines
We need to call
drm_atomic_set_mode_for_crtc()rather than copying the mode in manually. As of commitcommit
99cf4a29fa24461bbfe22125967188a18383eb5c
Author: Daniel Stone <[email protected]>
Date: Mon May 25 19:11:51 2015 +0100drm/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 theDRIVER_ATOMICflag set (i.e., when using the nuclear pageflip support via i915.nuclear_pageflip kernel command line parameter).
Quoted 3 lines
Quoted 2 lines
Cc Maarten Lankhorst <[email protected]>Signed-off-by Matt Roper <[email protected]>You're probably correct, but convert to atomic part 3 removes this code entirely. :-)
I'm probably getting confused by all the different spins of atomic conversion series now, but it looks like this is still needed, even on top of your latest "Convert to atomic, part 3" set (from June 15th); we'll end up with no mode blob which leads to warnings and failures from the DRM core if we don't apply a fix like this to use the helper function.
Matt
Quoted 2 lines
~Maarten
Signature · 9 lines
Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hey,
Op 17-06-15 om 00:12 schreef Matt Roper:
Quoted 21 lines · Maarten Lankhorst
Quoted 20 lines
Hey,
Op 06-06-15 om 00:08 schreef Matt Roper:
Quoted 17 lines
We need to call
drm_atomic_set_mode_for_crtc()rather than copying the mode in manually. As of commitcommit
99cf4a29fa24461bbfe22125967188a18383eb5c
Author: Daniel Stone <[email protected]>
Date: Mon May 25 19:11:51 2015 +0100drm/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 theDRIVER_ATOMICflag set (i.e., when using the nuclear pageflip support via i915.nuclear_pageflip kernel command line parameter).Cc Maarten Lankhorst <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 7 lines
Quoted 1 line
You're probably correct, but convert to atomic part 3 removes this code entirely. :-)
I'm probably getting confused by all the different spins of atomic conversion series now, but it looks like this is still needed, even on top of your latest "Convert to atomic, part 3" set (from June 15th); we'll end up with no mode blob which leads to warnings and failures from the DRM core if we don't apply a fix like this to use the helper function.
Oh indeed it's going to take a while for the intel-specific stuff to be removed, feel free to apply and add my r-b.
~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 24 lines · Maarten Lankhorst
Hey,
Op 17-06-15 om 00:12 schreef Matt Roper:
Quoted 21 lines · Maarten Lankhorst
Quoted 20 lines
Hey,
Op 06-06-15 om 00:08 schreef Matt Roper:
Quoted 17 lines
We need to call
drm_atomic_set_mode_for_crtc()rather than copying the mode in manually. As of commitcommit
99cf4a29fa24461bbfe22125967188a18383eb5c
Author: Daniel Stone <[email protected]>
Date: Mon May 25 19:11:51 2015 +0100drm/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 theDRIVER_ATOMICflag set (i.e., when using the nuclear pageflip support via i915.nuclear_pageflip kernel command line parameter).Cc Maarten Lankhorst <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 8 lines
Quoted 7 lines
Quoted 1 line
You're probably correct, but convert to atomic part 3 removes this code entirely. :-)
I'm probably getting confused by all the different spins of atomic conversion series now, but it looks like this is still needed, even on top of your latest "Convert to atomic, part 3" set (from June 15th); we'll end up with no mode blob which leads to warnings and failures from the DRM core if we don't apply a fix like this to use the helper function.
Oh indeed it's going to take a while for the intel-specific stuff to be removed, feel free to apply and add my r-b.
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx