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

Commit b90be866 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: (27 commits)
  drm/radeon/kms: hopefully fix pll issues for real (v3)
  drm/radeon/kms: add bounds checking to avivo pll algo
  drm: fix wrong usages of drm_device in DRM Developer's Guide
  drm/radeon/kms: fix a few more atombios endian issues
  drm/radeon/kms: improve 6xx/7xx CS error output
  drm/radeon/kms: check AA resolve registers on r300
  drm/radeon/kms: fix tracking of BLENDCNTL, COLOR_CHANNEL_MASK, and GB_Z on r300
  drm/radeon/kms: use linear aligned for evergreen/ni bo blits
  drm/radeon/kms: use linear aligned for 6xx/7xx bo blits
  drm/radeon: fix race between GPU reset and TTM delayed delete thread.
  drm/radeon/kms: evergreen/ni big endian fixes (v2)
  drm/radeon/kms: 6xx/7xx big endian fixes
  drm/radeon/kms: atombios big endian fixes
  drm/radeon: 6xx/7xx non-kms endian fixes
  drm/radeon/kms: optimize CS state checking for r100->r500
  drm: do not leak kernel addresses via /proc/dri/*/vma
  drm/radeon/kms: add connector table for mac g5 9600
  radeon mkregtable: Add missing fclose() calls
  drm/radeon/kms: fix interlaced modes on dce4+
  drm/radeon: fix memory debugging since d961db75
  ...
parents c612cc21 5b40ddf8

Documentation/DocBook/drm.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 
      services.

    </para>

    <para>

      The core of every DRM driver is struct drm_device.  Drivers

      will typically statically initialize a drm_device structure,

      The core of every DRM driver is struct drm_driver.  Drivers

      will typically statically initialize a drm_driver structure,

      then pass it to drm_init() at load time.

    </para>
@@ -84,7 +84,7 @@ 
    <title>Driver initialization</title>

    <para>

      Before calling the DRM initialization routines, the driver must

      first create and fill out a struct drm_device structure.

      first create and fill out a struct drm_driver structure.

    </para>

    <programlisting>

      static struct drm_driver driver = {

drivers/gpu/drm/drm_info.c

+5 −4
Original line number Diff line number Diff line
@@ -283,17 +283,18 @@ int drm_vma_info(struct seq_file *m, void *data) 
#endif



	mutex_lock(&dev->struct_mutex);

	seq_printf(m, "vma use count: %d, high_memory = %p, 0x%08llx\n",

	seq_printf(m, "vma use count: %d, high_memory = %pK, 0x%pK\n",

		   atomic_read(&dev->vma_count),

		   high_memory, (u64)virt_to_phys(high_memory));

		   high_memory, (void *)virt_to_phys(high_memory));



	list_for_each_entry(pt, &dev->vmalist, head) {

		vma = pt->vma;

		if (!vma)

			continue;

		seq_printf(m,

			   "\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000",

			   pt->pid, vma->vm_start, vma->vm_end,

			   "\n%5d 0x%pK-0x%pK %c%c%c%c%c%c 0x%08lx000",

			   pt->pid,

			   (void *)vma->vm_start, (void *)vma->vm_end,

			   vma->vm_flags & VM_READ ? 'r' : '-',

			   vma->vm_flags & VM_WRITE ? 'w' : '-',

			   vma->vm_flags & VM_EXEC ? 'x' : '-',

drivers/gpu/drm/i915/i915_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400); 
unsigned int i915_powersave = 1;

module_param_named(powersave, i915_powersave, int, 0600);



unsigned int i915_enable_rc6 = 0;

module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);



unsigned int i915_lvds_downclock = 0;

module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);
@@ -360,7 +363,7 @@ static int i915_drm_thaw(struct drm_device *dev) 
		/* Resume the modeset for every activated CRTC */

		drm_helper_resume_force_mode(dev);



		if (dev_priv->renderctx && dev_priv->pwrctx)

		if (IS_IRONLAKE_M(dev))

			ironlake_enable_rc6(dev);

	}

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -958,6 +958,7 @@ extern unsigned int i915_fbpercrtc; 
extern unsigned int i915_powersave;

extern unsigned int i915_lvds_downclock;

extern unsigned int i915_panel_use_ssc;

extern unsigned int i915_enable_rc6;



extern int i915_suspend(struct drm_device *dev, pm_message_t state);

extern int i915_resume(struct drm_device *dev);

drivers/gpu/drm/i915/i915_reg.h

+3 −1
Original line number Diff line number Diff line
@@ -174,7 +174,9 @@ 
 *   address/value pairs. Don't overdue it, though, x <= 2^4 must hold!

 */

#define MI_LOAD_REGISTER_IMM(x)	MI_INSTR(0x22, 2*x-1)

#define MI_FLUSH_DW		MI_INSTR(0x26, 2) /* for GEN6 */

#define MI_FLUSH_DW		MI_INSTR(0x26, 1) /* for GEN6 */

#define   MI_INVALIDATE_TLB	(1<<18)

#define   MI_INVALIDATE_BSD	(1<<7)

#define MI_BATCH_BUFFER		MI_INSTR(0x30, 1)

#define   MI_BATCH_NON_SECURE	(1)

#define   MI_BATCH_NON_SECURE_I965 (1<<8)