aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_crtc.c7
-rw-r--r--drivers/gpu/drm/omapdrm/omap_crtc.c5
-rw-r--r--drivers/gpu/drm/omapdrm/omap_fbdev.c14
-rw-r--r--drivers/gpu/drm/qxl/qxl_display.c13
-rw-r--r--drivers/gpu/drm/qxl/qxl_fb.c4
-rw-r--r--drivers/gpu/drm/tilcdc/tilcdc_crtc.c5
-rw-r--r--drivers/gpu/drm/udl/udl_fb.c15
-rw-r--r--drivers/gpu/drm/udl/udl_modeset.c5
-rw-r--r--drivers/staging/imx-drm/ipuv3-crtc.c5
9 files changed, 0 insertions, 73 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index c200e4d71e3d..073c10a35b2a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -169,12 +169,6 @@ static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
169 return 0; 169 return 0;
170} 170}
171 171
172static void exynos_drm_crtc_load_lut(struct drm_crtc *crtc)
173{
174 DRM_DEBUG_KMS("%s\n", __FILE__);
175 /* drm framework doesn't check NULL */
176}
177
178static void exynos_drm_crtc_disable(struct drm_crtc *crtc) 172static void exynos_drm_crtc_disable(struct drm_crtc *crtc)
179{ 173{
180 struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); 174 struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
@@ -192,7 +186,6 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {
192 .mode_fixup = exynos_drm_crtc_mode_fixup, 186 .mode_fixup = exynos_drm_crtc_mode_fixup,
193 .mode_set = exynos_drm_crtc_mode_set, 187 .mode_set = exynos_drm_crtc_mode_set,
194 .mode_set_base = exynos_drm_crtc_mode_set_base, 188 .mode_set_base = exynos_drm_crtc_mode_set_base,
195 .load_lut = exynos_drm_crtc_load_lut,
196 .disable = exynos_drm_crtc_disable, 189 .disable = exynos_drm_crtc_disable,
197}; 190};
198 191
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index 79b200aee18a..ef161ea982e6 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -253,10 +253,6 @@ static int omap_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
253 NULL, NULL); 253 NULL, NULL);
254} 254}
255 255
256static void omap_crtc_load_lut(struct drm_crtc *crtc)
257{
258}
259
260static void vblank_cb(void *arg) 256static void vblank_cb(void *arg)
261{ 257{
262 struct drm_crtc *crtc = arg; 258 struct drm_crtc *crtc = arg;
@@ -366,7 +362,6 @@ static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = {
366 .prepare = omap_crtc_prepare, 362 .prepare = omap_crtc_prepare,
367 .commit = omap_crtc_commit, 363 .commit = omap_crtc_commit,
368 .mode_set_base = omap_crtc_mode_set_base, 364 .mode_set_base = omap_crtc_mode_set_base,
369 .load_lut = omap_crtc_load_lut,
370}; 365};
371 366
372const struct omap_video_timings *omap_crtc_timings(struct drm_crtc *crtc) 367const struct omap_video_timings *omap_crtc_timings(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index b11ce609fcc2..002988d09021 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -281,21 +281,7 @@ fail:
281 return ret; 281 return ret;
282} 282}
283 283
284static void omap_crtc_fb_gamma_set(struct drm_crtc *crtc,
285 u16 red, u16 green, u16 blue, int regno)
286{
287 DBG("fbdev: set gamma");
288}
289
290static void omap_crtc_fb_gamma_get(struct drm_crtc *crtc,
291 u16 *red, u16 *green, u16 *blue, int regno)
292{
293 DBG("fbdev: get gamma");
294}
295
296static struct drm_fb_helper_funcs omap_fb_helper_funcs = { 284static struct drm_fb_helper_funcs omap_fb_helper_funcs = {
297 .gamma_set = omap_crtc_fb_gamma_set,
298 .gamma_get = omap_crtc_fb_gamma_get,
299 .fb_probe = omap_fbdev_create, 285 .fb_probe = omap_fbdev_create,
300}; 286};
301 287
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 823d29e926ec..5a6bfa22c5a7 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -222,12 +222,6 @@ static int qxl_add_common_modes(struct drm_connector *connector)
222 return i - 1; 222 return i - 1;
223} 223}
224 224
225static void qxl_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
226 u16 *blue, uint32_t start, uint32_t size)
227{
228 /* TODO */
229}
230
231static void qxl_crtc_destroy(struct drm_crtc *crtc) 225static void qxl_crtc_destroy(struct drm_crtc *crtc)
232{ 226{
233 struct qxl_crtc *qxl_crtc = to_qxl_crtc(crtc); 227 struct qxl_crtc *qxl_crtc = to_qxl_crtc(crtc);
@@ -399,7 +393,6 @@ static int qxl_crtc_cursor_move(struct drm_crtc *crtc,
399static const struct drm_crtc_funcs qxl_crtc_funcs = { 393static const struct drm_crtc_funcs qxl_crtc_funcs = {
400 .cursor_set = qxl_crtc_cursor_set, 394 .cursor_set = qxl_crtc_cursor_set,
401 .cursor_move = qxl_crtc_cursor_move, 395 .cursor_move = qxl_crtc_cursor_move,
402 .gamma_set = qxl_crtc_gamma_set,
403 .set_config = drm_crtc_helper_set_config, 396 .set_config = drm_crtc_helper_set_config,
404 .destroy = qxl_crtc_destroy, 397 .destroy = qxl_crtc_destroy,
405}; 398};
@@ -619,18 +612,12 @@ static void qxl_crtc_commit(struct drm_crtc *crtc)
619 DRM_DEBUG("\n"); 612 DRM_DEBUG("\n");
620} 613}
621 614
622static void qxl_crtc_load_lut(struct drm_crtc *crtc)
623{
624 DRM_DEBUG("\n");
625}
626
627static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = { 615static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = {
628 .dpms = qxl_crtc_dpms, 616 .dpms = qxl_crtc_dpms,
629 .mode_fixup = qxl_crtc_mode_fixup, 617 .mode_fixup = qxl_crtc_mode_fixup,
630 .mode_set = qxl_crtc_mode_set, 618 .mode_set = qxl_crtc_mode_set,
631 .prepare = qxl_crtc_prepare, 619 .prepare = qxl_crtc_prepare,
632 .commit = qxl_crtc_commit, 620 .commit = qxl_crtc_commit,
633 .load_lut = qxl_crtc_load_lut,
634}; 621};
635 622
636static int qdev_crtc_init(struct drm_device *dev, int num_crtc) 623static int qdev_crtc_init(struct drm_device *dev, int num_crtc)
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index b3c51275df5c..4b955b04ce1e 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -520,10 +520,6 @@ static int qxl_fbdev_destroy(struct drm_device *dev, struct qxl_fbdev *qfbdev)
520} 520}
521 521
522static struct drm_fb_helper_funcs qxl_fb_helper_funcs = { 522static struct drm_fb_helper_funcs qxl_fb_helper_funcs = {
523 /* TODO
524 .gamma_set = qxl_crtc_fb_gamma_set,
525 .gamma_get = qxl_crtc_fb_gamma_get,
526 */
527 .fb_probe = qxl_fb_find_or_create_single, 523 .fb_probe = qxl_fb_find_or_create_single,
528}; 524};
529 525
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 5dd3c7d031d5..4de3fb4246fc 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -384,10 +384,6 @@ static int tilcdc_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
384 return 0; 384 return 0;
385} 385}
386 386
387static void tilcdc_crtc_load_lut(struct drm_crtc *crtc)
388{
389}
390
391static const struct drm_crtc_funcs tilcdc_crtc_funcs = { 387static const struct drm_crtc_funcs tilcdc_crtc_funcs = {
392 .destroy = tilcdc_crtc_destroy, 388 .destroy = tilcdc_crtc_destroy,
393 .set_config = drm_crtc_helper_set_config, 389 .set_config = drm_crtc_helper_set_config,
@@ -401,7 +397,6 @@ static const struct drm_crtc_helper_funcs tilcdc_crtc_helper_funcs = {
401 .commit = tilcdc_crtc_commit, 397 .commit = tilcdc_crtc_commit,
402 .mode_set = tilcdc_crtc_mode_set, 398 .mode_set = tilcdc_crtc_mode_set,
403 .mode_set_base = tilcdc_crtc_mode_set_base, 399 .mode_set_base = tilcdc_crtc_mode_set_base,
404 .load_lut = tilcdc_crtc_load_lut,
405}; 400};
406 401
407int tilcdc_crtc_max_width(struct drm_crtc *crtc) 402int tilcdc_crtc_max_width(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index dc0c065f8d39..97e9d614700f 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -393,19 +393,6 @@ static struct fb_ops udlfb_ops = {
393 .fb_release = udl_fb_release, 393 .fb_release = udl_fb_release,
394}; 394};
395 395
396static void udl_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
397 u16 blue, int regno)
398{
399}
400
401static void udl_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
402 u16 *blue, int regno)
403{
404 *red = 0;
405 *green = 0;
406 *blue = 0;
407}
408
409static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, 396static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb,
410 struct drm_file *file, 397 struct drm_file *file,
411 unsigned flags, unsigned color, 398 unsigned flags, unsigned color,
@@ -558,8 +545,6 @@ out:
558} 545}
559 546
560static struct drm_fb_helper_funcs udl_fb_helper_funcs = { 547static struct drm_fb_helper_funcs udl_fb_helper_funcs = {
561 .gamma_set = udl_crtc_fb_gamma_set,
562 .gamma_get = udl_crtc_fb_gamma_get,
563 .fb_probe = udlfb_create, 548 .fb_probe = udlfb_create,
564}; 549};
565 550
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c
index e96d2349bd54..2ae1eb7d1635 100644
--- a/drivers/gpu/drm/udl/udl_modeset.c
+++ b/drivers/gpu/drm/udl/udl_modeset.c
@@ -363,10 +363,6 @@ static void udl_crtc_destroy(struct drm_crtc *crtc)
363 kfree(crtc); 363 kfree(crtc);
364} 364}
365 365
366static void udl_load_lut(struct drm_crtc *crtc)
367{
368}
369
370static void udl_crtc_prepare(struct drm_crtc *crtc) 366static void udl_crtc_prepare(struct drm_crtc *crtc)
371{ 367{
372} 368}
@@ -383,7 +379,6 @@ static struct drm_crtc_helper_funcs udl_helper_funcs = {
383 .prepare = udl_crtc_prepare, 379 .prepare = udl_crtc_prepare,
384 .commit = udl_crtc_commit, 380 .commit = udl_crtc_commit,
385 .disable = udl_crtc_disable, 381 .disable = udl_crtc_disable,
386 .load_lut = udl_load_lut,
387}; 382};
388 383
389static const struct drm_crtc_funcs udl_crtc_funcs = { 384static const struct drm_crtc_funcs udl_crtc_funcs = {
diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c
index ff5c63350932..b2730b1af5b4 100644
--- a/drivers/staging/imx-drm/ipuv3-crtc.c
+++ b/drivers/staging/imx-drm/ipuv3-crtc.c
@@ -364,17 +364,12 @@ static void ipu_crtc_commit(struct drm_crtc *crtc)
364 ipu_fb_enable(ipu_crtc); 364 ipu_fb_enable(ipu_crtc);
365} 365}
366 366
367static void ipu_crtc_load_lut(struct drm_crtc *crtc)
368{
369}
370
371static struct drm_crtc_helper_funcs ipu_helper_funcs = { 367static struct drm_crtc_helper_funcs ipu_helper_funcs = {
372 .dpms = ipu_crtc_dpms, 368 .dpms = ipu_crtc_dpms,
373 .mode_fixup = ipu_crtc_mode_fixup, 369 .mode_fixup = ipu_crtc_mode_fixup,
374 .mode_set = ipu_crtc_mode_set, 370 .mode_set = ipu_crtc_mode_set,
375 .prepare = ipu_crtc_prepare, 371 .prepare = ipu_crtc_prepare,
376 .commit = ipu_crtc_commit, 372 .commit = ipu_crtc_commit,
377 .load_lut = ipu_crtc_load_lut,
378}; 373};
379 374
380static int ipu_enable_vblank(struct drm_crtc *crtc) 375static int ipu_enable_vblank(struct drm_crtc *crtc)