UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Nuke plane->can_scale/min_downscale 

We can easily calculate the plane can_scale/min_downscale on demand.
And later on we'll probably want to start calculating these dynamically
based on the cdclk just as skl already does.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180907152413.15761-9-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä 2018-09-07 18:24:08 +03:00
parent 5d2a19507c
commit fd6e3c6c21
3 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_display.c
View File

@ -13742,12 +13742,8 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)
primary->base.state = &state->base; primary->base.state = &state->base;
primary->can_scale = false; if (INTEL_GEN(dev_priv) >= 9)
primary->max_downscale = 1;
if (INTEL_GEN(dev_priv) >= 9) {
primary->can_scale = true;
state->scaler_id = -1; state->scaler_id = -1;
}
primary->pipe = pipe; primary->pipe = pipe;
/* /*
* On gen2/3 only plane A can do FBC, but the panel fitter and LVDS * On gen2/3 only plane A can do FBC, but the panel fitter and LVDS
@ -13915,8 +13911,6 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,
cursor->base.state = &state->base; cursor->base.state = &state->base;
cursor->can_scale = false;
cursor->max_downscale = 1;
cursor->pipe = pipe; cursor->pipe = pipe;
cursor->i9xx_plane = (enum i9xx_plane_id) pipe; cursor->i9xx_plane = (enum i9xx_plane_id) pipe;
cursor->id = PLANE_CURSOR; cursor->id = PLANE_CURSOR;

2
drivers/gpu/drm/i915/intel_drv.h
View File

@ -952,10 +952,8 @@ struct intel_plane {
enum i9xx_plane_id i9xx_plane; enum i9xx_plane_id i9xx_plane;
enum plane_id id; enum plane_id id;
enum pipe pipe; enum pipe pipe;
bool can_scale;
bool has_fbc; bool has_fbc;
bool has_ccs; bool has_ccs;
int max_downscale;
uint32_t frontbuffer_bit; uint32_t frontbuffer_bit;
struct { struct {

38
drivers/gpu/drm/i915/intel_sprite.c
View File

@ -767,7 +767,7 @@ ivb_update_plane(struct intel_plane *plane,
I915_WRITE_FW(SPRLINOFF(pipe), linear_offset); I915_WRITE_FW(SPRLINOFF(pipe), linear_offset);
I915_WRITE_FW(SPRSIZE(pipe), (crtc_h << 16) | crtc_w); I915_WRITE_FW(SPRSIZE(pipe), (crtc_h << 16) | crtc_w);
if (plane->can_scale) if (IS_IVYBRIDGE(dev_priv))
I915_WRITE_FW(SPRSCALE(pipe), sprscale); I915_WRITE_FW(SPRSCALE(pipe), sprscale);
I915_WRITE_FW(SPRCTL(pipe), sprctl); I915_WRITE_FW(SPRCTL(pipe), sprctl);
I915_WRITE_FW(SPRSURF(pipe), I915_WRITE_FW(SPRSURF(pipe),
@ -788,7 +788,7 @@ ivb_disable_plane(struct intel_plane *plane, struct intel_crtc *crtc)
I915_WRITE_FW(SPRCTL(pipe), 0); I915_WRITE_FW(SPRCTL(pipe), 0);
/* Can't leave the scaler enabled... */ /* Can't leave the scaler enabled... */
if (plane->can_scale) if (IS_IVYBRIDGE(dev_priv))
I915_WRITE_FW(SPRSCALE(pipe), 0); I915_WRITE_FW(SPRSCALE(pipe), 0);
I915_WRITE_FW(SPRSURF(pipe), 0); I915_WRITE_FW(SPRSURF(pipe), 0);
@ -993,7 +993,6 @@ intel_check_sprite_plane(struct intel_crtc_state *crtc_state,
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct drm_framebuffer *fb = state->base.fb; struct drm_framebuffer *fb = state->base.fb;
int max_scale, min_scale; int max_scale, min_scale;
bool can_scale;
int ret; int ret;
uint32_t pixel_format = 0; uint32_t pixel_format = 0;
@ -1016,25 +1015,29 @@ intel_check_sprite_plane(struct intel_crtc_state *crtc_state,
return -EINVAL; return -EINVAL;
} }
/* setup can_scale, min_scale, max_scale */
if (INTEL_GEN(dev_priv) >= 9) { if (INTEL_GEN(dev_priv) >= 9) {
if (state->base.fb) if (state->base.fb)
pixel_format = state->base.fb->format->format; pixel_format = state->base.fb->format->format;
/* use scaler when colorkey is not required */ /* use scaler when colorkey is not required */
if (!state->ckey.flags) { if (!state->ckey.flags) {
can_scale = 1;
min_scale = 1; min_scale = 1;
max_scale = max_scale =
skl_max_scale(crtc, crtc_state, pixel_format); skl_max_scale(crtc, crtc_state, pixel_format);
} else { } else {
can_scale = 0;
min_scale = DRM_PLANE_HELPER_NO_SCALING; min_scale = DRM_PLANE_HELPER_NO_SCALING;
max_scale = DRM_PLANE_HELPER_NO_SCALING; max_scale = DRM_PLANE_HELPER_NO_SCALING;
} }
} else { } else {
can_scale = plane->can_scale; if (INTEL_GEN(dev_priv) < 7) {
max_scale = plane->max_downscale << 16; min_scale = 1;
min_scale = plane->can_scale ? 1 : (1 << 16); max_scale = 16 << 16;
} else if (IS_IVYBRIDGE(dev_priv)) {
min_scale = 1;
max_scale = 2 << 16;
} else {
min_scale = DRM_PLANE_HELPER_NO_SCALING;
max_scale = DRM_PLANE_HELPER_NO_SCALING;
}
} }
ret = drm_atomic_helper_check_plane_state(&state->base, ret = drm_atomic_helper_check_plane_state(&state->base,
@ -1080,8 +1083,6 @@ intel_check_sprite_plane(struct intel_crtc_state *crtc_state,
unsigned int width_bytes; unsigned int width_bytes;
int cpp = fb->format->cpp[0]; int cpp = fb->format->cpp[0];
WARN_ON(!can_scale);
width_bytes = ((src_x * cpp) & 63) + src_w * cpp; width_bytes = ((src_x * cpp) & 63) + src_w * cpp;
/* FIXME interlacing min height is 6 */ /* FIXME interlacing min height is 6 */
@ -1550,7 +1551,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
intel_plane->base.state = &state->base; intel_plane->base.state = &state->base;
if (INTEL_GEN(dev_priv) >= 9) { if (INTEL_GEN(dev_priv) >= 9) {
intel_plane->can_scale = true;
state->scaler_id = -1; state->scaler_id = -1;
intel_plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, intel_plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe,
@ -1577,9 +1577,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
plane_funcs = &skl_plane_funcs; plane_funcs = &skl_plane_funcs;
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
intel_plane->can_scale = false;
intel_plane->max_downscale = 1;
intel_plane->max_stride = i9xx_plane_max_stride; intel_plane->max_stride = i9xx_plane_max_stride;
intel_plane->update_plane = vlv_update_plane; intel_plane->update_plane = vlv_update_plane;
intel_plane->disable_plane = vlv_disable_plane; intel_plane->disable_plane = vlv_disable_plane;
@ -1591,14 +1588,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
plane_funcs = &vlv_sprite_funcs; plane_funcs = &vlv_sprite_funcs;
} else if (INTEL_GEN(dev_priv) >= 7) { } else if (INTEL_GEN(dev_priv) >= 7) {
if (IS_IVYBRIDGE(dev_priv)) {
intel_plane->can_scale = true;
intel_plane->max_downscale = 2;
} else {
intel_plane->can_scale = false;
intel_plane->max_downscale = 1;
}
intel_plane->max_stride = g4x_sprite_max_stride; intel_plane->max_stride = g4x_sprite_max_stride;
intel_plane->update_plane = ivb_update_plane; intel_plane->update_plane = ivb_update_plane;
intel_plane->disable_plane = ivb_disable_plane; intel_plane->disable_plane = ivb_disable_plane;
@ -1610,9 +1599,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,
plane_funcs = &snb_sprite_funcs; plane_funcs = &snb_sprite_funcs;
} else { } else {
intel_plane->can_scale = true;
intel_plane->max_downscale = 16;
intel_plane->max_stride = g4x_sprite_max_stride; intel_plane->max_stride = g4x_sprite_max_stride;
intel_plane->update_plane = g4x_update_plane; intel_plane->update_plane = g4x_update_plane;
intel_plane->disable_plane = g4x_disable_plane; intel_plane->disable_plane = g4x_disable_plane;