From: Keith Packard Subject: Re: [PATCH 1/2 v2] drm/i915: Dumb down the semaphore logic Date: Tue, 13 Sep 2011 22:01:40 -0500 Message-ID: References: <1315966677-12898-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0880372929==" Return-path: Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FB5F9E818 for ; Tue, 13 Sep 2011 20:01:54 -0700 (PDT) In-Reply-To: <1315966677-12898-1-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org --===============0880372929== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable On Tue, 13 Sep 2011 19:17:56 -0700, Ben Widawsky wrote: > -static int > +/** > + * gen6_add_request - Update the semaphore mailbox registers > + *=20 > + * @ring - ring that is adding a request > + * @mbox1_reg - mailbox address for RCS or VCS ring > + * @mbox2_reg - mailbox address for VCS or BCS ring > + * > + * Update the mailbox registers in the *other* rings with the current se= qno. > + * This acts like a signal in the canonical semaphore. > + */ > +static u32 > gen6_add_request(struct intel_ring_buffer *ring, > - u32 *result) > + u32 mbox1_reg, > + u32 mbox2_reg) > { > u32 seqno; > int ret; > @@ -351,43 +350,119 @@ gen6_add_request(struct intel_ring_buffer *ring, > return ret; >=20=20 > seqno =3D i915_gem_get_seqno(ring->dev); > - update_semaphore(ring, 0, seqno); > - update_semaphore(ring, 1, seqno); >=20=20 > + update_mboxes(ring, seqno, mbox1_reg); > + update_mboxes(ring, seqno, mbox2_reg); > intel_ring_emit(ring, MI_STORE_DWORD_INDEX); > intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT); > intel_ring_emit(ring, seqno); > intel_ring_emit(ring, MI_USER_INTERRUPT); > intel_ring_advance(ring); >=20=20 > - *result =3D seqno; > + return seqno; > +} This still looks like it's returning an error sometimes and a seqno other times; I don't think you can mix those two. > +static int > +gen6_blt_add_request(struct intel_ring_buffer *ring, > + u32 *result) > +{ > + struct drm_device *dev =3D ring->dev; > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + *result =3D gen6_add_request(ring, > + RBSYNC, /* render->blitter sync */ > + VBSYNC); /* video->blitter sync */ > return 0; > } >=20=20 > -int > -intel_ring_sync(struct intel_ring_buffer *ring, > - struct intel_ring_buffer *to, > +static int > +gen6_bsd_add_request(struct intel_ring_buffer *ring, > + u32 *result) > +{ > + struct drm_device *dev =3D ring->dev; > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + *result =3D gen6_add_request(ring, > + RVSYNC, /* video->render sync */ > + BVSYNC); /* video->blitter sync */ > + return 0; > +} > + > +static int > +gen6_render_add_request(struct intel_ring_buffer *ring, > + u32 *result) > +{ > + struct drm_device *dev =3D ring->dev; > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + *result =3D gen6_add_request(ring, > + VRSYNC, /* render->video sync */ > + BRSYNC); /* render->blitter sync */ > + return 0; > +} These need to check the error return from gen6_add_request. =2D-=20 keith.packard@intel.com --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQFOcBkVQp8BWwlsTdMRAvrvAJwJdpt5k0m64FcX59bAMr35slY5WQCgwx/g jeZJsnghNbpF5KPwnpRoL8Y= =2Iqw -----END PGP SIGNATURE----- --=-=-=-- --===============0880372929== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0880372929==--