| Message ID | 1452164052-21752-4-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 07, 2016 at 11:54:08AM +0100, Maarten Lankhorst wrote: > This is duplicated with intel_check_cursor_plane, and with all > non-atomic paths removed this should be dead code. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> I have some cursor stuff in a branch somewhere that does some of the same, but I should be able to rebase that stuff rather easily. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 63286f16a9e6..35b881d156b0 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -85,8 +85,6 @@ static const uint32_t intel_cursor_formats[] = { > DRM_FORMAT_ARGB8888, > }; > > -static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on); > - > static void i9xx_crtc_clock_get(struct intel_crtc *crtc, > struct intel_crtc_state *pipe_config); > static void ironlake_pch_clock_get(struct intel_crtc *crtc, > @@ -10201,25 +10199,13 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, > > base = intel_crtc->cursor_addr; > > - if (x >= intel_crtc->config->pipe_src_w) > - on = false; > - > - if (y >= intel_crtc->config->pipe_src_h) > - on = false; > - > if (x < 0) { > - if (x + cursor_state->crtc_w <= 0) > - on = false; > - > pos |= CURSOR_POS_SIGN << CURSOR_X_SHIFT; > x = -x; > } > pos |= x << CURSOR_X_SHIFT; > > if (y < 0) { > - if (y + cursor_state->crtc_h <= 0) > - on = false; > - > pos |= CURSOR_POS_SIGN << CURSOR_Y_SHIFT; > y = -y; > } > -- > 2.1.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 63286f16a9e6..35b881d156b0 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -85,8 +85,6 @@ static const uint32_t intel_cursor_formats[] = { DRM_FORMAT_ARGB8888, }; -static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on); - static void i9xx_crtc_clock_get(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc, @@ -10201,25 +10199,13 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc, base = intel_crtc->cursor_addr; - if (x >= intel_crtc->config->pipe_src_w) - on = false; - - if (y >= intel_crtc->config->pipe_src_h) - on = false; - if (x < 0) { - if (x + cursor_state->crtc_w <= 0) - on = false; - pos |= CURSOR_POS_SIGN << CURSOR_X_SHIFT; x = -x; } pos |= x << CURSOR_X_SHIFT; if (y < 0) { - if (y + cursor_state->crtc_h <= 0) - on = false; - pos |= CURSOR_POS_SIGN << CURSOR_Y_SHIFT; y = -y; }
This is duplicated with intel_check_cursor_plane, and with all non-atomic paths removed this should be dead code. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/i915/intel_display.c | 14 -------------- 1 file changed, 14 deletions(-)