aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm/drm_crtc.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-04-15 18:34:24 -0400
committerDave Airlie <airlied@redhat.com>2015-04-15 18:34:24 -0400
commit4a11248856933f33ca061ed55470ea7e1783b40b (patch)
treef8dab99fc365d6b1270b2ed3b3fdc7987e0e003a /include/drm/drm_crtc.h
parent52139bdea1558e854123d7a07e7648f5a8c77a5c (diff)
parent2b1193d5287004edfbf89407149a3159656f47f1 (diff)
Merge tag 'topic/drm-misc-2015-04-15' of git://anongit.freedesktop.org/drm-intel into drm-next
One more drm-misch pull for 4.1 with mostly simple stuff and boring refactoring. Even the cursor fix from Matt is just to make a really anal igt happy. * tag 'topic/drm-misc-2015-04-15' of git://anongit.freedesktop.org/drm-intel: drm: fix trivial typo mistake drm: Make integer overflow checking cover universal cursor updates (v2) drm: make crtc/encoder/connector/plane helper_private a const pointer drm/armada: constify struct drm_encoder_helper_funcs pointer drm/radeon: constify more struct drm_*_helper funcs pointers drm/edid: add #defines for ELD versions drm/atomic: Add for_each_{connector,crtc,plane}_in_state helper macros drm: Use kref_put_mutex in drm_gem_object_unreference_unlocked drm/drm: constify all struct drm_*_helper funcs pointers drm/qxl: constify all struct drm_*_helper funcs pointers drm/nouveau: constify all struct drm_*_helper funcs pointers drm/radeon: constify all struct drm_*_helper funcs pointers drm/gma500: constify all struct drm_*_helper funcs pointers drm/mgag200: constify all struct drm_*_helper funcs pointers drm/exynos: constify all struct drm_*_helper funcs pointers drm: Fix some typos
Diffstat (limited to 'include/drm/drm_crtc.h')
-rw-r--r--include/drm/drm_crtc.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 2e80ad1aea84..ca71c03143d1 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -466,7 +466,7 @@ struct drm_crtc {
466 int framedur_ns, linedur_ns, pixeldur_ns; 466 int framedur_ns, linedur_ns, pixeldur_ns;
467 467
468 /* if you are using the helper */ 468 /* if you are using the helper */
469 void *helper_private; 469 const void *helper_private;
470 470
471 struct drm_object_properties properties; 471 struct drm_object_properties properties;
472 472
@@ -596,7 +596,7 @@ struct drm_encoder {
596 struct drm_crtc *crtc; 596 struct drm_crtc *crtc;
597 struct drm_bridge *bridge; 597 struct drm_bridge *bridge;
598 const struct drm_encoder_funcs *funcs; 598 const struct drm_encoder_funcs *funcs;
599 void *helper_private; 599 const void *helper_private;
600}; 600};
601 601
602/* should we poll this connector for connects and disconnects */ 602/* should we poll this connector for connects and disconnects */
@@ -700,7 +700,7 @@ struct drm_connector {
700 /* requested DPMS state */ 700 /* requested DPMS state */
701 int dpms; 701 int dpms;
702 702
703 void *helper_private; 703 const void *helper_private;
704 704
705 /* forced on connector */ 705 /* forced on connector */
706 struct drm_cmdline_mode cmdline_mode; 706 struct drm_cmdline_mode cmdline_mode;
@@ -863,7 +863,7 @@ struct drm_plane {
863 863
864 enum drm_plane_type type; 864 enum drm_plane_type type;
865 865
866 void *helper_private; 866 const void *helper_private;
867 867
868 struct drm_plane_state *state; 868 struct drm_plane_state *state;
869}; 869};
@@ -974,7 +974,7 @@ struct drm_mode_set {
974 * struct drm_mode_config_funcs - basic driver provided mode setting functions 974 * struct drm_mode_config_funcs - basic driver provided mode setting functions
975 * @fb_create: create a new framebuffer object 975 * @fb_create: create a new framebuffer object
976 * @output_poll_changed: function to handle output configuration changes 976 * @output_poll_changed: function to handle output configuration changes
977 * @atomic_check: check whether a give atomic state update is possible 977 * @atomic_check: check whether a given atomic state update is possible
978 * @atomic_commit: commit an atomic state update previously verified with 978 * @atomic_commit: commit an atomic state update previously verified with
979 * atomic_check() 979 * atomic_check()
980 * 980 *