|
On 1/30/2018 12:23 AM, Ville Syrjälä
wrote:
On Fri, Jan 12, 2018 at 11:51:33AM +0530, Nautiyal, Ankit K wrote:From: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx> If the user mode does not support aspect-ratio, and requests for a modeset, then the flag bits representing aspect ratio in the given user-mode must be rejected. Similarly, while preparing a user-mode from kernel mode, the aspect-ratio info must not be given, if aspect-ratio is not supported by the user. This patch: 1. adds a new bit field aspect_ratio_allowed in drm_atomic_state, which is set only if the aspect-ratio is supported by the user. 2. discards the aspect-ratio info from the user mode while preparing kernel mode structure, during modeset, if the user does not support aspect ratio. 3. avoids setting the aspect-ratio info in user-mode, while converting user-mode from the kernel-mode. Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx> V3: Addressed review comments from Ville: -Do not corrupt the current crtc state by updating aspect ratio on the fly. --- drivers/gpu/drm/drm_atomic.c | 61 +++++++++++++++++++++++++++++++++++++++++--- drivers/gpu/drm/drm_crtc.c | 19 ++++++++++++++ include/drm/drm_atomic.h | 2 ++ 3 files changed, 79 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 69ff763..39313e2 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -316,6 +316,35 @@ static s32 __user *get_out_fence_for_crtc(struct drm_atomic_state *state, return fence_ptr; } +/** + * drm_atomic_allow_aspect_ratio_for_kmode + * @state: the crtc state + * @mode: kernel-internal mode, which is used to create a duplicate mode, + * with updated picture aspect ratio. + * + * Allow the aspect ratio info in the kernel mode only if aspect ratio is + * supported. + * + * RETURNS: + * kernel-internal mode with updated picture aspect ratio value. + */ + +struct drm_display_mode* +drm_atomic_allow_aspect_ratio_for_kmode(struct drm_crtc_state *state, + const struct drm_display_mode *mode) +{ + struct drm_atomic_state *atomic_state = state->state; + struct drm_display_mode *ar_kmode; + + ar_kmode = drm_mode_duplicate(state->crtc->dev, mode); + /* + * If aspect ratio is not supported, set the picture aspect ratio as + * NONE. + */ + if (atomic_state && !atomic_state->allow_aspect_ratio) + ar_kmode->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE; + return ar_kmode; +} /** * drm_atomic_set_mode_for_crtc - set mode for CRTC @@ -341,7 +370,10 @@ int drm_atomic_set_mode_for_crtc(struct drm_crtc_state *state, state->mode_blob = NULL; if (mode) { - drm_mode_convert_to_umode(&umode, mode); + struct drm_display_mode *ar_mode; + + ar_mode = drm_atomic_allow_aspect_ratio_for_kmode(state, mode); + drm_mode_convert_to_umode(&umode, ar_mode);This still looks sketchy. I believe there are just two places where we need to filter out the aspect ratio flags from the umode, namely the getblob and getcrtc ioctls. AFAIK The getblob ioctl can be called for edid blob, gamma, ctm blob, etc. apart from the mode blob. Is there any way to check from blob id (or by any other means), if the data is for the mode, or edid, or gamma etc. If we can check that, I can make sure that aspect-ratio flags are taken care of, if the blob is for mode, and the aspect ratio is not supported. Agreed. Infact I tried to do that first, but the only problem we have here, is that, the file_privAnd for checking the user input I think we should probably just stick that into drm_mode_convert_umode(). Looks like we never call that from anywhere but the atomic/setprop and setcrtc paths with a non-NULL argument. I *think* those three places should be sufficient to cover everything. which has the aspect ratio capability information is not supplied to the drm_mode_convert_umode() or the functions calling, drm_mode_conver_umode(). At best we have drm_crtc_state. I have added an aspect ratio allowed flag in drm_crtc_state->state so that its available in the functions calling drm_mode_convert_umode. I am open to suggestion to avoid adding a new flag in drm_atomic_state, if there is a better way to let the drm_mode_convert_umode( ) know that user supports aspect ratio capability. Alright, so alternative way of doing this will be: Avoid changing the crtc->state->mode.picture_aspect_ratio i.e kernel mode structure, but set the aspect ratio flags in the usermode to none, after calling the drm_mode_convert_to_umode(). Will take care of this in the next patchset.
|
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
