| Message ID | 20180322152313.6561-4-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 22, 2018 at 05:22:53PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Keep the primary->crtc in sync with the state->crtc (also with > primary->fb and state->fb) when disabling the crtc (and thus also > the primary) via setcrtc(). > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Yeah seems more consistent, and we do the same for atomic already. Only 2 legacy drivers seem to look at this (armada and shmob), and I think both should be fine. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_crtc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 03583887cfec..7a973ada7195 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -471,7 +471,7 @@ static int __drm_mode_set_config_internal(struct drm_mode_set *set, > > ret = crtc->funcs->set_config(set, ctx); > if (ret == 0) { > - crtc->primary->crtc = crtc; > + crtc->primary->crtc = fb ? crtc : NULL; > crtc->primary->fb = fb; > } > > -- > 2.16.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 03583887cfec..7a973ada7195 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -471,7 +471,7 @@ static int __drm_mode_set_config_internal(struct drm_mode_set *set, ret = crtc->funcs->set_config(set, ctx); if (ret == 0) { - crtc->primary->crtc = crtc; + crtc->primary->crtc = fb ? crtc : NULL; crtc->primary->fb = fb; }