diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 18:12:01 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 18:12:01 +0200 |
commit | 148b1e115eae37c9f3705691b4c45aa4cc0fa71d (patch) | |
tree | 3f42609b3e7f53eb81830c976fadde1d7bc36a2c /drivers/staging/vboxvideo/vbox_fb.c | |
parent | drm/i915: Supply the engine-id for our mock_engine() (diff) | |
parent | Merge tag 'drm-misc-next-2017-08-08' of git://anongit.freedesktop.org/git/drm-misc into drm-next (diff) | |
download | linux-dev-148b1e115eae37c9f3705691b4c45aa4cc0fa71d.tar.xz linux-dev-148b1e115eae37c9f3705691b4c45aa4cc0fa71d.zip |
Merge airlied/drm-next into drm-intel-next-queued
Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/staging/vboxvideo/vbox_fb.c')
-rw-r--r-- | drivers/staging/vboxvideo/vbox_fb.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/vboxvideo/vbox_fb.c b/drivers/staging/vboxvideo/vbox_fb.c index 35f6d9f8c203..bf6635826159 100644 --- a/drivers/staging/vboxvideo/vbox_fb.c +++ b/drivers/staging/vboxvideo/vbox_fb.c @@ -317,22 +317,7 @@ static int vboxfb_create(struct drm_fb_helper *helper, return 0; } -static void vbox_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, - u16 blue, int regno) -{ -} - -static void vbox_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, int regno) -{ - *red = regno; - *green = regno; - *blue = regno; -} - static struct drm_fb_helper_funcs vbox_fb_helper_funcs = { - .gamma_set = vbox_fb_gamma_set, - .gamma_get = vbox_fb_gamma_get, .fb_probe = vboxfb_create, }; |