From: Ville Syrjälä ville.syrjala@linux.intel.com
intel_enable_primary() and intel_disable_primary() are needed in the atomic mode setting code.
Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com --- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_sprite.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index cd37428..92a9518 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -730,4 +730,7 @@ extern void intel_atomic_fini(struct drm_device *dev); extern void intel_atomic_free_events(struct drm_device *dev, struct drm_file *file); extern void intel_atomic_handle_vblank(struct drm_device *dev, int pipe);
+extern void intel_enable_primary(struct drm_crtc *crtc); +extern void intel_disable_primary(struct drm_crtc *crtc); + #endif /* __INTEL_DRV_H__ */ diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 88644df..693b265 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -610,7 +610,7 @@ void intel_calc_sprite(struct drm_plane *plane, ilk_calc_plane(plane, fb, coords); }
-static void +void intel_enable_primary(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; @@ -629,7 +629,7 @@ intel_enable_primary(struct drm_crtc *crtc) dev_priv->display.commit_plane(crtc); }
-static void +void intel_disable_primary(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev;