commit fb386fde9e5ad0ebac856ab9a87c4d06d940d84e
author Nicolas Boichat <drinkcat@google.com> Mon Jun 22 07:42:24 2015
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Jun 23 06:33:44 2015
tree a6276fd96fe3b0a0c8194407d9461c761035157e
parent ce59785b49417085959d48abbb950822a386d3dd

CHROMIUM: drm: Replace crtc fb with primary plane fb in lvds files

For some reason b72ad8c27b18a740669f265cf8eb508e8cfe3a38 (CL:195617,
"CHROMIUM: drm: Replace crtc fb with primary plane fb") did not
update the _lvds.c files, which breaks kernel 3.8 compilation
on amd64-generic platform.

BUG=chromium:502886
TEST=USE="-video_cards_radeon -kernel-3_14 kernel-3_8" \
     emerge-amd64-generic -av linux-sources chromeos-kernel-3_8
     Kernel boots in a VM

Change-Id: I912f264df6c2544fa6d00db3ce15896d5ffbb359
Signed-off-by: Nicolas Boichat <drinkcat@google.com>
Reviewed-on: https://chromium-review.googlesource.com/280967
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Queue: Nicolas Boichat <drinkcat@chromium.org>
Trybot-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>

drivers/gpu/drm/gma500/cdv_intel_lvds.c

diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index 9a79b99..b6b7793 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -501,7 +501,7 @@
 						      &crtc->saved_mode,
 						      encoder->crtc->x,
 						      encoder->crtc->y,
-						      encoder->crtc->fb))
+						      encoder->crtc->primary->fb))
 				return -1;
 		}
 	} else if (!strcmp(property->name, "backlight") && encoder) {

drivers/gpu/drm/gma500/psb_intel_lvds.c

diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index fda8643..04efaaa 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -625,7 +625,7 @@
 						      &crtc->saved_mode,
 						      encoder->crtc->x,
 						      encoder->crtc->y,
-						      encoder->crtc->fb))
+						      encoder->crtc->primary->fb))
 				goto set_prop_error;
 		}
 	} else if (!strcmp(property->name, "backlight")) {