From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [Intel-gfx] [PATCH 6/6] drm/i915: Reject page flips with changed format/offset/pitch Date: Thu, 19 Jul 2012 14:27:47 +0200 Message-ID: <2171560.KDWZDTKijx@avalon> References: <1337882939-22274-1-git-send-email-ville.syrjala@linux.intel.com> <1337882939-22274-7-git-send-email-ville.syrjala@linux.intel.com> <20120705113117.GH5203@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20120705113117.GH5203@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Hi Daniel, On Thursday 05 July 2012 13:31:17 Daniel Vetter wrote: > On Thu, May 24, 2012 at 09:08:59PM +0300, ville.syrjala@linux.intel.com = wrote: > > From: Ville Syrj=E4l=E4 > > = > > MI display flips can't handle some changes in the framebuffer > > format or layout. Return an error in such cases. > > = > > Signed-off-by: Ville Syrj=E4l=E4 > = > Queued for -next, thanks for the patch. I've punted on the others, hoping > for a few i-g-t tests (and maybe someone else that could review them). > Safe for the uninitialized stack var patch and this one, because we need > this check to fix up gen4+ tileoffset limitations. > = > Yours, Daniel > = > > --- > > = > > drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++++ > > 1 files changed, 13 insertions(+), 0 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/intel_display.c > > b/drivers/gpu/drm/i915/intel_display.c index f4338cb..72ac2f9 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -6217,6 +6217,19 @@ static int intel_crtc_page_flip(struct drm_crtc > > *crtc,> = > > unsigned long flags; > > int ret; > > = > > + /* Can't change pixel format via MI display flips. */ > > + if (fb->pixel_format !=3D crtc->fb->pixel_format) > > + return -EINVAL; Is this still needed if we apply my "drm: Don't allow page flip to change = pixel format" patch ? > > + /* > > + * TILEOFF/LINOFF registers can't be changed via MI display flips. > > + * Note that pitch changes could also affect these register. > > + */ > > + if (INTEL_INFO(dev)->gen > 3 && > > + (fb->offsets[0] !=3D crtc->fb->offsets[0] || > > + fb->pitches[0] !=3D crtc->fb->pitches[0])) > > + return -EINVAL; > > + > > = > > work =3D kzalloc(sizeof *work, GFP_KERNEL); > > if (work =3D=3D NULL) > > = > > return -ENOMEM; -- = Regards, Laurent Pinchart