Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bfd4a01 authored by Dhinakaran Pandiyan's avatar Dhinakaran Pandiyan Committed by Daniel Vetter
Browse files

drm: Get atomic property value even if DRIVER_ATOMIC is not set 



i915 does not set DRIVER_ATOMIC by default yet but uses atomic_check and
atomic_commit. drm_object_property_get_value() does not read the correct
value of atomic properties if DRIVER_ATOMIC is not set. Checking whether
the driver uses atomic modeset is a better check instead as the property
values are tracked in the state structures.

v2: Included header

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1482396643-32456-2-git-send-email-dhinakaran.pandiyan@intel.com
parent a743d758

drivers/gpu/drm/drm_mode_object.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/export.h>

#include <drm/drmP.h>

#include <drm/drm_mode_object.h>

#include <drm/drm_atomic.h>



#include "drm_crtc_internal.h"
@@ -273,7 +274,7 @@ int drm_object_property_get_value(struct drm_mode_object *obj, 
	 * their value in obj->properties->values[].. mostly to avoid

	 * having to deal w/ EDID and similar props in atomic paths:

	 */

	if (drm_core_check_feature(property->dev, DRIVER_ATOMIC) &&

	if (drm_drv_uses_atomic_modeset(property->dev) &&

			!(property->flags & DRM_MODE_PROP_IMMUTABLE))

		return drm_atomic_get_property(obj, property, val);