From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: pin sprite fb only if it changed Date: Wed, 10 Sep 2014 11:45:35 +0300 Message-ID: <20140910084535.GO4193@intel.com> References: <1410295786-21618-1-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <1410295786-21618-1-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Gustavo Padovan Cc: intel-gfx@lists.freedesktop.org, Gustavo Padovan , dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Sep 09, 2014 at 05:49:46PM -0300, Gustavo Padovan wrote: > From: Gustavo Padovan > = > Optimize code avoiding helding dev mutex if old fb and current fb > are the same. > = > Signed-off-by: Gustavo Padovan > --- > drivers/gpu/drm/i915/intel_sprite.c | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/i= ntel_sprite.c > index a4306cf..a301838 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -1038,21 +1038,23 @@ intel_commit_sprite_plane(struct drm_plane *plane, > primary_enabled =3D !drm_rect_equals(dst, clip) || colorkey_enabled(int= el_plane); > WARN_ON(!primary_enabled && !state->visible && intel_crtc->active); > = > - mutex_lock(&dev->struct_mutex); > = > /* Note that this will apply the VT-d workaround for scanouts, > * which is more restrictive than required for sprites. (The > * primary plane requires 256KiB alignment with 64 PTE padding, > * the sprite planes only require 128KiB alignment and 32 PTE padding. > */ The comment should probably remain just before the intel_pin_and_fence_fb_obj() call. > - ret =3D intel_pin_and_fence_fb_obj(dev, obj, NULL); > + if (old_obj !=3D obj) { > + mutex_lock(&dev->struct_mutex); > + ret =3D intel_pin_and_fence_fb_obj(dev, obj, NULL); > = > - i915_gem_track_fb(old_obj, obj, > - INTEL_FRONTBUFFER_SPRITE(pipe)); > - mutex_unlock(&dev->struct_mutex); > + i915_gem_track_fb(old_obj, obj, > + INTEL_FRONTBUFFER_SPRITE(pipe)); I don't think we should be calling this when things failed. This bug was already present in the code, but might as well fix it while you're at it. > + mutex_unlock(&dev->struct_mutex); > = > - if (ret) > - return ret; > + if (ret) > + return ret; > + } > = > intel_plane->crtc_x =3D state->orig_dst.x1; > intel_plane->crtc_y =3D state->orig_dst.y1; > @@ -1098,15 +1100,18 @@ intel_commit_sprite_plane(struct drm_plane *plane, > intel_post_enable_primary(crtc); > } > = > + if (!old_obj) > + return 0; > + > /* Unpin old obj after new one is active to avoid ugliness */ > - if (old_obj) { > + if (old_obj !=3D obj) { I'd prefer = if (old_obj && old_obj !=3D obj) { in this case. > /* > * It's fairly common to simply update the position of > * an existing object. In that case, we don't need to > * wait for vblank to avoid ugliness, we only need to > * do the pin & ref bookkeeping. > */ > - if (old_obj !=3D obj && intel_crtc->active) > + if (intel_crtc->active) > intel_wait_for_vblank(dev, intel_crtc->pipe); > = > mutex_lock(&dev->struct_mutex); > -- = > 1.9.3 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC