From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
The remaining cursor base address calculations are spread
around into several different locations. Just pull it all
into one place.
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_display.c | 54 +++++++++++++++++++++---------------
1 file changed, 32 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c3e064af3b43..b884c0d5bbb3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9153,6 +9153,31 @@ static bool haswell_get_pipe_config(struct intel_crtc *crtc,
return active;
}
+static u32 intel_cursor_base(struct intel_crtc *crtc,
+ struct intel_plane *plane,
+ const struct intel_plane_state *plane_state)
+{
+ struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
+ const struct drm_framebuffer *fb = plane_state->base.fb;
+ const struct drm_i915_gem_object *obj = intel_fb_obj(fb);
+ u32 base;
+
+ if (INTEL_INFO(dev_priv)->cursor_needs_physical)
+ base = obj->phys_handle->busaddr;
+ else
+ base = intel_plane_ggtt_offset(plane_state);
+
+ crtc->cursor_addr = base;
+
+ /* ILK+ do this automagically */
+ if (HAS_GMCH_DISPLAY(dev_priv) &&
+ plane_state->base.rotation & DRM_ROTATE_180)
+ base += (plane_state->base.crtc_h *
+ plane_state->base.crtc_w - 1) * fb->format->cpp[0];
+
+ return base;
+}
+
static void i845_update_cursor(struct drm_crtc *crtc, u32 base,
const struct intel_plane_state *plane_state)
{
@@ -9266,14 +9291,14 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base,
/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
static void intel_crtc_update_cursor(struct drm_crtc *crtc,
+ struct intel_plane *plane,
const struct intel_plane_state *plane_state)
{
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int pipe = intel_crtc->pipe;
- u32 base = intel_crtc->cursor_addr;
- u32 pos = 0;
+ u32 pos = 0, base = 0;
if (plane_state) {
int x = plane_state->base.crtc_x;
@@ -9291,12 +9316,9 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
}
pos |= y << CURSOR_Y_SHIFT;
- /* ILK+ do this automagically */
- if (HAS_GMCH_DISPLAY(dev_priv) &&
- plane_state->base.rotation & DRM_ROTATE_180) {
- base += (plane_state->base.crtc_h *
- plane_state->base.crtc_w - 1) * 4;
- }
+ base = intel_cursor_base(intel_crtc, plane, plane_state);
+ } else {
+ intel_crtc->cursor_addr = 0;
}
I915_WRITE(CURPOS(pipe), pos);
@@ -13716,8 +13738,7 @@ static void
intel_disable_cursor_plane(struct intel_plane *plane,
struct intel_crtc *crtc)
{
- crtc->cursor_addr = 0;
- intel_crtc_update_cursor(&crtc->base, NULL);
+ intel_crtc_update_cursor(&crtc->base, plane, NULL);
}
static void
@@ -13725,20 +13746,9 @@ intel_update_cursor_plane(struct intel_plane *plane,
const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *state)
{
- struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
- struct drm_i915_gem_object *obj = intel_fb_obj(state->base.fb);
- uint32_t addr;
-
- if (!obj)
- addr = 0;
- else if (!INTEL_INFO(dev_priv)->cursor_needs_physical)
- addr = intel_plane_ggtt_offset(state);
- else
- addr = obj->phys_handle->busaddr;
- crtc->cursor_addr = addr;
- intel_crtc_update_cursor(&crtc->base, state);
+ intel_crtc_update_cursor(&crtc->base, plane, state);
}
static struct intel_plane *
--
2.10.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
