* [Intel-gfx] [PATCH 1/4] drm/i915: s/icl_is_nv12_y_plane/icl_is_sdr_y_plane/
@ 2019-10-31 10:59 ` Ville Syrjala
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjala @ 2019-10-31 10:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Rename icl_is_nv12_y_plane() to icl_is_sdr_y_plane() to that it
matches the format array definitions in the code.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 2 +-
drivers/gpu/drm/i915/display/intel_sprite.c | 4 ++--
drivers/gpu/drm/i915/display/intel_sprite.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index a23375621185..8e1160f8d988 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -11955,7 +11955,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
continue;
for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, linked) {
- if (!icl_is_nv12_y_plane(linked->id))
+ if (!icl_is_sdr_y_plane(linked->id))
continue;
if (crtc_state->active_planes & BIT(linked->id))
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index edc41fc40726..9a2ec2c5f890 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -2855,7 +2855,7 @@ static const u32 *icl_get_plane_formats(struct drm_i915_private *dev_priv,
if (icl_is_hdr_plane(dev_priv, plane_id)) {
*num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
return icl_hdr_plane_formats;
- } else if (icl_is_nv12_y_plane(plane_id)) {
+ } else if (icl_is_sdr_y_plane(plane_id)) {
*num_formats = ARRAY_SIZE(icl_sdr_y_plane_formats);
return icl_sdr_y_plane_formats;
} else {
@@ -2916,7 +2916,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
plane->get_hw_state = skl_plane_get_hw_state;
plane->check_plane = skl_plane_check;
plane->min_cdclk = skl_plane_min_cdclk;
- if (icl_is_nv12_y_plane(plane_id))
+ if (icl_is_sdr_y_plane(plane_id))
plane->update_slave = icl_update_slave;
if (INTEL_GEN(dev_priv) >= 11)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
index 5eeaa92420d1..965abc8a57cc 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.h
+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
@@ -32,7 +32,7 @@ struct intel_plane *
skl_universal_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id);
-static inline bool icl_is_nv12_y_plane(enum plane_id id)
+static inline bool icl_is_sdr_y_plane(enum plane_id id)
{
/* Don't need to do a gen check, these planes are only available on gen11 */
if (id == PLANE_SPRITE4 || id == PLANE_SPRITE5)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/4] drm/i915: Introduce icl_sdr_y_plane_mask()
@ 2019-10-31 10:59 ` Ville Syrjala
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjala @ 2019-10-31 10:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Just like we have icl_hdr_plane_mask() let's introduce
icl_sdr_y_plane_mask(). This should make future changes to
the set of supported planes easier.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sprite.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
index 965abc8a57cc..f38cc46ab282 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.h
+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
@@ -32,13 +32,14 @@ struct intel_plane *
skl_universal_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id);
+static inline u8 icl_sdr_y_plane_mask(void)
+{
+ return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+}
+
static inline bool icl_is_sdr_y_plane(enum plane_id id)
{
- /* Don't need to do a gen check, these planes are only available on gen11 */
- if (id == PLANE_SPRITE4 || id == PLANE_SPRITE5)
- return true;
-
- return false;
+ return icl_sdr_y_plane_mask() & BIT(id);
}
static inline u8 icl_hdr_plane_mask(void)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Intel-gfx] [PATCH 2/4] drm/i915: Introduce icl_sdr_y_plane_mask()
@ 2019-10-31 10:59 ` Ville Syrjala
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjala @ 2019-10-31 10:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Just like we have icl_hdr_plane_mask() let's introduce
icl_sdr_y_plane_mask(). This should make future changes to
the set of supported planes easier.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sprite.h | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
index 965abc8a57cc..f38cc46ab282 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.h
+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
@@ -32,13 +32,14 @@ struct intel_plane *
skl_universal_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id);
+static inline u8 icl_sdr_y_plane_mask(void)
+{
+ return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+}
+
static inline bool icl_is_sdr_y_plane(enum plane_id id)
{
- /* Don't need to do a gen check, these planes are only available on gen11 */
- if (id == PLANE_SPRITE4 || id == PLANE_SPRITE5)
- return true;
-
- return false;
+ return icl_sdr_y_plane_mask() & BIT(id);
}
static inline u8 icl_hdr_plane_mask(void)
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] drm/i915: Move icl_is_hdr_plane() next to its cousins
@ 2019-10-31 10:59 ` Ville Syrjala
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjala @ 2019-10-31 10:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
All the other icl plane type check stuff lives in intel_sprite.h
so move icl_is_hdr_plane() there as well.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sprite.c | 6 ------
drivers/gpu/drm/i915/display/intel_sprite.h | 7 ++++++-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index 9a2ec2c5f890..ba344d9e2e19 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -316,12 +316,6 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
return 0;
}
-bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id)
-{
- return INTEL_GEN(dev_priv) >= 11 &&
- icl_hdr_plane_mask() & BIT(plane_id);
-}
-
static void
skl_plane_ratio(const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state,
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
index f38cc46ab282..ffb03ee640ed 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.h
+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
@@ -48,7 +48,12 @@ static inline u8 icl_hdr_plane_mask(void)
BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
}
-bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id);
+static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,
+ enum plane_id plane_id)
+{
+ return INTEL_GEN(dev_priv) >= 11 &&
+ icl_hdr_plane_mask() & BIT(plane_id);
+}
int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Intel-gfx] [PATCH 3/4] drm/i915: Move icl_is_hdr_plane() next to its cousins
@ 2019-10-31 10:59 ` Ville Syrjala
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjala @ 2019-10-31 10:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
All the other icl plane type check stuff lives in intel_sprite.h
so move icl_is_hdr_plane() there as well.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_sprite.c | 6 ------
drivers/gpu/drm/i915/display/intel_sprite.h | 7 ++++++-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index 9a2ec2c5f890..ba344d9e2e19 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -316,12 +316,6 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
return 0;
}
-bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id)
-{
- return INTEL_GEN(dev_priv) >= 11 &&
- icl_hdr_plane_mask() & BIT(plane_id);
-}
-
static void
skl_plane_ratio(const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state,
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
index f38cc46ab282..ffb03ee640ed 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.h
+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
@@ -48,7 +48,12 @@ static inline u8 icl_hdr_plane_mask(void)
BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
}
-bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id);
+static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,
+ enum plane_id plane_id)
+{
+ return INTEL_GEN(dev_priv) >= 11 &&
+ icl_hdr_plane_mask() & BIT(plane_id);
+}
int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state);
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4] drm/i915: Plump dev_priv all the way to icl_{hdr, sdr_y}_plane_mask()
@ 2019-10-31 10:59 ` Ville Syrjala
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjala @ 2019-10-31 10:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We're going to need platforms specific decisions in
icl_sdr_y_plane_mask(), so let's plumb dev_priv all the way
down. For consistency we'll do the same for icl_hdr_plane_mask().
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
drivers/gpu/drm/i915/display/intel_sprite.c | 4 ++--
drivers/gpu/drm/i915/display/intel_sprite.h | 24 ++++++++++++--------
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 8e1160f8d988..b690ea26cc89 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -9613,7 +9613,7 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state)
PIPEMISC_YUV420_MODE_FULL_BLEND;
if (INTEL_GEN(dev_priv) >= 11 &&
- (crtc_state->active_planes & ~(icl_hdr_plane_mask() |
+ (crtc_state->active_planes & ~(icl_hdr_plane_mask(dev_priv) |
BIT(PLANE_CURSOR))) == 0)
val |= PIPEMISC_HDR_MODE_PRECISION;
@@ -11955,7 +11955,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
continue;
for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, linked) {
- if (!icl_is_sdr_y_plane(linked->id))
+ if (!icl_is_sdr_y_plane(dev_priv, linked->id))
continue;
if (crtc_state->active_planes & BIT(linked->id))
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index ba344d9e2e19..b486287b9fb1 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -2849,7 +2849,7 @@ static const u32 *icl_get_plane_formats(struct drm_i915_private *dev_priv,
if (icl_is_hdr_plane(dev_priv, plane_id)) {
*num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
return icl_hdr_plane_formats;
- } else if (icl_is_sdr_y_plane(plane_id)) {
+ } else if (icl_is_sdr_y_plane(dev_priv, plane_id)) {
*num_formats = ARRAY_SIZE(icl_sdr_y_plane_formats);
return icl_sdr_y_plane_formats;
} else {
@@ -2910,7 +2910,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
plane->get_hw_state = skl_plane_get_hw_state;
plane->check_plane = skl_plane_check;
plane->min_cdclk = skl_plane_min_cdclk;
- if (icl_is_sdr_y_plane(plane_id))
+ if (icl_is_sdr_y_plane(dev_priv, plane_id))
plane->update_slave = icl_update_slave;
if (INTEL_GEN(dev_priv) >= 11)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
index ffb03ee640ed..d9efac5e157f 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.h
+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
@@ -32,27 +32,33 @@ struct intel_plane *
skl_universal_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id);
-static inline u8 icl_sdr_y_plane_mask(void)
+static inline u8 icl_sdr_y_plane_mask(struct drm_i915_private *dev_priv)
{
- return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+ if (INTEL_GEN(dev_priv) >= 11)
+ return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+ else
+ return 0;
}
-static inline bool icl_is_sdr_y_plane(enum plane_id id)
+static inline bool icl_is_sdr_y_plane(struct drm_i915_private *dev_priv,
+ enum plane_id plane_id)
{
- return icl_sdr_y_plane_mask() & BIT(id);
+ return icl_sdr_y_plane_mask(dev_priv) & BIT(plane_id);
}
-static inline u8 icl_hdr_plane_mask(void)
+static inline u8 icl_hdr_plane_mask(struct drm_i915_private *dev_priv)
{
- return BIT(PLANE_PRIMARY) |
- BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
+ if (INTEL_GEN(dev_priv) >= 11)
+ return BIT(PLANE_PRIMARY) |
+ BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
+ else
+ return 0;
}
static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,
enum plane_id plane_id)
{
- return INTEL_GEN(dev_priv) >= 11 &&
- icl_hdr_plane_mask() & BIT(plane_id);
+ return icl_hdr_plane_mask(dev_priv) & BIT(plane_id);
}
int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Intel-gfx] [PATCH 4/4] drm/i915: Plump dev_priv all the way to icl_{hdr, sdr_y}_plane_mask()
@ 2019-10-31 10:59 ` Ville Syrjala
0 siblings, 0 replies; 12+ messages in thread
From: Ville Syrjala @ 2019-10-31 10:59 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
We're going to need platforms specific decisions in
icl_sdr_y_plane_mask(), so let's plumb dev_priv all the way
down. For consistency we'll do the same for icl_hdr_plane_mask().
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
drivers/gpu/drm/i915/display/intel_sprite.c | 4 ++--
drivers/gpu/drm/i915/display/intel_sprite.h | 24 ++++++++++++--------
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 8e1160f8d988..b690ea26cc89 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -9613,7 +9613,7 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state)
PIPEMISC_YUV420_MODE_FULL_BLEND;
if (INTEL_GEN(dev_priv) >= 11 &&
- (crtc_state->active_planes & ~(icl_hdr_plane_mask() |
+ (crtc_state->active_planes & ~(icl_hdr_plane_mask(dev_priv) |
BIT(PLANE_CURSOR))) == 0)
val |= PIPEMISC_HDR_MODE_PRECISION;
@@ -11955,7 +11955,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
continue;
for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, linked) {
- if (!icl_is_sdr_y_plane(linked->id))
+ if (!icl_is_sdr_y_plane(dev_priv, linked->id))
continue;
if (crtc_state->active_planes & BIT(linked->id))
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index ba344d9e2e19..b486287b9fb1 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -2849,7 +2849,7 @@ static const u32 *icl_get_plane_formats(struct drm_i915_private *dev_priv,
if (icl_is_hdr_plane(dev_priv, plane_id)) {
*num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
return icl_hdr_plane_formats;
- } else if (icl_is_sdr_y_plane(plane_id)) {
+ } else if (icl_is_sdr_y_plane(dev_priv, plane_id)) {
*num_formats = ARRAY_SIZE(icl_sdr_y_plane_formats);
return icl_sdr_y_plane_formats;
} else {
@@ -2910,7 +2910,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
plane->get_hw_state = skl_plane_get_hw_state;
plane->check_plane = skl_plane_check;
plane->min_cdclk = skl_plane_min_cdclk;
- if (icl_is_sdr_y_plane(plane_id))
+ if (icl_is_sdr_y_plane(dev_priv, plane_id))
plane->update_slave = icl_update_slave;
if (INTEL_GEN(dev_priv) >= 11)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
index ffb03ee640ed..d9efac5e157f 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.h
+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
@@ -32,27 +32,33 @@ struct intel_plane *
skl_universal_plane_create(struct drm_i915_private *dev_priv,
enum pipe pipe, enum plane_id plane_id);
-static inline u8 icl_sdr_y_plane_mask(void)
+static inline u8 icl_sdr_y_plane_mask(struct drm_i915_private *dev_priv)
{
- return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+ if (INTEL_GEN(dev_priv) >= 11)
+ return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+ else
+ return 0;
}
-static inline bool icl_is_sdr_y_plane(enum plane_id id)
+static inline bool icl_is_sdr_y_plane(struct drm_i915_private *dev_priv,
+ enum plane_id plane_id)
{
- return icl_sdr_y_plane_mask() & BIT(id);
+ return icl_sdr_y_plane_mask(dev_priv) & BIT(plane_id);
}
-static inline u8 icl_hdr_plane_mask(void)
+static inline u8 icl_hdr_plane_mask(struct drm_i915_private *dev_priv)
{
- return BIT(PLANE_PRIMARY) |
- BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
+ if (INTEL_GEN(dev_priv) >= 11)
+ return BIT(PLANE_PRIMARY) |
+ BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
+ else
+ return 0;
}
static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,
enum plane_id plane_id)
{
- return INTEL_GEN(dev_priv) >= 11 &&
- icl_hdr_plane_mask() & BIT(plane_id);
+ return icl_hdr_plane_mask(dev_priv) & BIT(plane_id);
}
int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
--
2.23.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 4/4] drm/i915: Plump dev_priv all the way to icl_{hdr, sdr_y}_plane_mask()
@ 2019-10-31 13:46 ` Ruhl, Michael J
0 siblings, 0 replies; 12+ messages in thread
From: Ruhl, Michael J @ 2019-10-31 13:46 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
Minor nit.
s/Plump/Plumb/
M
>-----Original Message-----
>From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville
>Syrjala
>Sent: Thursday, October 31, 2019 6:59 AM
>To: intel-gfx@lists.freedesktop.org
>Subject: [Intel-gfx] [PATCH 4/4] drm/i915: Plump dev_priv all the way to
>icl_{hdr, sdr_y}_plane_mask()
>
>From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
>We're going to need platforms specific decisions in
>icl_sdr_y_plane_mask(), so let's plumb dev_priv all the way
>down. For consistency we'll do the same for icl_hdr_plane_mask().
>
>Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_sprite.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_sprite.h | 24 ++++++++++++--------
> 3 files changed, 19 insertions(+), 13 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c
>b/drivers/gpu/drm/i915/display/intel_display.c
>index 8e1160f8d988..b690ea26cc89 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -9613,7 +9613,7 @@ static void bdw_set_pipemisc(const struct
>intel_crtc_state *crtc_state)
> PIPEMISC_YUV420_MODE_FULL_BLEND;
>
> if (INTEL_GEN(dev_priv) >= 11 &&
>- (crtc_state->active_planes & ~(icl_hdr_plane_mask() |
>+ (crtc_state->active_planes & ~(icl_hdr_plane_mask(dev_priv) |
> BIT(PLANE_CURSOR))) == 0)
> val |= PIPEMISC_HDR_MODE_PRECISION;
>
>@@ -11955,7 +11955,7 @@ static int icl_check_nv12_planes(struct
>intel_crtc_state *crtc_state)
> continue;
>
> for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, linked) {
>- if (!icl_is_sdr_y_plane(linked->id))
>+ if (!icl_is_sdr_y_plane(dev_priv, linked->id))
> continue;
>
> if (crtc_state->active_planes & BIT(linked->id))
>diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c
>b/drivers/gpu/drm/i915/display/intel_sprite.c
>index ba344d9e2e19..b486287b9fb1 100644
>--- a/drivers/gpu/drm/i915/display/intel_sprite.c
>+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
>@@ -2849,7 +2849,7 @@ static const u32 *icl_get_plane_formats(struct
>drm_i915_private *dev_priv,
> if (icl_is_hdr_plane(dev_priv, plane_id)) {
> *num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
> return icl_hdr_plane_formats;
>- } else if (icl_is_sdr_y_plane(plane_id)) {
>+ } else if (icl_is_sdr_y_plane(dev_priv, plane_id)) {
> *num_formats = ARRAY_SIZE(icl_sdr_y_plane_formats);
> return icl_sdr_y_plane_formats;
> } else {
>@@ -2910,7 +2910,7 @@ skl_universal_plane_create(struct drm_i915_private
>*dev_priv,
> plane->get_hw_state = skl_plane_get_hw_state;
> plane->check_plane = skl_plane_check;
> plane->min_cdclk = skl_plane_min_cdclk;
>- if (icl_is_sdr_y_plane(plane_id))
>+ if (icl_is_sdr_y_plane(dev_priv, plane_id))
> plane->update_slave = icl_update_slave;
>
> if (INTEL_GEN(dev_priv) >= 11)
>diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h
>b/drivers/gpu/drm/i915/display/intel_sprite.h
>index ffb03ee640ed..d9efac5e157f 100644
>--- a/drivers/gpu/drm/i915/display/intel_sprite.h
>+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
>@@ -32,27 +32,33 @@ struct intel_plane *
> skl_universal_plane_create(struct drm_i915_private *dev_priv,
> enum pipe pipe, enum plane_id plane_id);
>
>-static inline u8 icl_sdr_y_plane_mask(void)
>+static inline u8 icl_sdr_y_plane_mask(struct drm_i915_private *dev_priv)
> {
>- return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
>+ if (INTEL_GEN(dev_priv) >= 11)
>+ return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
>+ else
>+ return 0;
> }
>
>-static inline bool icl_is_sdr_y_plane(enum plane_id id)
>+static inline bool icl_is_sdr_y_plane(struct drm_i915_private *dev_priv,
>+ enum plane_id plane_id)
> {
>- return icl_sdr_y_plane_mask() & BIT(id);
>+ return icl_sdr_y_plane_mask(dev_priv) & BIT(plane_id);
> }
>
>-static inline u8 icl_hdr_plane_mask(void)
>+static inline u8 icl_hdr_plane_mask(struct drm_i915_private *dev_priv)
> {
>- return BIT(PLANE_PRIMARY) |
>- BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
>+ if (INTEL_GEN(dev_priv) >= 11)
>+ return BIT(PLANE_PRIMARY) |
>+ BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
>+ else
>+ return 0;
> }
>
> static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,
> enum plane_id plane_id)
> {
>- return INTEL_GEN(dev_priv) >= 11 &&
>- icl_hdr_plane_mask() & BIT(plane_id);
>+ return icl_hdr_plane_mask(dev_priv) & BIT(plane_id);
> }
>
> int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
>--
>2.23.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [Intel-gfx] [PATCH 4/4] drm/i915: Plump dev_priv all the way to icl_{hdr, sdr_y}_plane_mask()
@ 2019-10-31 13:46 ` Ruhl, Michael J
0 siblings, 0 replies; 12+ messages in thread
From: Ruhl, Michael J @ 2019-10-31 13:46 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
Minor nit.
s/Plump/Plumb/
M
>-----Original Message-----
>From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville
>Syrjala
>Sent: Thursday, October 31, 2019 6:59 AM
>To: intel-gfx@lists.freedesktop.org
>Subject: [Intel-gfx] [PATCH 4/4] drm/i915: Plump dev_priv all the way to
>icl_{hdr, sdr_y}_plane_mask()
>
>From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
>We're going to need platforms specific decisions in
>icl_sdr_y_plane_mask(), so let's plumb dev_priv all the way
>down. For consistency we'll do the same for icl_hdr_plane_mask().
>
>Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_sprite.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_sprite.h | 24 ++++++++++++--------
> 3 files changed, 19 insertions(+), 13 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c
>b/drivers/gpu/drm/i915/display/intel_display.c
>index 8e1160f8d988..b690ea26cc89 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -9613,7 +9613,7 @@ static void bdw_set_pipemisc(const struct
>intel_crtc_state *crtc_state)
> PIPEMISC_YUV420_MODE_FULL_BLEND;
>
> if (INTEL_GEN(dev_priv) >= 11 &&
>- (crtc_state->active_planes & ~(icl_hdr_plane_mask() |
>+ (crtc_state->active_planes & ~(icl_hdr_plane_mask(dev_priv) |
> BIT(PLANE_CURSOR))) == 0)
> val |= PIPEMISC_HDR_MODE_PRECISION;
>
>@@ -11955,7 +11955,7 @@ static int icl_check_nv12_planes(struct
>intel_crtc_state *crtc_state)
> continue;
>
> for_each_intel_plane_on_crtc(&dev_priv->drm, crtc, linked) {
>- if (!icl_is_sdr_y_plane(linked->id))
>+ if (!icl_is_sdr_y_plane(dev_priv, linked->id))
> continue;
>
> if (crtc_state->active_planes & BIT(linked->id))
>diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c
>b/drivers/gpu/drm/i915/display/intel_sprite.c
>index ba344d9e2e19..b486287b9fb1 100644
>--- a/drivers/gpu/drm/i915/display/intel_sprite.c
>+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
>@@ -2849,7 +2849,7 @@ static const u32 *icl_get_plane_formats(struct
>drm_i915_private *dev_priv,
> if (icl_is_hdr_plane(dev_priv, plane_id)) {
> *num_formats = ARRAY_SIZE(icl_hdr_plane_formats);
> return icl_hdr_plane_formats;
>- } else if (icl_is_sdr_y_plane(plane_id)) {
>+ } else if (icl_is_sdr_y_plane(dev_priv, plane_id)) {
> *num_formats = ARRAY_SIZE(icl_sdr_y_plane_formats);
> return icl_sdr_y_plane_formats;
> } else {
>@@ -2910,7 +2910,7 @@ skl_universal_plane_create(struct drm_i915_private
>*dev_priv,
> plane->get_hw_state = skl_plane_get_hw_state;
> plane->check_plane = skl_plane_check;
> plane->min_cdclk = skl_plane_min_cdclk;
>- if (icl_is_sdr_y_plane(plane_id))
>+ if (icl_is_sdr_y_plane(dev_priv, plane_id))
> plane->update_slave = icl_update_slave;
>
> if (INTEL_GEN(dev_priv) >= 11)
>diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h
>b/drivers/gpu/drm/i915/display/intel_sprite.h
>index ffb03ee640ed..d9efac5e157f 100644
>--- a/drivers/gpu/drm/i915/display/intel_sprite.h
>+++ b/drivers/gpu/drm/i915/display/intel_sprite.h
>@@ -32,27 +32,33 @@ struct intel_plane *
> skl_universal_plane_create(struct drm_i915_private *dev_priv,
> enum pipe pipe, enum plane_id plane_id);
>
>-static inline u8 icl_sdr_y_plane_mask(void)
>+static inline u8 icl_sdr_y_plane_mask(struct drm_i915_private *dev_priv)
> {
>- return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
>+ if (INTEL_GEN(dev_priv) >= 11)
>+ return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
>+ else
>+ return 0;
> }
>
>-static inline bool icl_is_sdr_y_plane(enum plane_id id)
>+static inline bool icl_is_sdr_y_plane(struct drm_i915_private *dev_priv,
>+ enum plane_id plane_id)
> {
>- return icl_sdr_y_plane_mask() & BIT(id);
>+ return icl_sdr_y_plane_mask(dev_priv) & BIT(plane_id);
> }
>
>-static inline u8 icl_hdr_plane_mask(void)
>+static inline u8 icl_hdr_plane_mask(struct drm_i915_private *dev_priv)
> {
>- return BIT(PLANE_PRIMARY) |
>- BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
>+ if (INTEL_GEN(dev_priv) >= 11)
>+ return BIT(PLANE_PRIMARY) |
>+ BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
>+ else
>+ return 0;
> }
>
> static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,
> enum plane_id plane_id)
> {
>- return INTEL_GEN(dev_priv) >= 11 &&
>- icl_hdr_plane_mask() & BIT(plane_id);
>+ return icl_hdr_plane_mask(dev_priv) & BIT(plane_id);
> }
>
> int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state,
>--
>2.23.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread
* ✗ Fi.CI.BUILD: failure for series starting with [1/4] drm/i915: s/icl_is_nv12_y_plane/icl_is_sdr_y_plane/
@ 2019-10-31 11:17 ` Patchwork
0 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-10-31 11:17 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/4] drm/i915: s/icl_is_nv12_y_plane/icl_is_sdr_y_plane/
URL : https://patchwork.freedesktop.org/series/68815/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC drivers/gpu/drm/i915/display/intel_sprite.h.s
In file included from <command-line>:0:0:
./drivers/gpu/drm/i915/display/intel_sprite.h: In function ‘icl_sdr_y_plane_mask’:
./drivers/gpu/drm/i915/display/intel_sprite.h:37:6: error: implicit declaration of function ‘INTEL_GEN’; did you mean ‘INTEL_BSM’? [-Werror=implicit-function-declaration]
if (INTEL_GEN(dev_priv) >= 11)
^~~~~~~~~
INTEL_BSM
cc1: all warnings being treated as errors
scripts/Makefile.build:293: recipe for target 'drivers/gpu/drm/i915/display/intel_sprite.h.s' failed
make[5]: *** [drivers/gpu/drm/i915/display/intel_sprite.h.s] Error 1
scripts/Makefile.build:509: recipe for target 'drivers/gpu/drm/i915/display' failed
make[4]: *** [drivers/gpu/drm/i915/display] Error 2
scripts/Makefile.build:509: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:509: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:509: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1649: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread* [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/4] drm/i915: s/icl_is_nv12_y_plane/icl_is_sdr_y_plane/
@ 2019-10-31 11:17 ` Patchwork
0 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2019-10-31 11:17 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/4] drm/i915: s/icl_is_nv12_y_plane/icl_is_sdr_y_plane/
URL : https://patchwork.freedesktop.org/series/68815/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC drivers/gpu/drm/i915/display/intel_sprite.h.s
In file included from <command-line>:0:0:
./drivers/gpu/drm/i915/display/intel_sprite.h: In function ‘icl_sdr_y_plane_mask’:
./drivers/gpu/drm/i915/display/intel_sprite.h:37:6: error: implicit declaration of function ‘INTEL_GEN’; did you mean ‘INTEL_BSM’? [-Werror=implicit-function-declaration]
if (INTEL_GEN(dev_priv) >= 11)
^~~~~~~~~
INTEL_BSM
cc1: all warnings being treated as errors
scripts/Makefile.build:293: recipe for target 'drivers/gpu/drm/i915/display/intel_sprite.h.s' failed
make[5]: *** [drivers/gpu/drm/i915/display/intel_sprite.h.s] Error 1
scripts/Makefile.build:509: recipe for target 'drivers/gpu/drm/i915/display' failed
make[4]: *** [drivers/gpu/drm/i915/display] Error 2
scripts/Makefile.build:509: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:509: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:509: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1649: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 12+ messages in thread