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

Commit 37e7b184 authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie
Browse files

gma500/cdv: sync up and add the displayport code to the build 



This is mostly just aligning bits of behaviour

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 220801bd

drivers/gpu/drm/gma500/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ gma500_gfx-$(CONFIG_DRM_GMA3600) += cdv_device.o \ 
	  cdv_intel_crt.o \

	  cdv_intel_display.o \

	  cdv_intel_hdmi.o \

	  cdv_intel_lvds.o

	  cdv_intel_lvds.o \

	  cdv_intel_dp.o



gma500_gfx-$(CONFIG_DRM_GMA600) += oaktrail_device.o \

	  oaktrail_crtc.o \

drivers/gpu/drm/gma500/cdv_intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static const struct cdv_intel_limit_t cdv_intel_limits[] = { 
#define wait_for(COND, MS) _wait_for(COND, MS, 1)





static int cdv_sb_read(struct drm_device *dev, u32 reg, u32 *val)

int cdv_sb_read(struct drm_device *dev, u32 reg, u32 *val)

{

	int ret;
@@ -198,7 +198,7 @@ static int cdv_sb_read(struct drm_device *dev, u32 reg, u32 *val) 
	return 0;

}



static int cdv_sb_write(struct drm_device *dev, u32 reg, u32 val)

int cdv_sb_write(struct drm_device *dev, u32 reg, u32 val)

{

	int ret;

	static bool dpio_debug = true;
@@ -240,7 +240,7 @@ static int cdv_sb_write(struct drm_device *dev, u32 reg, u32 val) 
/* Reset the DPIO configuration register.  The BIOS does this at every

 * mode set.

 */

static void cdv_sb_reset(struct drm_device *dev)

void cdv_sb_reset(struct drm_device *dev)

{



	REG_WRITE(DPIO_CFG, 0);

drivers/gpu/drm/gma500/cdv_intel_dp.c

+239 −241

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/gma500/psb_intel_drv.h

+16 −0
Original line number Diff line number Diff line
@@ -288,4 +288,20 @@ extern void gma_intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed); 
extern void gma_intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);

extern void gma_intel_teardown_gmbus(struct drm_device *dev);



/* DP support */

extern void cdv_intel_dp_init(struct drm_device *dev, struct psb_intel_mode_device *mode_dev, int output_reg);

extern void psb_intel_dp_set_m_n(struct drm_crtc *crtc,

					struct drm_display_mode *mode,

					struct drm_display_mode *adjusted_mode);



extern void psb_intel_attach_force_audio_property(struct drm_connector *connector);

extern void psb_intel_attach_broadcast_rgb_property(struct drm_connector *connector);



extern int cdv_sb_read(struct drm_device *dev, u32 reg, u32 *val);

extern int cdv_sb_write(struct drm_device *dev, u32 reg, u32 val);

extern void cdv_sb_reset(struct drm_device *dev);



extern void cdv_intel_attach_force_audio_property(struct drm_connector *connector);

extern void cdv_intel_attach_broadcast_rgb_property(struct drm_connector *connector);



#endif				/* __INTEL_DRV_H__ */