From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 9/9] drm/i915: Add rotation property for sprites Date: Mon, 14 Oct 2013 17:39:25 +0300 Message-ID: <20131014143925.GF13047@intel.com> References: <1380552272-32585-1-git-send-email-ville.syrjala@linux.intel.com> <1380552272-32585-10-git-send-email-ville.syrjala@linux.intel.com> <1381759153.12668.67.camel@intelbox> 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: <1381759153.12668.67.camel@intelbox> 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: Imre Deak Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Oct 14, 2013 at 04:59:13PM +0300, Imre Deak wrote: > On Mon, 2013-09-30 at 17:44 +0300, ville.syrjala@linux.intel.com wrote: > > From: Ville Syrj=E4l=E4 > > = > > Sprite planes support 180 degree rotation. The lower layers are now in > > place, so hook in the standard rotation property to expose the feature > > to the users. > > = > > Signed-off-by: Ville Syrj=E4l=E4 > > --- > > drivers/gpu/drm/i915/i915_drv.h | 1 + > > drivers/gpu/drm/i915/intel_sprite.c | 42 +++++++++++++++++++++++++++++= +++++++- > > 2 files changed, 42 insertions(+), 1 deletion(-) > > = > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i91= 5_drv.h > > index 08e96a8..48d4d5f 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -1356,6 +1356,7 @@ typedef struct drm_i915_private { > > = > > struct drm_property *broadcast_rgb_property; > > struct drm_property *force_audio_property; > > + struct drm_property *rotation_property; > > = > > bool hw_contexts_disabled; > > uint32_t hw_context_size; > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915= /intel_sprite.c > > index 028a979..49f8238 100644 > > --- a/drivers/gpu/drm/i915/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/intel_sprite.c > > @@ -1033,6 +1033,30 @@ out_unlock: > > return ret; > > } > > = > > +static int intel_plane_set_property(struct drm_plane *plane, > > + struct drm_property *prop, > > + uint64_t val) > > +{ > > + struct drm_i915_private *dev_priv =3D plane->dev->dev_private; > > + struct intel_plane *intel_plane =3D to_intel_plane(plane); > > + uint64_t old_val; > > + int ret =3D -ENOENT; > > + > > + if (prop =3D=3D dev_priv->rotation_property) { > > + /* exactly one rotation angle please */ > > + if (hweight32(val & 0xf) !=3D 1) > > + return -EINVAL; > > + > > + old_val =3D intel_plane->rotation; > > + intel_plane->rotation =3D val; > > + ret =3D intel_plane_restore(plane); > > + if (ret) > > + intel_plane->rotation =3D old_val; > > + } > > + > > + return ret; > > +} > > + > > int intel_plane_restore(struct drm_plane *plane) > > { > > struct intel_plane *intel_plane =3D to_intel_plane(plane); > > @@ -1059,6 +1083,7 @@ static const struct drm_plane_funcs intel_plane_f= uncs =3D { > > .update_plane =3D intel_update_plane, > > .disable_plane =3D intel_disable_plane, > > .destroy =3D intel_destroy_plane, > > + .set_property =3D intel_plane_set_property, > > }; > > = > > static uint32_t ilk_plane_formats[] =3D { > > @@ -1095,6 +1120,7 @@ static uint32_t vlv_plane_formats[] =3D { > > int > > intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) > > { > > + struct drm_i915_private *dev_priv =3D dev->dev_private; > > struct intel_plane *intel_plane; > > unsigned long possible_crtcs; > > const uint32_t *plane_formats; > > @@ -1168,8 +1194,22 @@ intel_plane_init(struct drm_device *dev, enum pi= pe pipe, int plane) > > &intel_plane_funcs, > > plane_formats, num_plane_formats, > > false); > > - if (ret) > > + if (ret) { > > kfree(intel_plane); > > + goto out; > > + } > > + > > + if (!dev_priv->rotation_property) > > + dev_priv->rotation_property =3D > > + drm_mode_create_rotation_property(dev, > > + BIT(DRM_ROTATE_0) | > > + BIT(DRM_ROTATE_180)); > > + > > + if (dev_priv->rotation_property) > > + drm_object_attach_property(&intel_plane->base.base, > > + dev_priv->rotation_property, > > + intel_plane->rotation); > = > drm_mode_create_rotation_property() can fail silently, I think we should > handle it. I figured I'd just move it to intel_modeset_init() but turns out we don't really handle errors there either. Frankly this looks like another rathole. Seeing as we already ignore property creation errors in other places (in a way that could oops even), I'm just going to run away before the urge to fix it all takes over. -- = Ville Syrj=E4l=E4 Intel OTC