From: sonika.jindal@intel.com
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: [v3 08/13] drm/i915: Make intel_plane_restore() return an error
Date: Tue, 8 Jul 2014 10:31:58 +0530 [thread overview]
Message-ID: <1404795723-9630-9-git-send-email-sonika.jindal@intel.com> (raw)
In-Reply-To: <1404795723-9630-1-git-send-email-sonika.jindal@intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Propagate the error from intel_update_plane() up through
intel_plane_restore() to the caller. This will be used for
rollback purposes when setting properties fails.
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
---
drivers/gpu/drm/i915/intel_drv.h | 2 +-
drivers/gpu/drm/i915/intel_sprite.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 67b1c59..da5a3ca 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -993,7 +993,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob);
int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane);
void intel_flush_primary_plane(struct drm_i915_private *dev_priv,
enum plane plane);
-void intel_plane_restore(struct drm_plane *plane);
+int intel_plane_restore(struct drm_plane *plane);
void intel_plane_disable(struct drm_plane *plane);
int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
struct drm_file *file_priv);
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 54d4224..cbad738 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1202,18 +1202,18 @@ out_unlock:
return ret;
}
-void intel_plane_restore(struct drm_plane *plane)
+int intel_plane_restore(struct drm_plane *plane)
{
struct intel_plane *intel_plane = to_intel_plane(plane);
if (!plane->crtc || !plane->fb)
- return;
+ return 0;
- intel_update_plane(plane, plane->crtc, plane->fb,
- intel_plane->crtc_x, intel_plane->crtc_y,
- intel_plane->crtc_w, intel_plane->crtc_h,
- intel_plane->src_x, intel_plane->src_y,
- intel_plane->src_w, intel_plane->src_h);
+ return intel_update_plane(plane, plane->crtc, plane->fb,
+ intel_plane->crtc_x, intel_plane->crtc_y,
+ intel_plane->crtc_w, intel_plane->crtc_h,
+ intel_plane->src_x, intel_plane->src_y,
+ intel_plane->src_w, intel_plane->src_h);
}
void intel_plane_disable(struct drm_plane *plane)
--
1.7.10.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-07-08 5:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-08 5:01 [v3 00/13] Support for 180 degree HW rotation sonika.jindal
2014-07-08 5:01 ` [v3 01/13] drm: Move DRM_ROTATE bits out of omapdrm into drm_crtc.h sonika.jindal
2014-07-08 5:01 ` [v3 02/13] drm: Add support_bits parameter to drm_property_create_bitmask() sonika.jindal
2014-07-08 5:01 ` [v3 03/13] drm: Add drm_mode_create_rotation_property() sonika.jindal
2014-07-08 5:01 ` [v3 04/13] drm/omap: Switch omapdrm over to drm_mode_create_rotation_property() sonika.jindal
2014-07-08 5:01 ` [v3 05/13] drm: Add drm_rect rotation functions sonika.jindal
2014-07-08 5:01 ` [v3 06/13] drm: Add drm_rotation_simplify() sonika.jindal
2014-07-08 5:01 ` [v3 07/13] drm/i915: Add 180 degree sprite rotation support sonika.jindal
2014-07-08 5:01 ` sonika.jindal [this message]
2014-07-08 5:01 ` [v3 09/13] drm/i915: Add rotation property for sprites sonika.jindal
2014-07-11 21:59 ` [Intel-gfx] " Daniel Vetter
2014-07-14 3:57 ` Jindal, Sonika
2014-07-11 22:06 ` [Intel-gfx] " Daniel Vetter
2014-07-11 22:10 ` Daniel Vetter
2014-07-08 5:02 ` [v3 10/13] drm/i915: Add 180 degree primary plane rotation support sonika.jindal
2014-07-08 5:02 ` [v3 11/13] drm: Resetting rotation property sonika.jindal
2014-07-08 5:02 ` [v3 12/13] Documentation: drm: Removing placeholders for generic drm properties description sonika.jindal
2014-07-08 5:02 ` [v3 13/13] Documentation: drm: describing rotation property for i915 sonika.jindal
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=1404795723-9630-9-git-send-email-sonika.jindal@intel.com \
--to=sonika.jindal@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox