Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3585aa9 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

gma500: kill MIPI interface types 



Kirill Shutemov found problems with the non-upstream IMG driver where the
use of extra DRM encoder/connector types caused random crashes when the DRM
layer tried to display their matching name. This removes the MIPI types
matching the changes Pauli Nieminen made to the non upstream driver set.

As Pauli points out:
" MIPI (or DSI) is protocol specification on top of LVDS serial bus. That
 makes it resonable to call MIPI connectors and encoders LVDS."

(and indeed they may also be HDMI convertors or similar when we want to
 report a more useful to end user result)

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b5ddbf46

drivers/staging/gma500/mdfld_dsi_dbi.c

+2 −1
Original line number Diff line number Diff line
@@ -711,10 +711,11 @@ struct mdfld_dsi_encoder *mdfld_dsi_dbi_init(struct drm_device *dev, 
	/* Create drm encoder object */

	connector = &dsi_connector->base.base;

	encoder = &dbi_output->base.base;

	/* Review this if we ever get MIPI-HDMI bridges or similar */

	drm_encoder_init(dev,

			encoder,

			p_funcs->encoder_funcs,

			DRM_MODE_ENCODER_MIPI);

			DRM_MODE_ENCODER_LVDS);

	drm_encoder_helper_add(encoder, p_funcs->encoder_helper_funcs);



	/* Attach to given connector */

drivers/staging/gma500/mdfld_dsi_dbi.h

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ 
#include "mdfld_dsi_output.h"

#include "mdfld_output.h"



#define DRM_MODE_ENCODER_MIPI  5





/*

 * DBI encoder which inherits from mdfld_dsi_encoder

 */

drivers/staging/gma500/mdfld_dsi_dpi.c

+6 −1
Original line number Diff line number Diff line
@@ -777,10 +777,15 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev, 
	/* Create drm encoder object */

	connector = &dsi_connector->base.base;

	encoder = &dpi_output->base.base;

	/*

	 * On existing hardware this will be a panel of some form,

	 * if future devices also have HDMI bridges this will need

	 * revisiting

	 */

	drm_encoder_init(dev,

			encoder,

			p_funcs->encoder_funcs,

			DRM_MODE_ENCODER_MIPI);

			DRM_MODE_ENCODER_LVDS);

	drm_encoder_helper_add(encoder,

				p_funcs->encoder_helper_funcs);

drivers/staging/gma500/mdfld_dsi_output.c

+3 −1
Original line number Diff line number Diff line
@@ -955,7 +955,9 @@ void mdfld_dsi_output_init(struct drm_device *dev, 
	psb_output->type = (pipe == 0) ? INTEL_OUTPUT_MIPI : INTEL_OUTPUT_MIPI2;



	connector = &psb_output->base;

	drm_connector_init(dev, connector, &mdfld_dsi_connector_funcs, DRM_MODE_CONNECTOR_MIPI);

	/* Revisit type if MIPI/HDMI bridges ever appear on Medfield */

	drm_connector_init(dev, connector, &mdfld_dsi_connector_funcs,

						DRM_MODE_CONNECTOR_LVDS);

	drm_connector_helper_add(connector, &mdfld_dsi_connector_helper_funcs);

	

	connector->display_info.subpixel_order = SubPixelHorizontalRGB;

drivers/staging/gma500/medfield.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
 * DEALINGS IN THE SOFTWARE.

 */



#define DRM_MODE_ENCODER_MIPI  5



/* Medfield DSI controller registers */



#define MIPIA_DEVICE_READY_REG				0xb000