]> Git Repo - linux.git/commitdiff
Merge tag 'drm/panel/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux into...
authorDave Airlie <[email protected]>
Mon, 17 Aug 2015 05:53:05 +0000 (15:53 +1000)
committerDave Airlie <[email protected]>
Mon, 17 Aug 2015 05:53:05 +0000 (15:53 +1000)
drm/panel: Changes for v4.3-rc1

This introduces support for a couple of new panels and also contains
some work to restructure the directories to get more consistency, to
deal better with more panel and bridge drivers getting added.

* tag 'drm/panel/for-4.3-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/bridge: Put Kconfig entries in a separate menu
  drm/panel: Add support for LG LG4573 480x800 4.3" panel
  drm/panel: Add display timing for Okaya RS800480T-7X0GP
  of: Add Okaya Electric America vendor prefix
  drm/panel: simple: Add support for NEC NL4827HC19-05B 480x272 panel
  drm/panel: simple: Add support for AUO B080UAN01
  drm/panel: simple: Correct minimum hsync length of the HannStar HSD070PWW1 panel
  drm/panel: simple: Add bus format for HannStar HSD070PWW1 LVDS panel
  drm/bridge: Add vendor prefixes
  drm/panel: Add Samsung prefix to panel drivers
  drm/exynos: Remove PTN3460 dependency

1  2 
arch/arm/configs/multi_v7_defconfig
drivers/gpu/drm/Kconfig

index 5fd8df6f50ea0c4f9d86cbf0b95364c159c17fb1,48b0362a0f0e992f9319aab9e447bb7d45b4152b..6413390212fec8506a5e05c3dc79725a85ce2826
@@@ -353,6 -353,7 +353,6 @@@ CONFIG_POWER_RESET_AS3722=
  CONFIG_POWER_RESET_GPIO=y
  CONFIG_POWER_RESET_GPIO_RESTART=y
  CONFIG_POWER_RESET_KEYSTONE=y
 -CONFIG_POWER_RESET_SUN6I=y
  CONFIG_POWER_RESET_RMOBILE=y
  CONFIG_SENSORS_LM90=y
  CONFIG_SENSORS_LM95245=y
@@@ -429,15 -430,15 +429,15 @@@ CONFIG_VIDEO_RENESAS_VSP1=
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
  CONFIG_DRM=y
- CONFIG_DRM_PTN3460=m
- CONFIG_DRM_PS8622=m
+ CONFIG_DRM_NXP_PTN3460=m
+ CONFIG_DRM_PARADE_PS8622=m
  CONFIG_DRM_EXYNOS=m
  CONFIG_DRM_EXYNOS_DSI=y
  CONFIG_DRM_EXYNOS_FIMD=y
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_TEGRA=y
- CONFIG_DRM_PANEL_S6E8AA0=m
+ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
  CONFIG_DRM_PANEL_SIMPLE=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_FB_WM8505=y
diff --combined drivers/gpu/drm/Kconfig
index 06ae5008c5edf2b96d114ea53e9527b4bc29d5fe,beaedd78c4b91b2a99d387940b52775d8fa5c73b..86191586340f72f6b466fa6e94a22ffe1558e2e5
@@@ -37,29 -37,9 +37,29 @@@ config DRM_KMS_FB_HELPE
        select FB
        select FRAMEBUFFER_CONSOLE if !EXPERT
        select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE
 +      select FB_SYS_FOPS
 +      select FB_SYS_FILLRECT
 +      select FB_SYS_COPYAREA
 +      select FB_SYS_IMAGEBLIT
 +      select FB_CFB_FILLRECT
 +      select FB_CFB_COPYAREA
 +      select FB_CFB_IMAGEBLIT
        help
          FBDEV helpers for KMS drivers.
  
 +config DRM_FBDEV_EMULATION
 +      bool "Enable legacy fbdev support for your modesetting driver"
 +      depends on DRM
 +      select DRM_KMS_HELPER
 +      select DRM_KMS_FB_HELPER
 +      default y
 +      help
 +        Choose this option if you have a need for the legacy fbdev
 +        support. Note that this support also provides the linux console
 +        support on top of your modesetting driver.
 +
 +        If in doubt, say "Y".
 +
  config DRM_LOAD_EDID_FIRMWARE
        bool "Allow to specify an EDID data set instead of probing for it"
        depends on DRM_KMS_HELPER
@@@ -99,8 -79,6 +99,6 @@@ config DRM_KMS_CMA_HELPE
  
  source "drivers/gpu/drm/i2c/Kconfig"
  
- source "drivers/gpu/drm/bridge/Kconfig"
  config DRM_TDFX
        tristate "3dfx Banshee/Voodoo3+"
        depends on DRM && PCI
@@@ -255,6 -233,8 +253,8 @@@ source "drivers/gpu/drm/tegra/Kconfig
  
  source "drivers/gpu/drm/panel/Kconfig"
  
+ source "drivers/gpu/drm/bridge/Kconfig"
  source "drivers/gpu/drm/sti/Kconfig"
  
  source "drivers/gpu/drm/amd/amdkfd/Kconfig"
This page took 0.087913 seconds and 4 git commands to generate.