mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
drm: fix plane rotation when restoring fbdev configuration
Make sure plane rotation is reset correctly when restoring the fbdev
configuration by using drm_mode_plane_set_obj_prop which calls the
driver's set_property callback.
The rotation reset feature was introduced in commit 9783de2
(drm:
Resetting rotation property) and the callback issue was originally
addressed in a previous version of the patch, but the fix was not
present in the final version.
v2: Fix documentation warning
Add some more details to the commit message (Daniel Vetter)
Testcase: igt/kms_rotation_crc
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82236
Cc: Sonika Jindal <sonika.jindal@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Thomas Wood <thomas.wood@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
fd639ac6dc
commit
3a5f87c286
3 changed files with 26 additions and 8 deletions
|
@ -4156,12 +4156,25 @@ static int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int drm_mode_plane_set_obj_prop(struct drm_mode_object *obj,
|
/**
|
||||||
struct drm_property *property,
|
* drm_mode_plane_set_obj_prop - set the value of a property
|
||||||
uint64_t value)
|
* @plane: drm plane object to set property value for
|
||||||
|
* @property: property to set
|
||||||
|
* @value: value the property should be set to
|
||||||
|
*
|
||||||
|
* This functions sets a given property on a given plane object. This function
|
||||||
|
* calls the driver's ->set_property callback and changes the software state of
|
||||||
|
* the property if the callback succeeds.
|
||||||
|
*
|
||||||
|
* Returns:
|
||||||
|
* Zero on success, error code on failure.
|
||||||
|
*/
|
||||||
|
int drm_mode_plane_set_obj_prop(struct drm_plane *plane,
|
||||||
|
struct drm_property *property,
|
||||||
|
uint64_t value)
|
||||||
{
|
{
|
||||||
int ret = -EINVAL;
|
int ret = -EINVAL;
|
||||||
struct drm_plane *plane = obj_to_plane(obj);
|
struct drm_mode_object *obj = &plane->base;
|
||||||
|
|
||||||
if (plane->funcs->set_property)
|
if (plane->funcs->set_property)
|
||||||
ret = plane->funcs->set_property(plane, property, value);
|
ret = plane->funcs->set_property(plane, property, value);
|
||||||
|
@ -4170,6 +4183,7 @@ static int drm_mode_plane_set_obj_prop(struct drm_mode_object *obj,
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
EXPORT_SYMBOL(drm_mode_plane_set_obj_prop);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* drm_mode_getproperty_ioctl - get the current value of a object's property
|
* drm_mode_getproperty_ioctl - get the current value of a object's property
|
||||||
|
@ -4308,7 +4322,8 @@ int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
|
||||||
ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value);
|
ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value);
|
||||||
break;
|
break;
|
||||||
case DRM_MODE_OBJECT_PLANE:
|
case DRM_MODE_OBJECT_PLANE:
|
||||||
ret = drm_mode_plane_set_obj_prop(arg_obj, property, arg->value);
|
ret = drm_mode_plane_set_obj_prop(obj_to_plane(arg_obj),
|
||||||
|
property, arg->value);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -350,9 +350,9 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper)
|
||||||
drm_plane_force_disable(plane);
|
drm_plane_force_disable(plane);
|
||||||
|
|
||||||
if (dev->mode_config.rotation_property) {
|
if (dev->mode_config.rotation_property) {
|
||||||
drm_object_property_set_value(&plane->base,
|
drm_mode_plane_set_obj_prop(plane,
|
||||||
dev->mode_config.rotation_property,
|
dev->mode_config.rotation_property,
|
||||||
BIT(DRM_ROTATE_0));
|
BIT(DRM_ROTATE_0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1121,6 +1121,9 @@ extern int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
|
||||||
struct drm_file *file_priv);
|
struct drm_file *file_priv);
|
||||||
extern int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
|
extern int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
|
||||||
struct drm_file *file_priv);
|
struct drm_file *file_priv);
|
||||||
|
extern int drm_mode_plane_set_obj_prop(struct drm_plane *plane,
|
||||||
|
struct drm_property *property,
|
||||||
|
uint64_t value);
|
||||||
|
|
||||||
extern void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
|
extern void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
|
||||||
int *bpp);
|
int *bpp);
|
||||||
|
|
Loading…
Reference in a new issue