Commit 0c9d2c41 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'korg/drm-radeon-next' into drm-linus 

* korg/drm-radeon-next:
  drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx
  drm/radeon/kms: Don't try to enable IRQ if we have no handler installed
  drm: Avoid calling vblank function is vblank wasn't initialized
  drm/radeon: mkregtable.c: close a file before exit
  drm/radeon/kms: Make sure we release AGP device if we acquired it
  drm/radeon/kms: Schedule host path read cache flush through the ring V2
  drm/radeon/kms: Workaround RV410/R420 CP errata (V3)
  drm/radeon/kms: detect sideport memory on IGP chips
  drm/radeon: fix a couple of array index errors
  drm/radeon/kms: add support for eDP (embedded DisplayPort)
  drm: Add eDP connector type
  drm/radeon/kms: pull in the latest upstream ObjectID.h changes
  drm/radeon/kms: whitespace changes to ObjectID.h
  drm/radeon/kms: fix typo in atom connector type handling
parents 94fd163d 804c7559

drivers/gpu/drm/drm_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] = 
	{ DRM_MODE_CONNECTOR_HDMIA, "HDMI Type A", 0 },

	{ DRM_MODE_CONNECTOR_HDMIB, "HDMI Type B", 0 },

	{ DRM_MODE_CONNECTOR_TV, "TV", 0 },

	{ DRM_MODE_CONNECTOR_eDP, "Embedded DisplayPort", 0 },

};



static struct drm_prop_enum_list drm_encoder_enum_list[] =

drivers/gpu/drm/drm_irq.c

+4 −1
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ void drm_vblank_cleanup(struct drm_device *dev) 


	dev->num_crtcs = 0;

}

EXPORT_SYMBOL(drm_vblank_cleanup);



int drm_vblank_init(struct drm_device *dev, int num_crtcs)

{
@@ -163,7 +164,6 @@ int drm_vblank_init(struct drm_device *dev, int num_crtcs) 
	}



	dev->vblank_disable_allowed = 0;



	return 0;



err:
@@ -493,6 +493,9 @@ EXPORT_SYMBOL(drm_vblank_off); 
 */

void drm_vblank_pre_modeset(struct drm_device *dev, int crtc)

{

	/* vblank is not initialized (IRQ not installed ?) */

	if (!dev->num_crtcs)

		return;

	/*

	 * To avoid all the problems that might happen if interrupts

	 * were enabled/disabled around or between these calls, we just

drivers/gpu/drm/radeon/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ $(obj)/rv515_reg_safe.h: $(src)/reg_srcs/rv515 $(obj)/mkregtable 
$(obj)/r300_reg_safe.h: $(src)/reg_srcs/r300 $(obj)/mkregtable

	$(call if_changed,mkregtable)



$(obj)/r420_reg_safe.h: $(src)/reg_srcs/r420 $(obj)/mkregtable

	$(call if_changed,mkregtable)



$(obj)/rs600_reg_safe.h: $(src)/reg_srcs/rs600 $(obj)/mkregtable

	$(call if_changed,mkregtable)
@@ -35,6 +38,8 @@ $(obj)/rv515.o: $(obj)/rv515_reg_safe.h 


$(obj)/r300.o: $(obj)/r300_reg_safe.h



$(obj)/r420.o: $(obj)/r420_reg_safe.h



$(obj)/rs600.o: $(obj)/rs600_reg_safe.h



radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \

drivers/gpu/drm/radeon/ObjectID.h

+433 −368

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/radeon/atombios_dp.c

+4 −2
Original line number Diff line number Diff line
@@ -468,7 +468,8 @@ void radeon_dp_set_link_config(struct drm_connector *connector, 
	struct radeon_connector *radeon_connector;

	struct radeon_connector_atom_dig *dig_connector;



	if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)

	if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) ||

	    (connector->connector_type != DRM_MODE_CONNECTOR_eDP))

		return;



	radeon_connector = to_radeon_connector(connector);
@@ -582,7 +583,8 @@ void dp_link_train(struct drm_encoder *encoder, 
	u8 train_set[4];

	int i;



	if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort)

	if ((connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort) ||

	    (connector->connector_type != DRM_MODE_CONNECTOR_eDP))

		return;



	if (!radeon_encoder->enc_priv)

CRA Git | Maintained and supported by SUSTech CRA and CCSE