Re: [Intel-gfx] [PATCH] drm/i915: overlay: kill one more unnecessary uninterruptible sleep
On Thu, Oct 08, 2009 at 10:11:40AM -0700, Eric Anholt wrote: On Sun, 2009-10-04 at 15:00 +0200, Daniel Vetter wrote: I've simply overlooked one case in the conversion to interruptible sleeps. Rectify this. Also delete a leftover debug printk. OK, I'm confused about what this patch is about. I thought you were going to check if the patch series I applied was the right one or not, given that it was older than your comment please pull my tree instead of the patch series I sent out on IRC. [Sorry for the long delay, I was offline last week and then my mail server fried itselft. Hope I haven't missed anything else.] Trying to unconfuse: The patch series you merged is indeed older than the one I've talked about in irc. But I screwed up and pushed an even older version to gitorious. Instead of pushing my local stuff again, I've simply created this delta patch. If you apply this on top of what you have already merged in drm-intel/drm-overlay, you get exactly the version I've ment on irc. Yours, Daniel btw: I've just noticed that you merged my ddx stuff, thanks. Now that the ums overlay support is gone, there are still some ugly leftovers. I'm cooking patches atm. -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: 079 365 57 48 -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [PATCH] drm/i915: overlay: kill one more unnecessary uninterruptible sleep
On Sun, 2009-10-04 at 15:00 +0200, Daniel Vetter wrote:
I've simply overlooked one case in the conversion to interruptible
sleeps. Rectify this.
Also delete a leftover debug printk.
OK, I'm confused about what this patch is about. I thought you were
going to check if the patch series I applied was the right one or not,
given that it was older than your comment please pull my tree instead
of the patch series I sent out on IRC.
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
---
drivers/gpu/drm/i915/intel_overlay.c | 17 +++--
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_overlay.c
b/drivers/gpu/drm/i915/intel_overlay.c
index 972d715..f1bf0b0 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -286,16 +286,15 @@ static int intel_overlay_wait_flip(struct intel_overlay
*overlay)
RING_LOCALS;
if (overlay-last_flip_req != 0) {
- ret = i915_do_wait_request(dev, overlay-last_flip_req, 0);
- if (ret != 0)
- return ret;
-
- overlay-last_flip_req = 0;
+ ret = i915_do_wait_request(dev, overlay-last_flip_req, 1);
+ if (ret == 0) {
+ overlay-last_flip_req = 0;
- tmp = I915_READ(ISR);
+ tmp = I915_READ(ISR);
- if (!(tmp I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
- return 0;
+ if (!(tmp I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
+ return 0;
+ }
}
/* synchronous slowpath */
@@ -439,8 +438,6 @@ int intel_overlay_recover_from_interrupt(struct
intel_overlay *overlay,
return ret;
case SWITCH_OFF_STAGE_2:
- printk(switch off 2\n);
-
BUG_ON(!overlay-vid_bo);
obj = overlay-vid_bo-obj;
--
Eric Anholt
e...@anholt.net eric.anh...@intel.com
signature.asc
Description: This is a digitally signed message part
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[PATCH] drm/i915: overlay: kill one more unnecessary uninterruptible sleep
I've simply overlooked one case in the conversion to interruptible
sleeps. Rectify this.
Also delete a leftover debug printk.
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch
---
drivers/gpu/drm/i915/intel_overlay.c | 17 +++--
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_overlay.c
b/drivers/gpu/drm/i915/intel_overlay.c
index 972d715..f1bf0b0 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -286,16 +286,15 @@ static int intel_overlay_wait_flip(struct intel_overlay
*overlay)
RING_LOCALS;
if (overlay-last_flip_req != 0) {
- ret = i915_do_wait_request(dev, overlay-last_flip_req, 0);
- if (ret != 0)
- return ret;
-
- overlay-last_flip_req = 0;
+ ret = i915_do_wait_request(dev, overlay-last_flip_req, 1);
+ if (ret == 0) {
+ overlay-last_flip_req = 0;
- tmp = I915_READ(ISR);
+ tmp = I915_READ(ISR);
- if (!(tmp I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
- return 0;
+ if (!(tmp I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT))
+ return 0;
+ }
}
/* synchronous slowpath */
@@ -439,8 +438,6 @@ int intel_overlay_recover_from_interrupt(struct
intel_overlay *overlay,
return ret;
case SWITCH_OFF_STAGE_2:
- printk(switch off 2\n);
-
BUG_ON(!overlay-vid_bo);
obj = overlay-vid_bo-obj;
--
1.6.4.3
--
Come build with us! The BlackBerryreg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9#45;12, 2009. Register now#33;
http://p.sf.net/sfu/devconf
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
