From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jindal, Sonika" Subject: Re: [v3 09/13] drm/i915: Add rotation property for sprites Date: Mon, 14 Jul 2014 09:27:10 +0530 Message-ID: <53C35516.9050809@intel.com> References: <1404795723-9630-1-git-send-email-sonika.jindal@intel.com> <1404795723-9630-10-git-send-email-sonika.jindal@intel.com> <20140711215922.GJ17271@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20140711215922.GJ17271@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On 7/12/2014 3:29 AM, Daniel Vetter wrote: > On Tue, Jul 08, 2014 at 10:31:59AM +0530, sonika.jindal@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. >> >> v2: Moving rotation_property to drm_plane > > This change is wrong and I haven't figured out who suggested it. The > actual property is global (i.e. we should only have 1), but then it can be > attached to different pieces. > > So here's what we need to do instead: > - Add the rotation property to dev->mode_config. > - Convert omapdrm to also store it there by moving it out of the omap > driver private structure. > - Probably better to just unconditionally set it up, but not sure. > - Adjust the fb helper code accordingly. > - Rip the omap restore rotation code in lastclose since the fb helper will > now take care of this. > Ok, I will make this property a part of mode_config and will attach that = to drm_plane, and will post the remaining patches. -Sonika > I've merged the drm core parts for now but dropped the i915 implementation > and the fb helper patch again. > > Thanks, Daniel > >> >> Cc: dri-devel@lists.freedesktop.org >> Signed-off-by: Ville Syrj=E4l=E4 >> Signed-off-by: Sonika Jindal >> Reviewed-by: Imre Deak >> --- >> drivers/gpu/drm/i915/intel_sprite.c | 40 +++++++++++++++++++++++++++= +++++++- >> include/drm/drm_crtc.h | 1 + >> 2 files changed, 40 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/= intel_sprite.c >> index cbad738..aa63027 100644 >> --- a/drivers/gpu/drm/i915/intel_sprite.c >> +++ b/drivers/gpu/drm/i915/intel_sprite.c >> @@ -1202,6 +1202,29 @@ out_unlock: >> return ret; >> } >> >> +static int intel_plane_set_property(struct drm_plane *plane, >> + struct drm_property *prop, >> + uint64_t val) >> +{ >> + struct intel_plane *intel_plane =3D to_intel_plane(plane); >> + uint64_t old_val; >> + int ret =3D -ENOENT; >> + >> + if (prop =3D=3D plane->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); >> @@ -1228,6 +1251,7 @@ static const struct drm_plane_funcs intel_plane_fu= ncs =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 { >> @@ -1338,8 +1362,22 @@ intel_plane_init(struct drm_device *dev, enum pip= e pipe, int plane) >> &intel_plane_funcs, >> plane_formats, num_plane_formats, >> false); >> - if (ret) >> + if (ret) { >> kfree(intel_plane); >> + goto out; >> + } >> + >> + if (!intel_plane->base.rotation_property) >> + intel_plane->base.rotation_property =3D >> + drm_mode_create_rotation_property(dev, >> + BIT(DRM_ROTATE_0) | >> + BIT(DRM_ROTATE_180)); >> + >> + if (intel_plane->base.rotation_property) >> + drm_object_attach_property(&intel_plane->base.base, >> + intel_plane->base.rotation_property, >> + intel_plane->rotation); >> >> + out: >> return ret; >> } >> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h >> index 08ed55e..6006c70 100644 >> --- a/include/drm/drm_crtc.h >> +++ b/include/drm/drm_crtc.h >> @@ -615,6 +615,7 @@ struct drm_plane { >> >> const struct drm_plane_funcs *funcs; >> >> + struct drm_property *rotation_property; >> struct drm_object_properties properties; >> >> enum drm_plane_type type; >> -- >> 1.7.10.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx >