| Message ID | 20171222192231.17981-9-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2017-12-22 at 21:22 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > The core now checks that the plane supports the fb's format+modifier > combination, so we can drop the related checks from > skl_check_ccs_aux_surface(). These checks were specific to > SKL/KBL/BXT anyway. > > Cc: Ben Widawsky <ben@bwidawsk.net> > Cc: Jason Ekstrand <jason@jlekstrand.net> > Cc: Daniel Stone <daniels@collabora.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index df29e33a2355..a037892ec92b 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3033,9 +3033,6 @@ static int skl_check_nv12_aux_surface(struct > intel_plane_state *plane_state) > > static int skl_check_ccs_aux_surface(struct intel_plane_state > *plane_state) > { > - struct intel_plane *plane = to_intel_plane(plane_state- > >base.plane); > - struct drm_i915_private *dev_priv = to_i915(plane- > >base.dev); > - struct intel_crtc *crtc = to_intel_crtc(plane_state- > >base.crtc); > const struct drm_framebuffer *fb = plane_state->base.fb; > int src_x = plane_state->base.src.x1 >> 16; > int src_y = plane_state->base.src.y1 >> 16; > @@ -3045,11 +3042,6 @@ static int skl_check_ccs_aux_surface(struct > intel_plane_state *plane_state) > int y = src_y / vsub; > u32 offset; > > - if (!skl_plane_has_ccs(dev_priv, crtc->pipe, plane->id)) { > - DRM_DEBUG_KMS("No RC support on %s\n", plane- > >base.name); > - return -EINVAL; > - } > - > if (plane_state->base.rotation & ~(DRM_MODE_ROTATE_0 | > DRM_MODE_ROTATE_180)) { > DRM_DEBUG_KMS("RC support only with 0/180 degree > rotation %x\n", > plane_state->base.rotation);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index df29e33a2355..a037892ec92b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3033,9 +3033,6 @@ static int skl_check_nv12_aux_surface(struct intel_plane_state *plane_state) static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state) { - struct intel_plane *plane = to_intel_plane(plane_state->base.plane); - struct drm_i915_private *dev_priv = to_i915(plane->base.dev); - struct intel_crtc *crtc = to_intel_crtc(plane_state->base.crtc); const struct drm_framebuffer *fb = plane_state->base.fb; int src_x = plane_state->base.src.x1 >> 16; int src_y = plane_state->base.src.y1 >> 16; @@ -3045,11 +3042,6 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state) int y = src_y / vsub; u32 offset; - if (!skl_plane_has_ccs(dev_priv, crtc->pipe, plane->id)) { - DRM_DEBUG_KMS("No RC support on %s\n", plane->base.name); - return -EINVAL; - } - if (plane_state->base.rotation & ~(DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180)) { DRM_DEBUG_KMS("RC support only with 0/180 degree rotation %x\n", plane_state->base.rotation);