diff options
author | Dave Airlie <airlied@redhat.com> | 2015-04-15 18:34:24 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-04-15 18:34:24 -0400 |
commit | 4a11248856933f33ca061ed55470ea7e1783b40b (patch) | |
tree | f8dab99fc365d6b1270b2ed3b3fdc7987e0e003a /drivers/gpu/drm/qxl/qxl_drv.c | |
parent | 52139bdea1558e854123d7a07e7648f5a8c77a5c (diff) | |
parent | 2b1193d5287004edfbf89407149a3159656f47f1 (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 'drivers/gpu/drm/qxl/qxl_drv.c')
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 1d9b80c91a15..e2d07085b6a5 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c | |||
@@ -102,7 +102,7 @@ static int qxl_drm_freeze(struct drm_device *dev) | |||
102 | 102 | ||
103 | /* unpin the front buffers */ | 103 | /* unpin the front buffers */ |
104 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | 104 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |
105 | struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; | 105 | const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; |
106 | if (crtc->enabled) | 106 | if (crtc->enabled) |
107 | (*crtc_funcs->disable)(crtc); | 107 | (*crtc_funcs->disable)(crtc); |
108 | } | 108 | } |