On Tue, Feb 05, 2019 at 07:29:21PM -0800, Kevin Strasser wrote:

Change the api in order to enable callers that can't supply a valid intel_plane pointer, as would be the case prior to calling drm_universal_plane_init.

Cc: Uma Shankar uma.shankar@intel.com Cc: Shashank Sharma shashank.sharma@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel.vetter@ffwll.ch Cc: dri-devel@lists.freedesktop.org Signed-off-by: Kevin Strasser kevin.strasser@intel.com

---

drivers/gpu/drm/i915/intel_atomic.c | 4 +++- drivers/gpu/drm/i915/intel_display.c | 5 +++-- drivers/gpu/drm/i915/intel_drv.h | 7 ++++--- drivers/gpu/drm/i915/intel_sprite.c | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 16263ad..7f824fd 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -210,6 +210,7 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta int *scaler_id) { struct drm_i915_private *dev_priv = to_i915(intel_crtc->base.dev);

• struct intel_plane *intel_plane;

s/intel_plane/plane/ here please. I'm trying to make our variable naming to be more consistent. Still ways to go as we can see from the later hunks, but at least new code should use consistent names.

Also the declaration can be moved into the if block itself.

int j; u32 mode;

@@ -232,10 +233,11 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta if (plane_state && plane_state->base.fb && plane_state->base.fb->format->is_yuv && plane_state->base.fb->format->num_planes > 1) {

• intel_plane = to_intel_plane(plane_state->base.plane);
  

  if (IS_GEN(dev_priv, 9) && !IS_GEMINILAKE(dev_priv)) { mode = SKL_PS_SCALER_MODE_NV12;

• } else if (icl_is_hdr_plane(to_intel_plane(plane_state->base.plane))) {
  

• } else if (icl_is_hdr_plane(dev_priv, intel_plane->id)) {
  /*
   * On gen11+'s HDR planes we only use the scaler for
   * scaling. They have a dedicated chroma upsampler, so
  

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4d5ec92..2d9639d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3726,7 +3726,7 @@ u32 glk_plane_color_ctl(const struct intel_crtc_state *crtc_state, plane_color_ctl |= PLANE_COLOR_PLANE_GAMMA_DISABLE; plane_color_ctl |= glk_plane_color_ctl_alpha(plane_state);

• if (fb->format->is_yuv && !icl_is_hdr_plane(plane)) {

• if (fb->format->is_yuv && !icl_is_hdr_plane(dev_priv, plane->id)) { if (plane_state->base.color_encoding == DRM_COLOR_YCBCR_BT709) plane_color_ctl |= PLANE_COLOR_CSC_MODE_YUV709_TO_RGB709; else

@@ -5052,13 +5052,14 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, { struct intel_plane *intel_plane = to_intel_plane(plane_state->base.plane);

• struct drm_i915_private *dev_priv = to_i915(intel_plane->base.dev); struct drm_framebuffer *fb = plane_state->base.fb; int ret; bool force_detach = !fb || !plane_state->base.visible; bool need_scaler = false;

  /* Pre-gen11 and SDR planes always need a scaler for planar formats. */

• if (!icl_is_hdr_plane(intel_plane) &&

• if (!icl_is_hdr_plane(dev_priv, intel_plane->id) && fb && fb->format->format == DRM_FORMAT_NV12) need_scaler = true;

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 90ba543..154901f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -2313,12 +2313,13 @@ static inline bool icl_is_nv12_y_plane(enum plane_id id) return false; }

-static inline bool icl_is_hdr_plane(struct intel_plane *plane) +static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,

• 		    enum plane_id id)
  

s/id/plane_id/ please. Again, going for consistency.

With those this is Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com

{

• if (INTEL_GEN(to_i915(plane->base.dev)) < 11)

• if (INTEL_GEN(dev_priv) < 11) return false;

• return plane->id < PLANE_SPRITE2;

• return id < PLANE_SPRITE2;

}

/* intel_tv.c */ diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index cd42e81..10b37e8 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -336,7 +336,7 @@ skl_program_scaler(struct intel_plane *plane,

/* TODO: handle sub-pixel coordinates */ if (plane_state->base.fb->format->format == DRM_FORMAT_NV12 &&

•    !icl_is_hdr_plane(plane)) {
  

•    !icl_is_hdr_plane(dev_priv, plane->id)) {
  

  y_hphase = skl_scaler_calc_phase(1, hscale, false); y_vphase = skl_scaler_calc_phase(1, vscale, false);

@@ -511,7 +511,7 @@ skl_program_plane(struct intel_plane *plane, I915_WRITE_FW(PLANE_AUX_DIST(pipe, plane_id), (plane_state->color_plane[1].offset - surf_addr) | aux_stride);

• if (icl_is_hdr_plane(plane)) {

• if (icl_is_hdr_plane(dev_priv, plane_id)) { u32 cus_ctl = 0;

  if (linked) {

@@ -536,7 +536,7 @@ skl_program_plane(struct intel_plane *plane, I915_WRITE_FW(PLANE_COLOR_CTL(pipe, plane_id), plane_state->color_ctl);

• if (fb->format->is_yuv && icl_is_hdr_plane(plane))

• if (fb->format->is_yuv && icl_is_hdr_plane(dev_priv, plane_id)) icl_program_input_csc(plane, crtc_state, plane_state);

  skl_write_plane_wm(plane, crtc_state);

-- 2.7.4

On Tue, Feb 05, 2019 at 07:29:22PM -0800, Kevin Strasser wrote:

64 bpp half float formats are supported on hdr planes only and are subject to the following restrictions:

• 90/270 rotation not supported
• Yf Tiling not supported
• Frame Buffer Compression not supported
• Color Keying not supported

v2:

• Drop handling pixel normalize register
• Don't use icl_is_hdr_plane too early

v3:

• Use refactored icl_is_hdr_plane (Ville)
• Use u32 instead of uint32_t (Ville)

Cc: Uma Shankar uma.shankar@intel.com Cc: Shashank Sharma shashank.sharma@intel.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel.vetter@ffwll.ch Cc: dri-devel@lists.freedesktop.org Signed-off-by: Kevin Strasser kevin.strasser@intel.com

Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com

---

drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++++ drivers/gpu/drm/i915/intel_sprite.c | 67 ++++++++++++++++++++++++++++++++---- 2 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2d9639d..1124502 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2668,6 +2668,18 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha) return DRM_FORMAT_RGB565; case PLANE_CTL_FORMAT_NV12: return DRM_FORMAT_NV12;

• case PLANE_CTL_FORMAT_XRGB_16161616F:

• if (rgb_order) {
  

• 	if (alpha)
  

• 		return DRM_FORMAT_ABGR16161616F;
  

• 	else
  

• 		return DRM_FORMAT_XBGR16161616F;
  

• } else {
  

• 	if (alpha)
  

• 		return DRM_FORMAT_ARGB16161616F;
  

• 	else
  

• 		return DRM_FORMAT_XRGB16161616F;
  

• }
  

  default: case PLANE_CTL_FORMAT_XRGB_8888: if (rgb_order) {

@@ -3566,6 +3578,12 @@ static u32 skl_plane_ctl_format(u32 pixel_format) return PLANE_CTL_FORMAT_YUV422 | PLANE_CTL_YUV422_VYUY; case DRM_FORMAT_NV12: return PLANE_CTL_FORMAT_NV12;

• case DRM_FORMAT_XBGR16161616F:
• case DRM_FORMAT_ABGR16161616F:

• return PLANE_CTL_FORMAT_XRGB_16161616F | PLANE_CTL_ORDER_RGBX;
  

• case DRM_FORMAT_XRGB16161616F:
• case DRM_FORMAT_ARGB16161616F:

• return PLANE_CTL_FORMAT_XRGB_16161616F;
  

  default: MISSING_CASE(pixel_format); }

@@ -5097,6 +5115,10 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, case DRM_FORMAT_UYVY: case DRM_FORMAT_VYUY: case DRM_FORMAT_NV12:

• case DRM_FORMAT_XBGR16161616F:
• case DRM_FORMAT_ABGR16161616F:
• case DRM_FORMAT_XRGB16161616F:
• case DRM_FORMAT_ARGB16161616F: break; default: DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 10b37e8..55ee677 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1450,8 +1450,6 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, /* * 90/270 is not allowed with RGB64 16:16:16:16 and * Indexed 8-bit. RGB 16-bit 5:6:5 is allowed gen11 onwards.

•  * TBD: Add RGB64 case once its added in supported format
  

•  * list.
  

  */ switch (fb->format->format) { case DRM_FORMAT_RGB565:

@@ -1459,6 +1457,10 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, break; /* fall through */ case DRM_FORMAT_C8:

• case DRM_FORMAT_XRGB16161616F:
  

• case DRM_FORMAT_XBGR16161616F:
  

• case DRM_FORMAT_ARGB16161616F:
  

• case DRM_FORMAT_ABGR16161616F:
  DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n",
  	      drm_get_format_name(fb->format->format,
  				  &format_name));
  

@@ -1774,6 +1776,45 @@ static const u32 skl_planar_formats[] = { DRM_FORMAT_NV12, };

+static const u32 icl_hdr_plane_formats[] = {

• DRM_FORMAT_C8,
• DRM_FORMAT_RGB565,
• DRM_FORMAT_XRGB8888,
• DRM_FORMAT_XBGR8888,
• DRM_FORMAT_ARGB8888,
• DRM_FORMAT_ABGR8888,
• DRM_FORMAT_XRGB2101010,
• DRM_FORMAT_XBGR2101010,
• DRM_FORMAT_XRGB16161616F,
• DRM_FORMAT_XBGR16161616F,
• DRM_FORMAT_ARGB16161616F,
• DRM_FORMAT_ABGR16161616F,
• DRM_FORMAT_YUYV,
• DRM_FORMAT_YVYU,
• DRM_FORMAT_UYVY,
• DRM_FORMAT_VYUY,

+};

+static const u32 icl_hdr_planar_formats[] = {

• DRM_FORMAT_C8,
• DRM_FORMAT_RGB565,
• DRM_FORMAT_XRGB8888,
• DRM_FORMAT_XBGR8888,
• DRM_FORMAT_ARGB8888,
• DRM_FORMAT_ABGR8888,
• DRM_FORMAT_XRGB2101010,
• DRM_FORMAT_XBGR2101010,
• DRM_FORMAT_XRGB16161616F,
• DRM_FORMAT_XBGR16161616F,
• DRM_FORMAT_ARGB16161616F,
• DRM_FORMAT_ABGR16161616F,
• DRM_FORMAT_YUYV,
• DRM_FORMAT_YVYU,
• DRM_FORMAT_UYVY,
• DRM_FORMAT_VYUY,
• DRM_FORMAT_NV12,

+};

static const u64 skl_plane_format_modifiers_noccs[] = { I915_FORMAT_MOD_Yf_TILED, I915_FORMAT_MOD_Y_TILED, @@ -1917,6 +1958,10 @@ static bool skl_plane_format_mod_supported(struct drm_plane *_plane, return true; /* fall through */ case DRM_FORMAT_C8:

• case DRM_FORMAT_XBGR16161616F:
• case DRM_FORMAT_ABGR16161616F:
• case DRM_FORMAT_XRGB16161616F:
• case DRM_FORMAT_ARGB16161616F: if (modifier == DRM_FORMAT_MOD_LINEAR || modifier == I915_FORMAT_MOD_X_TILED || modifier == I915_FORMAT_MOD_Y_TILED)

@@ -2053,11 +2098,21 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, plane->update_slave = icl_update_slave;

if (skl_plane_has_planar(dev_priv, pipe, plane_id)) {

• formats = skl_planar_formats;
  

• num_formats = ARRAY_SIZE(skl_planar_formats);
  

• if (icl_is_hdr_plane(dev_priv, plane_id)) {
  

• 	formats = icl_hdr_planar_formats;
  

• 	num_formats = ARRAY_SIZE(icl_hdr_planar_formats);
  

• } else {
  

• 	formats = skl_planar_formats;
  

• 	num_formats = ARRAY_SIZE(skl_planar_formats);
  

• }
  

  } else {

• formats = skl_plane_formats;
  

• num_formats = ARRAY_SIZE(skl_plane_formats);
  

• if (icl_is_hdr_plane(dev_priv, plane_id)) {
  

• 	formats = icl_hdr_plane_formats;
  

• 	num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
  

• } else {
  

• 	formats = skl_plane_formats;
  

• 	num_formats = ARRAY_SIZE(skl_plane_formats);
  

• }
  

  }

  plane->has_ccs = skl_plane_has_ccs(dev_priv, pipe, plane_id);

-- 2.7.4