leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/bxt: Initialize MIPI DSI for BXT

Browse Source 
This patch contains following changes:
1. Add BXT MIPI display address base.
2. Call dsi_init from display_setup function.

v2: Rebased on latest nightly branch

v3 by Jani: init dsi after ddi

Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1458640910-5338-1-git-send-email-jani.nikula@intel.com
This commit is contained in:
Shashank Sharma 2016-03-22 12:01:50 +02:00 committed by Jani Nikula
parent ad45d83968
commit c6c794a2fc
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_reg.h
View File

@ -1802,6 +1802,7 @@ enum skl_disp_power_wells {
#define VLV_DISPLAY_BASE 0x180000 #define VLV_DISPLAY_BASE 0x180000
#define VLV_MIPI_BASE VLV_DISPLAY_BASE #define VLV_MIPI_BASE VLV_DISPLAY_BASE
#define BXT_MIPI_BASE 0x60000
#define VLV_GU_CTL0 _MMIO(VLV_DISPLAY_BASE + 0x2030) #define VLV_GU_CTL0 _MMIO(VLV_DISPLAY_BASE + 0x2030)
#define VLV_GU_CTL1 _MMIO(VLV_DISPLAY_BASE + 0x2034) #define VLV_GU_CTL1 _MMIO(VLV_DISPLAY_BASE + 0x2034)

2
drivers/gpu/drm/i915/intel_display.c
View File

@ -14394,6 +14394,8 @@ static void intel_setup_outputs(struct drm_device *dev)
intel_ddi_init(dev, PORT_A); intel_ddi_init(dev, PORT_A);
intel_ddi_init(dev, PORT_B); intel_ddi_init(dev, PORT_B);
intel_ddi_init(dev, PORT_C); intel_ddi_init(dev, PORT_C);
intel_dsi_init(dev);
} else if (HAS_DDI(dev)) { } else if (HAS_DDI(dev)) {
int found; int found;

2
drivers/gpu/drm/i915/intel_dsi.c
View File

@ -1163,6 +1163,8 @@ void intel_dsi_init(struct drm_device *dev)
if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
dev_priv->mipi_mmio_base = VLV_MIPI_BASE; dev_priv->mipi_mmio_base = VLV_MIPI_BASE;
} else if (IS_BROXTON(dev)) {
dev_priv->mipi_mmio_base = BXT_MIPI_BASE;
} else { } else {
DRM_ERROR("Unsupported Mipi device to reg base"); DRM_ERROR("Unsupported Mipi device to reg base");
return; return;