From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 5/5] drm/i915: remove intel_pipe_set_base() Date: Fri, 19 Sep 2014 16:51:29 +0300 Message-ID: <20140919135129.GM12416@intel.com> References: <1411069396-28051-1-git-send-email-gustavo@padovan.org> <1411069396-28051-5-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: <1411069396-28051-5-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan Cc: intel-gfx@lists.freedesktop.org, Gustavo Padovan , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Thu, Sep 18, 2014 at 04:43:16PM -0300, Gustavo Padovan wrote: > From: Gustavo Padovan > = > After some refactor intel_primary_plane_setplane() does the same > as intel_pipe_set_base() so we can get rid of it and replace the calls > with intel_primary_plane_setplane(). > = > Signed-off-by: Gustavo Padovan > --- > drivers/gpu/drm/i915/intel_display.c | 79 ++++--------------------------= ------ > 1 file changed, 8 insertions(+), 71 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 6c61c8f..2477587 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2763,74 +2763,6 @@ static void intel_update_pipe_size(struct intel_cr= tc *crtc) > crtc->config.pipe_src_h =3D adjusted_mode->crtc_vdisplay; > } > = > -static int > -intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, > - struct drm_framebuffer *fb) > -{ > - struct drm_device *dev =3D crtc->dev; > - struct drm_i915_private *dev_priv =3D dev->dev_private; > - struct intel_crtc *intel_crtc =3D to_intel_crtc(crtc); > - enum pipe pipe =3D intel_crtc->pipe; > - struct drm_framebuffer *old_fb =3D crtc->primary->fb; > - struct drm_i915_gem_object *obj =3D intel_fb_obj(fb); > - struct drm_i915_gem_object *old_obj =3D intel_fb_obj(old_fb); > - int ret; > - > - if (intel_crtc_has_pending_flip(crtc)) { > - DRM_ERROR("pipe is still busy with an old pageflip\n"); > - return -EBUSY; > - } > - > - /* no fb bound */ > - if (!fb) { > - DRM_ERROR("No FB bound\n"); > - return 0; > - } > - > - if (intel_crtc->plane > INTEL_INFO(dev)->num_pipes) { > - DRM_ERROR("no plane for crtc: plane %c, num_pipes %d\n", > - plane_name(intel_crtc->plane), > - INTEL_INFO(dev)->num_pipes); > - return -EINVAL; > - } > - > - mutex_lock(&dev->struct_mutex); > - ret =3D intel_pin_and_fence_fb_obj(dev, obj, NULL); > - if (ret =3D=3D 0) > - i915_gem_track_fb(old_obj, obj, > - INTEL_FRONTBUFFER_PRIMARY(pipe)); > - mutex_unlock(&dev->struct_mutex); > - if (ret !=3D 0) { > - DRM_ERROR("pin & fence failed\n"); > - return ret; > - } > - > - intel_update_pipe_size(intel_crtc); > - > - dev_priv->display.update_primary_plane(crtc, fb, x, y); > - > - if (intel_crtc->active) > - intel_frontbuffer_flip(dev, INTEL_FRONTBUFFER_PRIMARY(pipe)); > - > - crtc->primary->fb =3D fb; > - crtc->x =3D x; > - crtc->y =3D y; > - > - if (old_fb) { > - if (intel_crtc->active && old_fb !=3D fb) > - intel_wait_for_vblank(dev, intel_crtc->pipe); > - mutex_lock(&dev->struct_mutex); > - intel_unpin_fb_obj(old_obj); > - mutex_unlock(&dev->struct_mutex); > - } > - > - mutex_lock(&dev->struct_mutex); > - intel_update_fbc(dev); > - mutex_unlock(&dev->struct_mutex); > - > - return 0; > -} > - > static void intel_fdi_normal_train(struct drm_crtc *crtc) > { > struct drm_device *dev =3D crtc->dev; > @@ -9797,6 +9729,7 @@ static int intel_crtc_commit_page_flip(struct drm_c= rtc *crtc, > struct drm_framebuffer *old_fb =3D crtc->primary->fb; > struct drm_i915_gem_object *obj =3D intel_fb_obj(fb); > struct intel_crtc *intel_crtc =3D to_intel_crtc(crtc); > + struct drm_plane *primary =3D crtc->primary; > enum pipe pipe =3D intel_crtc->pipe; > struct intel_unpin_work *work; > struct intel_engine_cs *ring; > @@ -9938,7 +9871,9 @@ free_work: > if (ret =3D=3D -EIO) { > out_hang: > intel_crtc_wait_for_pending_flips(crtc); > - ret =3D intel_pipe_set_base(crtc, crtc->x, crtc->y, fb); > + ret =3D primary->funcs->update_plane(primary, crtc, fb, > + 0, 0, 0, 0, > + crtc->x, crtc->y, 0, 0); I think we want page flips to not change the current plane setup so these should be: intel_plane->crtc_x/y/w/h intel_plane->src_x/y/w/h > if (ret =3D=3D 0 && event) { > spin_lock_irq(&dev->event_lock); > drm_send_vblank_event(dev, pipe, event); > @@ -11475,11 +11410,13 @@ static int intel_crtc_set_config(struct drm_mod= e_set *set) > set->x, set->y, set->fb); > } else if (config->fb_changed) { > struct intel_crtc *intel_crtc =3D to_intel_crtc(set->crtc); > + struct drm_plane *primary =3D set->crtc->primary; > = > intel_crtc_wait_for_pending_flips(set->crtc); > = > - ret =3D intel_pipe_set_base(set->crtc, > - set->x, set->y, set->fb); > + ret =3D primary->funcs->update_plane(primary, set->crtc, set->fb, > + 0, 0, 0, 0, > + set->x, set->y, 0, 0); And these should really be: 0, 0, hdisplay, vdisplay, set->x << 16, set->y << 16, hdisplay << 16, vdisplay << 16, Oh, one extra complication here is the stereo modes, so I think we'll be needing to borrow the stereo doubling trick from intel_modeset_pipe_config() to adjust hdisplay/vdisplay when appropriate. And we'll be needing something also for the full modeset path so that intel_plane->crtc_* and intel_plane->src_* get initialized properly. Perhaps it's enough to rip out the fb pin/unpin stuff from __intel_set_mode() and just replace it with a call to ->update_plane(). > = > /* > * We need to make sure the primary plane is re-enabled if it > -- = > 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