* [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state()
@ 2013-10-09 14:24 ville.syrjala
2013-10-09 14:24 ` [PATCH 2/2] drm/i915: Rename primary_disabled to primary_enabled ville.syrjala
2013-10-10 8:27 ` [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() Ville Syrjälä
0 siblings, 2 replies; 5+ messages in thread
From: ville.syrjala @ 2013-10-09 14:24 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Make sure our primary_disabled matches our expectations after driver
init.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70270
Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1816c46..debbd06 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10702,6 +10702,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
&crtc->config);
crtc->base.enabled = crtc->active;
+ crtc->primary_disabled = !crtc->active;
DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",
crtc->base.base.id,
--
1.8.1.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/i915: Rename primary_disabled to primary_enabled
2013-10-09 14:24 [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() ville.syrjala
@ 2013-10-09 14:24 ` ville.syrjala
2013-10-10 8:35 ` Jani Nikula
2013-10-10 8:27 ` [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() Ville Syrjälä
1 sibling, 1 reply; 5+ messages in thread
From: ville.syrjala @ 2013-10-09 14:24 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Let's try to avoid these confusing negated booleans.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
drivers/gpu/drm/i915/intel_drv.h | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 2 +-
drivers/gpu/drm/i915/intel_sprite.c | 8 ++++----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index debbd06..27f98bc 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1840,9 +1840,9 @@ static void intel_enable_primary_plane(struct drm_i915_private *dev_priv,
/* If the pipe isn't enabled, we can't pump pixels and may hang */
assert_pipe_enabled(dev_priv, pipe);
- WARN(!intel_crtc->primary_disabled, "Primary plane already enabled\n");
+ WARN(intel_crtc->primary_enabled, "Primary plane already enabled\n");
- intel_crtc->primary_disabled = false;
+ intel_crtc->primary_enabled = true;
reg = DSPCNTR(plane);
val = I915_READ(reg);
@@ -1870,9 +1870,9 @@ static void intel_disable_primary_plane(struct drm_i915_private *dev_priv,
int reg;
u32 val;
- WARN(intel_crtc->primary_disabled, "Primary plane already disabled\n");
+ WARN(!intel_crtc->primary_enabled, "Primary plane already disabled\n");
- intel_crtc->primary_disabled = true;
+ intel_crtc->primary_enabled = false;
reg = DSPCNTR(plane);
val = I915_READ(reg);
@@ -10702,7 +10702,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
&crtc->config);
crtc->base.enabled = crtc->active;
- crtc->primary_disabled = !crtc->active;
+ crtc->primary_enabled = crtc->active;
DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",
crtc->base.base.id,
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 944a406..28f3800d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -321,7 +321,7 @@ struct intel_crtc {
*/
bool active;
bool eld_vld;
- bool primary_disabled; /* is the crtc obscured by a plane? */
+ bool primary_enabled; /* is the primary plane (partially) visible? */
bool lowfreq_avail;
struct intel_overlay *overlay;
struct intel_unpin_work *unpin_work;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 77d63cf..271dcb9 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -475,7 +475,7 @@ void intel_update_fbc(struct drm_device *dev)
*/
list_for_each_entry(tmp_crtc, &dev->mode_config.crtc_list, head) {
if (intel_crtc_active(tmp_crtc) &&
- !to_intel_crtc(tmp_crtc)->primary_disabled) {
+ to_intel_crtc(tmp_crtc)->primary_enabled) {
if (crtc) {
if (set_no_fbc_reason(dev_priv, FBC_MULTIPLE_PIPES))
DRM_DEBUG_KMS("more than one pipe active, disabling compression\n");
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index e001d2c..8afaad6 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -521,10 +521,10 @@ intel_enable_primary(struct drm_crtc *crtc)
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int reg = DSPCNTR(intel_crtc->plane);
- if (!intel_crtc->primary_disabled)
+ if (intel_crtc->primary_enabled)
return;
- intel_crtc->primary_disabled = false;
+ intel_crtc->primary_enabled = true;
I915_WRITE(reg, I915_READ(reg) | DISPLAY_PLANE_ENABLE);
intel_flush_primary_plane(dev_priv, intel_crtc->plane);
@@ -553,10 +553,10 @@ intel_disable_primary(struct drm_crtc *crtc)
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int reg = DSPCNTR(intel_crtc->plane);
- if (intel_crtc->primary_disabled)
+ if (!intel_crtc->primary_enabled)
return;
- intel_crtc->primary_disabled = true;
+ intel_crtc->primary_enabled = false;
mutex_lock(&dev->struct_mutex);
if (dev_priv->fbc.plane == intel_crtc->plane)
--
1.8.1.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state()
2013-10-09 14:24 [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() ville.syrjala
2013-10-09 14:24 ` [PATCH 2/2] drm/i915: Rename primary_disabled to primary_enabled ville.syrjala
@ 2013-10-10 8:27 ` Ville Syrjälä
1 sibling, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2013-10-10 8:27 UTC (permalink / raw)
To: intel-gfx
On Wed, Oct 09, 2013 at 05:24:57PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Make sure our primary_disabled matches our expectations after driver
> init.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70270
> Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Also
Tested-by: shui yangwei <yangweix.shui@intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 1816c46..debbd06 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10702,6 +10702,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
> &crtc->config);
>
> crtc->base.enabled = crtc->active;
> + crtc->primary_disabled = !crtc->active;
>
> DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",
> crtc->base.base.id,
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915: Rename primary_disabled to primary_enabled
2013-10-09 14:24 ` [PATCH 2/2] drm/i915: Rename primary_disabled to primary_enabled ville.syrjala
@ 2013-10-10 8:35 ` Jani Nikula
2013-10-10 8:57 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2013-10-10 8:35 UTC (permalink / raw)
To: ville.syrjala, intel-gfx
On Wed, 09 Oct 2013, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Let's try to avoid these confusing negated booleans.
Thanks for such a positive patch!
For the series,
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
> drivers/gpu/drm/i915/intel_drv.h | 2 +-
> drivers/gpu/drm/i915/intel_pm.c | 2 +-
> drivers/gpu/drm/i915/intel_sprite.c | 8 ++++----
> 4 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index debbd06..27f98bc 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1840,9 +1840,9 @@ static void intel_enable_primary_plane(struct drm_i915_private *dev_priv,
> /* If the pipe isn't enabled, we can't pump pixels and may hang */
> assert_pipe_enabled(dev_priv, pipe);
>
> - WARN(!intel_crtc->primary_disabled, "Primary plane already enabled\n");
> + WARN(intel_crtc->primary_enabled, "Primary plane already enabled\n");
>
> - intel_crtc->primary_disabled = false;
> + intel_crtc->primary_enabled = true;
>
> reg = DSPCNTR(plane);
> val = I915_READ(reg);
> @@ -1870,9 +1870,9 @@ static void intel_disable_primary_plane(struct drm_i915_private *dev_priv,
> int reg;
> u32 val;
>
> - WARN(intel_crtc->primary_disabled, "Primary plane already disabled\n");
> + WARN(!intel_crtc->primary_enabled, "Primary plane already disabled\n");
>
> - intel_crtc->primary_disabled = true;
> + intel_crtc->primary_enabled = false;
>
> reg = DSPCNTR(plane);
> val = I915_READ(reg);
> @@ -10702,7 +10702,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
> &crtc->config);
>
> crtc->base.enabled = crtc->active;
> - crtc->primary_disabled = !crtc->active;
> + crtc->primary_enabled = crtc->active;
>
> DRM_DEBUG_KMS("[CRTC:%d] hw state readout: %s\n",
> crtc->base.base.id,
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 944a406..28f3800d 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -321,7 +321,7 @@ struct intel_crtc {
> */
> bool active;
> bool eld_vld;
> - bool primary_disabled; /* is the crtc obscured by a plane? */
> + bool primary_enabled; /* is the primary plane (partially) visible? */
> bool lowfreq_avail;
> struct intel_overlay *overlay;
> struct intel_unpin_work *unpin_work;
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 77d63cf..271dcb9 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -475,7 +475,7 @@ void intel_update_fbc(struct drm_device *dev)
> */
> list_for_each_entry(tmp_crtc, &dev->mode_config.crtc_list, head) {
> if (intel_crtc_active(tmp_crtc) &&
> - !to_intel_crtc(tmp_crtc)->primary_disabled) {
> + to_intel_crtc(tmp_crtc)->primary_enabled) {
> if (crtc) {
> if (set_no_fbc_reason(dev_priv, FBC_MULTIPLE_PIPES))
> DRM_DEBUG_KMS("more than one pipe active, disabling compression\n");
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index e001d2c..8afaad6 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -521,10 +521,10 @@ intel_enable_primary(struct drm_crtc *crtc)
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> int reg = DSPCNTR(intel_crtc->plane);
>
> - if (!intel_crtc->primary_disabled)
> + if (intel_crtc->primary_enabled)
> return;
>
> - intel_crtc->primary_disabled = false;
> + intel_crtc->primary_enabled = true;
>
> I915_WRITE(reg, I915_READ(reg) | DISPLAY_PLANE_ENABLE);
> intel_flush_primary_plane(dev_priv, intel_crtc->plane);
> @@ -553,10 +553,10 @@ intel_disable_primary(struct drm_crtc *crtc)
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> int reg = DSPCNTR(intel_crtc->plane);
>
> - if (intel_crtc->primary_disabled)
> + if (!intel_crtc->primary_enabled)
> return;
>
> - intel_crtc->primary_disabled = true;
> + intel_crtc->primary_enabled = false;
>
> mutex_lock(&dev->struct_mutex);
> if (dev_priv->fbc.plane == intel_crtc->plane)
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] drm/i915: Rename primary_disabled to primary_enabled
2013-10-10 8:35 ` Jani Nikula
@ 2013-10-10 8:57 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2013-10-10 8:57 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Thu, Oct 10, 2013 at 11:35:24AM +0300, Jani Nikula wrote:
> On Wed, 09 Oct 2013, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > Let's try to avoid these confusing negated booleans.
>
> Thanks for such a positive patch!
>
> For the series,
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Both merged, thanks for patches&review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-10-10 8:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-09 14:24 [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() ville.syrjala
2013-10-09 14:24 ` [PATCH 2/2] drm/i915: Rename primary_disabled to primary_enabled ville.syrjala
2013-10-10 8:35 ` Jani Nikula
2013-10-10 8:57 ` Daniel Vetter
2013-10-10 8:27 ` [PATCH 1/2] drm/i915: Populate primary_disabled in intel_modeset_readout_hw_state() Ville Syrjälä
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox