linux-stable.git/drivers/gpu/drm/mgag200, branch linux-4.5.y

Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2016-01-21T01:30:20+00:00

Pull asm-generic updates from Arnd Bergmann:
 "The asm-generic tree this time contains one series from Nicolas Pitre
  that makes the optimized do_div() implementation from the ARM
  architecture available to all architectures.

  This also adds stricter type checking for callers of do_div, which has
  uncovered a number of bugs in existing code, and fixes up the ones we
  have found"

* tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  ARM: asm/div64.h: adjust to generic codde
  __div64_32(): make it overridable at compile time
  __div64_const32(): abstract out the actual 128-bit cross product code
  do_div(): generic optimization for constant divisor on 32-bit machines
  div64.h: optimize do_div() for power-of-two constant divisors
  mtd/sm_ftl.c: fix wrong do_div() usage
  drm/mgag200/mgag200_mode.c: fix wrong do_div() usage
  hid-sensor-hub.c: fix wrong do_div() usage
  ti/fapll: fix wrong do_div() usage
  ti/clkt_dpll: fix wrong do_div() usage
  tegra/clk-divider: fix wrong do_div() usage
  imx/clk-pllv2: fix wrong do_div() usage
  imx/clk-pllv1: fix wrong do_div() usage
  nouveau/nvkm/subdev/clk/gk20a.c: fix wrong do_div() usage

drm/mgag200: Constify function pointer structs

2015-12-15T12:46:35+00:00

Moves a bunch of junk to .rodata from .data.

 drivers/gpu/drm/mgag200/mgag200.ko:
-.text                       29244
+.text                       29232
-.rodata                       600
+.rodata                       668
-.data                         688
+.data                         620

Signed-off-by: Ville Syrjälä 
Reviewed-by: Alex Deucher 
Signed-off-by: Thierry Reding 
Signed-off-by: Boris Brezillon 
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-23-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter

drm: Pass 'name' to drm_encoder_init()

2015-12-11T08:13:20+00:00

Done with coccinelle for the most part. However, it thinks '...' is
part of the semantic patch, so I put an 'int DOTDOTDOT' placeholder
in its place and got rid of it with sed afterwards.

@@
identifier dev, encoder, funcs;
@@
 int drm_encoder_init(struct drm_device *dev,
                      struct drm_encoder *encoder,
                      const struct drm_encoder_funcs *funcs,
                      int encoder_type
+                     ,const char *name, int DOTDOTDOT
                      )
{ ... }

@@
identifier dev, encoder, funcs;
@@
 int drm_encoder_init(struct drm_device *dev,
                      struct drm_encoder *encoder,
                      const struct drm_encoder_funcs *funcs,
                      int encoder_type
+                     ,const char *name, int DOTDOTDOT
                      );

@@
expression E1, E2, E3, E4;
@@
 drm_encoder_init(E1, E2, E3, E4
+                 ,NULL
                  )

v2: Add ', or NULL...' to @name kernel doc (Jani)
    Annotate the function with __printf() attribute (Jani)

Signed-off-by: Ville Syrjälä 
Signed-off-by: Daniel Vetter 
Link: http://patchwork.freedesktop.org/patch/msgid/1449670818-2966-1-git-send-email-ville.syrjala@linux.intel.com

drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create()

2015-11-24T10:47:38+00:00

Drivers shouldn't clobber the passed in addfb ioctl parameters.
i915 was doing just that. To prevent it from happening again,
pass the struct around as const, starting all the way from
internal_framebuffer_create().

Signed-off-by: Ville Syrjälä 
Signed-off-by: Daniel Vetter

drm/mgag200: fix kernel hang in cursor code.

2015-11-19T03:20:01+00:00

The machine hang completely with the following message on the console:

[  487.777538] BUG: unable to handle kernel NULL pointer dereference at 0000000000000060
[  487.777554] IP: [] _raw_spin_lock+0xe/0x30
[  487.777557] PGD 42e9f7067 PUD 42f2fa067 PMD 0
[  487.777560] Oops: 0002 [#1] SMP
...
[  487.777618] CPU: 21 PID: 3190 Comm: Xorg Tainted: G            E   4.4.0-rc1-3-default+ #6
[  487.777620] Hardware name: Intel Corporation BRICKLAND/BRICKLAND, BIOS BRHSXSD1.86B.0059.R00.1501081238 01/08/2015
[  487.777621] task: ffff880853ae4680 ti: ffff8808696d4000 task.ti: ffff8808696d4000
[  487.777625] RIP: 0010:[]  [] _raw_spin_lock+0xe/0x30
[  487.777627] RSP: 0018:ffff8808696d79c0  EFLAGS: 00010246
[  487.777628] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[  487.777629] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000060
[  487.777630] RBP: ffff8808696d79e0 R08: 0000000000000000 R09: ffff88086924a780
[  487.777631] R10: 000000000001bb40 R11: 0000000000003246 R12: 0000000000000000
[  487.777632] R13: ffff880463a27360 R14: ffff88046ca50218 R15: 0000000000000080
[  487.777634] FS:  00007f3f81c5a8c0(0000) GS:ffff88086f060000(0000) knlGS:0000000000000000
[  487.777635] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  487.777636] CR2: 0000000000000060 CR3: 000000042e678000 CR4: 00000000001406e0
[  487.777638] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[  487.777639] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[  487.777639] Stack:
[  487.777642]  ffffffffa00eb5fa ffff8808696d7b60 ffff88086b87d800 0000000000000000
[  487.777644]  ffff8808696d7ac8 ffffffffa01694b6 ffff8808696d7ae8 ffffffff8109c8d5
[  487.777647]  ffff880469158740 ffff880463a27000 ffff88086b87d800 ffff88086b87d800
[  487.777647] Call Trace:
[  487.777674]  [] ? drm_gem_object_lookup+0x1a/0xa0 [drm]
[  487.777681]  [] mga_crtc_cursor_set+0xc6/0xb60 [mgag200]
[  487.777691]  [] ? find_busiest_group+0x35/0x4a0
[  487.777696]  [] ? __might_sleep+0x44/0x80
[  487.777699]  [] ? __ww_mutex_lock+0x22/0x9c
[  487.777722]  [] ? drm_modeset_lock+0x34/0xf0 [drm]
[  487.777733]  [] restore_fbdev_mode+0xee/0x2a0 [drm_kms_helper]
[  487.777742]  [] drm_fb_helper_restore_fbdev_mode_unlocked+0x2e/0x70 [drm_kms_helper]
[  487.777748]  [] drm_fb_helper_set_par+0x27/0x50 [drm_kms_helper]
[  487.777752]  [] fb_set_var+0x18c/0x3f0
[  487.777777]  [] ? __ext4_handle_dirty_metadata+0x8a/0x210 [ext4]
[  487.777783]  [] fbcon_blank+0x1b7/0x2b0
[  487.777790]  [] do_unblank_screen+0xb3/0x1c0
[  487.777795]  [] vt_ioctl+0x118a/0x1210
[  487.777801]  [] tty_ioctl+0x3f0/0xc90
[  487.777808]  [] ? kzfree+0x28/0x30
[  487.777813]  [] ? mntput+0x1f/0x30
[  487.777817]  [] do_vfs_ioctl+0x30d/0x570
[  487.777822]  [] ? task_work_run+0x8a/0xa0
[  487.777825]  [] SyS_ioctl+0x74/0x80
[  487.777829]  [] entry_SYSCALL_64_fastpath+0x12/0x71
[  487.777851] Code: 65 ff 0d ce 02 a8 7e 5d c3 ba 01 00 00 00 f0 0f b1 17 85 c0 75 e8 b0 01 5d c3 0f 1f 00 65 ff 05 b1 02 a8 7e 31 c0 ba 01 00 00 00  0f b1 17 85 c0 75 01 c3 55 89 c6 48 89 e5 e8 4e f5 b1 ff 5d
[  487.777854] RIP  [] _raw_spin_lock+0xe/0x30
[  487.777855]  RSP 
[  487.777856] CR2: 0000000000000060
[  487.777860] ---[ end trace 672a2cd555e0ebd3 ]---

The cursor code may be entered with file_priv == NULL && handle == NULL.
The problem was introduced by:

"bf89209 drm/mga200g: Hold a proper reference for cursor_set"

which calls drm_gem_object_lookup(dev, file_priv...). Previously this wasn't
a problem because we checked the handle. Move the check early in the function
can fix the problem.

Signed-off-by: Rui Wang 
Reviewed-by: Daniel Vetter 
Signed-off-by: Dave Airlie

drm/mgag200/mgag200_mode.c: fix wrong do_div() usage

2015-11-16T17:39:55+00:00

do_div() is meant to be used with an unsigned dividend.

Signed-off-by: Nicolas Pitre

drm/mgag200: Fix driver_load error handling

2015-09-23T22:10:44+00:00

mgag200_driver_load's error path just calls the drm driver's
driver_unload op. It isn't safe to call this because it doesn't handle
things well if driver_load fails somewhere mid way.

Replace the call to mgag200_driver_unload with a more finegrained
error handling path.

Link: http://lkml.kernel.org/r/55F6E68D.8070800@codeaurora.org
Reported-by: Ingo Molnar 
Cc: Daniel Vetter 
Cc: Dave Airlie 
Cc: David Airlie 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Sudip Mukherjee 
Cc: Thomas Gleixner 
Cc: dri-devel 
Signed-off-by: Archit Taneja 
Signed-off-by: Dave Airlie

drm/mgag200: Fix error handling paths in fbdev driver

2015-09-23T22:10:41+00:00

Set up error handling in mgag200_fbdev_init and mgag200fb_create such that
they release the things they allocate, rather than relying on someone
calling mga_fbdev_destroy.

Based on a patch by Sudip Mukherjee 

Link: http://lkml.kernel.org/r/55F6E68D.8070800@codeaurora.org
Reported-by: Ingo Molnar 
Cc: Daniel Vetter 
Cc: Dave Airlie 
Cc: David Airlie 
Cc: Linus Torvalds 
Cc: Peter Zijlstra 
Cc: Sudip Mukherjee 
Cc: Thomas Gleixner 
Cc: dri-devel 
Signed-off-by: Archit Taneja 
Signed-off-by: Dave Airlie

drm/mgag200: Add support for a new rev of G200e

2015-08-24T03:47:16+00:00

- Added PLL algorithm for a new rev of G200e
- Removed the bandwidth limitation for the new G200e

Signed-off-by: Mathieu Larouche 
Signed-off-by: Dave Airlie

drm/mgag200: Add support for a new G200eW3 chipset

2015-08-24T03:46:52+00:00

- Added support for the new deviceID for G200eW3
- Added PLL algorithm for the G200eW3
- Added some initialization code for G200eW3

Signed-off-by: Mathieu Larouche 
Signed-off-by: Dave Airlie