Commits · 3c1d08d7af81b4dbd77530cb4f21f28cd4035f40 · Kirill Smelkov / linux

10 Mar, 2012 40 commits

gma500: mark psb_intel_pipe_set_base() as static · 3c1d08d7

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

3c1d08d7

gma500: drop unused psb_intel_modeset_cleanup() · 412a3df1

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

412a3df1

gma500: oaktrail_lvds_init() drop unused variable · cc2e991c

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

cc2e991c

gma500: oaktrail_hdmi_i2c_access() drop unused variable · 1e30296a

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1e30296a

gma500: mark oaktrail_backlight_init() as static · 771f64d0

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

771f64d0

gma500: oaktrail_hdmi: fix -Wmissing-field-initializers warning · 6e7f4573

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

6e7f4573

gma500: oaktrail_hdmi: drop dead code · e1bb07cb

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

e1bb07cb

gma500: oaktrail_crtc: drop unused variables · 4398e58c

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

4398e58c

gma500: oaktrail_crtc: mark few functions as static · 44332ddf

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

44332ddf

gma500: mdfld_intel_display: drop unused variables · cbc5a185

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

cbc5a185

gma500: mdfld_dsi_pkg_sender: fix -Wtype-limits warning · c7a5ae2f

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

c7a5ae2f

gma500: mdfld_dsi_dpi: drop unused variables · e4b9ff71

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

e4b9ff71

gma500: mdfld_device: mark few functions as static · 1c6a6268

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1c6a6268

gma500: cdv_intel_lvds: #if 0 currently unused functions · 062d054e

Kirill A. Shutemov authored Mar 08, 2012

cdv_intel_lvds_set_brightness() is only used in commented out code in
cdv_set_brightness().
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

062d054e

gma500: cdv_intel_lvds: mark few functions as static · bc11da70

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

bc11da70

gma500: cdv_intel_hdmi: add missing include · 455b9e91

Kirill A. Shutemov authored Mar 08, 2012

drivers/gpu/drm/gma500/cdv_intel_hdmi.c:305:6: warning: no previous prototype for 'cdv_hdmi_init' [-Wmissing-prototypes]
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

455b9e91

gma500: cdv_intel_crt: mark few functions as static · 657da160

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

657da160

gma500: cdv_intel_crt: drop unused variables · 0313c0de

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

0313c0de

gma500: cdv_intel_crt: drop dead code · a8ec6229

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

a8ec6229

gma500: cdv_intel_crt: add missing include · 2acdc9fa

Kirill A. Shutemov authored Mar 08, 2012

drivers/gpu/drm/gma500/cdv_intel_crt.c:273:6: warning: no previous prototype for 'cdv_intel_crt_init' [-Wmissing-prototypes]
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

2acdc9fa

gma500: fix cdv_intel_wait_for_vblank() prototype · 017350bc

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

017350bc

gma500: fix two -Wmissing-field-initializers warnings · aa53f533

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

aa53f533

gma500: mark psb_driver_device_is_agp() and psb_driver_preclose() as static · 15308e23

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

15308e23

gma500: psb_driver_load(): drop unused variables · 1fc93332

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1fc93332

gma500: fix ioctl confict · 699f0b45

Kirill A. Shutemov authored Mar 08, 2012

Move DRM_GMA_GET_PIPE_FROM_CRTC_ID to 0x08 to avoid confict with
DRM_GMA_GEM_MMAP.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

699f0b45

gma500: use DRM_IOCTL_DEF_DRV instead of custom PSB_IOCTL_DEF · 670c0444

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

670c0444

gma500: mmu: mark psb_mmu_free_pt() and psb_mmu_pt_alloc_map_lock() as static · 3afad3c2

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

3afad3c2

gma500: mmu: drop unused psb_get_default_pd_addr() · b2d57b33

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

b2d57b33

gma500: gtt: mark psb_gtt_entry() and psb_gtt_alloc() as static · ffe94d9c

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

ffe94d9c

gma500: mark psb_fbdev_destroy() and psb_fbdev_fini() as static · bc7f2b08

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

bc7f2b08

gma500: drop unused psbfb_suspend()/psbfb_resume() · 4796001a

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

4796001a

gma500: gem_glue: add missing include · a58df0ad

Kirill A. Shutemov authored Mar 08, 2012

It fixes W=1 warnings:

drivers/gpu/drm/gma500/gem_glue.c:23:6: warning: no previous prototype for ‘drm_gem_object_release_wrap’ [-Wmissing-prototypes]
drivers/gpu/drm/gma500/gem_glue.c:44:5: warning: no previous prototype for ‘gem_create_mmap_offset’ [-Wmissing-prototypes]
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

a58df0ad

gma500: medfield: drop a bit of dead code · 89f58dcd

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

89f58dcd

gma500: mdfld_dsi_output_init() drop unused parameter · fda95c2e

Kirill A. Shutemov authored Mar 08, 2012

Nobody uses 'config' parameter.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

fda95c2e

gma500: psbfb_create(): move depth initialization out of loop · 6aa1ead1

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

6aa1ead1

gma500: initial medfield merge · 026abc33

Kirill A. Shutemov authored Mar 08, 2012

We need to merge this ahead of some of the cleanup because a lot of needed
cleanup spans both new and old chips. If we try and clean up and the merge
we end up fighting ourselves.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
[With a load of the cleanup stuff folded in, register stuff reworked sanely]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

026abc33

gma500: rework register stuff sanely · c6265ff5

Alan Cox authored Mar 08, 2012

Rework registers handling to prepare for Medfield.
Signed-off-by: Alan Cox <alan@linux.intel.com>
[split out from a single big patch]
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

c6265ff5

gma500: make init_pm callback in struct psb_op optional · c715bc1b

Kirill A. Shutemov authored Mar 08, 2012

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

c715bc1b

gma500: re-order calling on the fix setup so we set up after the DRM layer · 4578240b

Alan Cox authored Mar 08, 2012

Noted by Kirill A Shutemov
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

4578240b

intel, gma500, lvds: Fix use after free and mem leak in psb_intel_lvds_init() · aa7c62af

Jesper Juhl authored Mar 08, 2012

In psb_intel_lvds_init(), if we fail to allocate memory for
'psb_intel_connector' we free the memory we previously allocated for
'psb_intel_encoder', but we then proceed to use that free'd pointer
when we do 'psb_intel_encoder->dev_priv = lvds_priv;'.

We may also leak the memory we allocated for 'psb_intel_encoder' if we
'goto failed_connector;' and the variable goes out of scope.

While I was there anyway, I also removed the pointless 'if
(psb_intel_connector)' before freeing it at the 'failed_connector:'
label - kfree() deals gracefully with NULL pointers, so it is not
needed.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

aa7c62af