From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH] drm/i915: add missing condition for committing planes on crtc
Date: Wed, 25 May 2016 14:20:56 +0100 [thread overview]
Message-ID: <1464182456-8167-1-git-send-email-lionel.g.landwerlin@intel.com> (raw)
The i915 driver checks for color management properties changes as part
of a plane update. Therefore a color management update must imply a
plane update, otherwise we never update the transformation matrixes
and degamma/gamma LUTs.
v2: add comment about moving the commit of color management registers
to an async worker
v3: Commit color management register right after vblank
v4: Move back color management commit condition together with planes
commit
v5: Trigger color management commit through the planes commit (Daniel)
Fixes: 20a34e78f0d7 (drm/i915: Update color management during vblank evasion.)
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
drivers/gpu/drm/i915/intel_color.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c
index 1b3f974..54a9a0d 100644
--- a/drivers/gpu/drm/i915/intel_color.c
+++ b/drivers/gpu/drm/i915/intel_color.c
@@ -509,7 +509,7 @@ int intel_color_check(struct drm_crtc *crtc,
crtc_state->degamma_lut->length == degamma_length) &&
(!crtc_state->gamma_lut ||
crtc_state->gamma_lut->length == gamma_length))
- return 0;
+ goto success;
/*
* We also allow no degamma lut and a gamma lut at the legacy
@@ -518,9 +518,19 @@ int intel_color_check(struct drm_crtc *crtc,
if (!crtc_state->degamma_lut &&
crtc_state->gamma_lut &&
crtc_state->gamma_lut->length == LEGACY_LUT_LENGTH)
- return 0;
+ goto success;
return -EINVAL;
+
+ success:
+
+ /*
+ * Changing color management on Intel hardware is handled as part of
+ * planes update.
+ */
+ crtc_state->planes_changed = true;
+
+ return 0;
}
void intel_color_init(struct drm_crtc *crtc)
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-05-25 13:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 13:20 Lionel Landwerlin [this message]
2016-05-25 13:52 ` ✗ Ro.CI.BAT: failure for drm/i915: add missing condition for committing planes on crtc (rev5) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2016-05-25 13:30 [PATCH] drm/i915: add missing condition for committing planes on crtc Lionel Landwerlin
2016-05-09 14:40 Lionel Landwerlin
2016-05-11 10:51 ` Maarten Lankhorst
2016-05-12 10:31 ` Lionel Landwerlin
2016-05-17 7:28 ` Daniel Vetter
2016-05-04 13:40 Lionel Landwerlin
2016-05-04 14:30 ` Ville Syrjälä
2016-05-05 14:04 ` Lionel Landwerlin
2016-05-06 10:52 ` Ville Syrjälä
2016-05-09 7:41 ` Daniel Vetter
2016-05-04 11:13 Lionel Landwerlin
2016-05-09 7:37 ` Daniel Vetter
2016-04-08 16:30 Lionel Landwerlin
2016-04-18 11:05 ` Lionel Landwerlin
2016-04-21 13:30 ` Maarten Lankhorst
2016-04-21 13:57 ` Ville Syrjälä
2016-05-04 10:25 ` Lionel Landwerlin
2016-05-04 10:30 ` Maarten Lankhorst
2016-05-04 11:41 ` Ville Syrjälä
2016-04-18 11:06 ` Maarten Lankhorst
2016-04-18 11:28 ` Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464182456-8167-1-git-send-email-lionel.g.landwerlin@intel.com \
--to=lionel.g.landwerlin@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.