From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
The i915 modeset logic requires that these be kept in sync with
the other crtc and encoder pointers.
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_atomic.c | 2 ++
drivers/gpu/drm/i915/intel_display.c | 2 +-
drivers/gpu/drm/i915/intel_drv.h | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index e58ec3f..c5558cc 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -1701,6 +1701,8 @@ static int intel_atomic_commit(struct drm_device *dev, void *state)
update_props(dev, s);
+ intel_modeset_update_staged_output_state(dev);
+
return 0;
}
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0eccef3..d310529 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6845,7 +6845,7 @@ static bool intel_encoder_crtc_ok(struct drm_encoder *encoder,
* Updates the staged output configuration state, e.g. after we've read out the
* current hw state.
*/
-static void intel_modeset_update_staged_output_state(struct drm_device *dev)
+void intel_modeset_update_staged_output_state(struct drm_device *dev)
{
struct intel_encoder *encoder;
struct intel_connector *connector;
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a229680..4847170 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -644,4 +644,6 @@ extern void intel_disable_primary(struct drm_crtc *crtc);
extern void intel_crtc_attach_properties(struct drm_crtc *crtc);
extern void intel_crtc_update_properties(struct drm_crtc *crtc);
+extern void intel_modeset_update_staged_output_state(struct drm_device *dev);
+
#endif /* __INTEL_DRV_H__ */
--
1.7.8.6
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
