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

Commit 3546eea8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/kms: allow drm_mode_group with no objects
  drm/radeon/kms: free ib pool on module unloading
  drm/radeon/kms: fix typo in evergreen disp int status register
  drm/radeon/kms: fix typo in IH_CNTL swap bitfield
parents f1bb20a8 d61a0686

drivers/gpu/drm/drm_crtc.c

+0 −3
Original line number Diff line number Diff line
@@ -886,9 +886,6 @@ int drm_mode_group_init(struct drm_device *dev, struct drm_mode_group *group) 
	total_objects += dev->mode_config.num_connector;

	total_objects += dev->mode_config.num_encoder;



	if (total_objects == 0)

		return -EINVAL;



	group->id_list = kzalloc(total_objects * sizeof(uint32_t), GFP_KERNEL);

	if (!group->id_list)

		return -ENOMEM;

drivers/gpu/drm/radeon/evergreen.c

+1 −0
Original line number Diff line number Diff line
@@ -3237,6 +3237,7 @@ void evergreen_fini(struct radeon_device *rdev) 
	r700_cp_fini(rdev);

	r600_irq_fini(rdev);

	radeon_wb_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_irq_kms_fini(rdev);

	evergreen_pcie_gart_fini(rdev);

	radeon_gem_fini(rdev);

drivers/gpu/drm/radeon/evergreend.h

+2 −2
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ 
#define IH_RB_WPTR_ADDR_LO                                0x3e14

#define IH_CNTL                                           0x3e18

#       define ENABLE_INTR                                (1 << 0)

#       define IH_MC_SWAP(x)                              ((x) << 2)

#       define IH_MC_SWAP(x)                              ((x) << 1)

#       define IH_MC_SWAP_NONE                            0

#       define IH_MC_SWAP_16BIT                           1

#       define IH_MC_SWAP_32BIT                           2
@@ -547,7 +547,7 @@ 
#       define LB_D5_VBLANK_INTERRUPT                   (1 << 3)

#       define DC_HPD5_INTERRUPT                        (1 << 17)

#       define DC_HPD5_RX_INTERRUPT                     (1 << 18)

#define DISP_INTERRUPT_STATUS_CONTINUE5                 0x6050

#define DISP_INTERRUPT_STATUS_CONTINUE5                 0x6150

#       define LB_D6_VLINE_INTERRUPT                    (1 << 2)

#       define LB_D6_VBLANK_INTERRUPT                   (1 << 3)

#       define DC_HPD6_INTERRUPT                        (1 << 17)

drivers/gpu/drm/radeon/ni.c

+1 −0
Original line number Diff line number Diff line
@@ -1581,6 +1581,7 @@ void cayman_fini(struct radeon_device *rdev) 
	cayman_cp_fini(rdev);

	r600_irq_fini(rdev);

	radeon_wb_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_irq_kms_fini(rdev);

	cayman_pcie_gart_fini(rdev);

	radeon_gem_fini(rdev);

drivers/gpu/drm/radeon/r600.c

+1 −0
Original line number Diff line number Diff line
@@ -2628,6 +2628,7 @@ void r600_fini(struct radeon_device *rdev) 
	r600_cp_fini(rdev);

	r600_irq_fini(rdev);

	radeon_wb_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_irq_kms_fini(rdev);

	r600_pcie_gart_fini(rdev);

	radeon_agp_fini(rdev);