diff options
| author | kib <kib@FreeBSD.org> | 2015-01-21 16:10:37 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-01-21 16:10:37 +0000 |
| commit | bd1a9e7b113063644600b40603bbac4df5933074 (patch) | |
| tree | 0c26e11037effdf2db39642090cdb8bc1f04efcc /sys/dev/drm2/drm_fb_helper.c | |
| parent | 8f91e56ef8071794d9c50e7d9fef5b6d8f605679 (diff) | |
| download | FreeBSD-src-bd1a9e7b113063644600b40603bbac4df5933074.zip FreeBSD-src-bd1a9e7b113063644600b40603bbac4df5933074.tar.gz | |
An update for the i915 GPU driver, which brings the code up to Linux
commit 4d93914ae3db4a897ead4b. Some related drm infrastructure
changes are imported as needed.
Biggest update is the rewrite of the i915 gem io to more closely
follow Linux model, althought the mechanism used by FreeBSD port is
different.
Sponsored by: The FreeBSD Foundation
MFC after: 2 month
Diffstat (limited to 'sys/dev/drm2/drm_fb_helper.c')
| -rw-r--r-- | sys/dev/drm2/drm_fb_helper.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/drm2/drm_fb_helper.c b/sys/dev/drm2/drm_fb_helper.c index 2eb41a5..562bf82 100644 --- a/sys/dev/drm2/drm_fb_helper.c +++ b/sys/dev/drm2/drm_fb_helper.c @@ -202,6 +202,9 @@ static void drm_fb_helper_restore_lut_atomic(struct drm_crtc *crtc) { uint16_t *r_base, *g_base, *b_base; + if (crtc->funcs->gamma_set == NULL) + return; + r_base = crtc->gamma_store; g_base = r_base + crtc->gamma_size; b_base = g_base + crtc->gamma_size; @@ -1225,7 +1228,7 @@ static bool drm_target_cloned(struct drm_fb_helper *fb_helper, /* try and find a 1024x768 mode on each connector */ can_clone = true; - dmt_mode = drm_mode_find_dmt(fb_helper->dev, 1024, 768, 60); + dmt_mode = drm_mode_find_dmt(fb_helper->dev, 1024, 768, 60, false); for (i = 0; i < fb_helper->connector_count; i++) { |
