From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v3 04/11] drm/i915: move check of intel_crtc_cursor_set_obj() out Date: Tue, 7 Oct 2014 18:01:10 +0300 Message-ID: <20141007150110.GY32511@intel.com> References: <1411579232-8668-1-git-send-email-gustavo@padovan.org> <1411579232-8668-4-git-send-email-gustavo@padovan.org> <20141007144752.GW32511@intel.com> 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: <20141007144752.GW32511@intel.com> 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: dri-devel@lists.freedesktop.org On Tue, Oct 07, 2014 at 05:47:52PM +0300, Ville Syrj=E4l=E4 wrote: > On Wed, Sep 24, 2014 at 02:20:25PM -0300, Gustavo Padovan wrote: > > From: Gustavo Padovan > > = > > Move check inside intel_crtc_cursor_set_obj() to > > intel_check_cursor_plane(), we only use it there so move them out to > > make the merge of intel_crtc_cursor_set_obj() into > > intel_check_cursor_plane() easier. > > = > > This is another step toward the atomic modesetting support and unificat= ion > > of plane operations such pin/unpin of fb objects on i915. > > = > > v2: take Ville's comment: move crtc_{w,h} assignment a bit down in the > > code > > v3: take Ville's comment: kept only the restructuring changes, the rest= of > > the code was moved to a separated patch since it is a bug fix (we weren= 't > > checking sizes when the fb was the same) > > = > > Signed-off-by: Gustavo Padovan > = > Looks like the commit messages for patches 2 and 3 got somehow swapped > around. With that fixed patches 2 and 3 get: And make that patches 3 and 4 and we're actaully talking about the correct two patches. > Reviewed-by: Ville Syrj=E4l=E4 > = > > --- > > drivers/gpu/drm/i915/intel_display.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i91= 5/intel_display.c > > index 20be2ed..f91a5b0 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -11928,9 +11928,6 @@ intel_check_cursor_plane(struct drm_plane *plan= e, > > if (!obj) > > return 0; > > = > > - if (fb =3D=3D crtc->cursor->fb) > > - return 0; > > - > > /* Check for which cursor types we support */ > > crtc_w =3D drm_rect_width(&state->orig_dst); > > crtc_h =3D drm_rect_height(&state->orig_dst); > > @@ -11945,6 +11942,9 @@ intel_check_cursor_plane(struct drm_plane *plan= e, > > return -ENOMEM; > > } > > = > > + if (fb =3D=3D crtc->cursor->fb) > > + return 0; > > + > > /* we only need to pin inside GTT if cursor is non-phy */ > > mutex_lock(&dev->struct_mutex); > > if (!INTEL_INFO(dev)->cursor_needs_physical && obj->tiling_mode) { > > -- = > > 1.9.3 > > = > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/dri-devel > = > -- = > Ville Syrj=E4l=E4 > Intel OTC > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- = Ville Syrj=E4l=E4 Intel OTC