* [PATCH] drm/i915: Propagate errors back from fb set-base
@ 2013-05-03 16:36 Chris Wilson
2013-05-03 16:55 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2013-05-03 16:36 UTC (permalink / raw)
To: intel-gfx
Along the modesetting short cut where we skip trying to do a full
modeset and instead simply update the framebuffer base registers, we
failed to handle any errors reported.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_display.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2939524..62eafc7 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8572,11 +8572,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
ret = intel_set_mode(set->crtc, set->mode,
set->x, set->y, set->fb);
- if (ret) {
- DRM_ERROR("failed to set mode on [CRTC:%d], err = %d\n",
- set->crtc->base.id, ret);
- goto fail;
- }
} else if (config->fb_changed) {
intel_crtc_wait_for_pending_flips(set->crtc);
@@ -8584,18 +8579,18 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
set->x, set->y, set->fb);
}
- intel_set_config_free(config);
-
- return 0;
-
+ if (ret) {
+ DRM_ERROR("failed to set mode on [CRTC:%d], err = %d\n",
+ set->crtc->base.id, ret);
fail:
- intel_set_config_restore_state(dev, config);
+ intel_set_config_restore_state(dev, config);
- /* Try to restore the config */
- if (config->mode_changed &&
- intel_set_mode(save_set.crtc, save_set.mode,
- save_set.x, save_set.y, save_set.fb))
- DRM_ERROR("failed to restore config after modeset failure\n");
+ /* Try to restore the config */
+ if (config->mode_changed &&
+ intel_set_mode(save_set.crtc, save_set.mode,
+ save_set.x, save_set.y, save_set.fb))
+ DRM_ERROR("failed to restore config after modeset failure\n");
+ }
out_config:
intel_set_config_free(config);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Propagate errors back from fb set-base
2013-05-03 16:36 [PATCH] drm/i915: Propagate errors back from fb set-base Chris Wilson
@ 2013-05-03 16:55 ` Daniel Vetter
2013-05-21 8:54 ` Chris Wilson
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2013-05-03 16:55 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Fri, May 3, 2013 at 6:36 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Along the modesetting short cut where we skip trying to do a full
> modeset and instead simply update the framebuffer base registers, we
> failed to handle any errors reported.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This regression has been introduced in
commit 94352cf9a5328bb1a44288e6c2c1276695f8a356
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu Jul 5 22:51:56 2012 +0200
drm/i915: push crtc->fb update into pipe_set_base
/me hangs head in shame
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Propagate errors back from fb set-base
2013-05-03 16:55 ` Daniel Vetter
@ 2013-05-21 8:54 ` Chris Wilson
2013-05-21 10:16 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2013-05-21 8:54 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
On Fri, May 03, 2013 at 06:55:35PM +0200, Daniel Vetter wrote:
> On Fri, May 3, 2013 at 6:36 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > Along the modesetting short cut where we skip trying to do a full
> > modeset and instead simply update the framebuffer base registers, we
> > failed to handle any errors reported.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
>
> This regression has been introduced in
>
> commit 94352cf9a5328bb1a44288e6c2c1276695f8a356
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Thu Jul 5 22:51:56 2012 +0200
>
> drm/i915: push crtc->fb update into pipe_set_base
>
> /me hangs head in shame
Ping?
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Propagate errors back from fb set-base
2013-05-21 8:54 ` Chris Wilson
@ 2013-05-21 10:16 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2013-05-21 10:16 UTC (permalink / raw)
To: Chris Wilson, Daniel Vetter, intel-gfx, Barnes, Jesse
On Tue, May 21, 2013 at 09:54:09AM +0100, Chris Wilson wrote:
> On Fri, May 03, 2013 at 06:55:35PM +0200, Daniel Vetter wrote:
> > On Fri, May 3, 2013 at 6:36 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > > Along the modesetting short cut where we skip trying to do a full
> > > modeset and instead simply update the framebuffer base registers, we
> > > failed to handle any errors reported.
> > >
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >
> >
> > This regression has been introduced in
> >
> > commit 94352cf9a5328bb1a44288e6c2c1276695f8a356
> > Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Date: Thu Jul 5 22:51:56 2012 +0200
> >
> > drm/i915: push crtc->fb update into pipe_set_base
> >
> > /me hangs head in shame
>
> Ping?
Picked up for -fixes, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-21 10:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-03 16:36 [PATCH] drm/i915: Propagate errors back from fb set-base Chris Wilson
2013-05-03 16:55 ` Daniel Vetter
2013-05-21 8:54 ` Chris Wilson
2013-05-21 10:16 ` Daniel Vetter
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.