diff options
| author | Terry Heo <terryheo@google.com> | 2017-07-12 12:09:37 +0900 |
|---|---|---|
| committer | Terry Heo <terryheo@google.com> | 2017-07-12 12:15:51 +0900 |
| commit | 714f97b6c1ddd6b533237f3d60882902bd442520 (patch) | |
| tree | 22aeb0c21c0d74510a3b1eb7cb5f20afbb8aad72 | |
| parent | 89368ff22279bf50b618b561aeaf4b0197858651 (diff) | |
| download | imx-v4.1-714f97b6c1ddd6b533237f3d60882902bd442520.tar.gz | |
Revert HWC2 related changes
This CL reverts following two changes.
6ce8c140 "MA-9666-3 add RGBA32 format support when bus-width is 18."
bf997be6 "Make pico imx7d display as rgba32 by default"
Bug: 63517065
Test: run cts CtsOpenGLTestCases
Change-Id: I933f09cf512ea7515b7c56e97112d5ee9379496d
| -rw-r--r-- | arch/arm/boot/dts/imx7d-pico.dtsi | 3 | ||||
| -rw-r--r-- | drivers/video/fbdev/mxsfb.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi index 3ba7270d9a1e..bc0a8429bebc 100644 --- a/arch/arm/boot/dts/imx7d-pico.dtsi +++ b/arch/arm/boot/dts/imx7d-pico.dtsi @@ -557,9 +557,8 @@ status = "okay"; display0: display { - bits-per-pixel = <32>; + bits-per-pixel = <16>; bus-width = <24>; - fbpix = "ABGR32"; display-timings { native-mode = <&timing0>; diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c index 614a766a88f7..14228d430084 100644 --- a/drivers/video/fbdev/mxsfb.c +++ b/drivers/video/fbdev/mxsfb.c @@ -680,8 +680,6 @@ static int mxsfb_check_var(struct fb_var_screeninfo *var, if (pixfmt_is_equal(var, def_rgb666)) /* 24 bit to 18 bit mapping */ rgb = def_rgb666; - else if (host->pix_fmt && pixfmt_to_bf(host->pix_fmt)) - rgb = pixfmt_to_bf(host->pix_fmt); else rgb = def_rgb888; break; |