Commits · 7ad2d31cb692597f7918fce2f52a4c1949fbcf8d · github.com / kvm-riscv / linux

Mar 13, 2012

drm/nouveau: move vram detection funcs to chipset-specific fb code · 7ad2d31c

Ben Skeggs authored Dec 11, 2011



Also, display detected memory type in logs - though, we don't even try to
detect this yet.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

7ad2d31c

Mar 10, 2012

Merge branch 'drm-gma500-alanc' into drm-core-next · 83465324

Dave Airlie authored Mar 10, 2012

* drm-gma500-alanc: (47 commits)
  gma500: psb_irq: mark mid_{enable, disable}_pipe_event() as static
  gma500: mark psb_intel_sdvo_hdmi_sink_detect() as static
  gma500: psb_intel_display: drop unused variables
  gma500: mark psb_intel_pipe_set_base() as static
  gma500: drop unused psb_intel_modeset_cleanup()
  gma500: oaktrail_lvds_init() drop unused variable
  gma500: oaktrail_hdmi_i2c_access() drop unused variable
  gma500: mark oaktrail_backlight_init() as static
  gma500: oaktrail_hdmi: fix -Wmissing-field-initializers warning
  gma500: oaktrail_hdmi: drop dead code
  gma500: oaktrail_crtc: drop unused variables
  gma500: oaktrail_crtc: mark few functions as static
  gma500: mdfld_intel_display: drop unused variables
  gma500: mdfld_dsi_pkg_sender: fix -Wtype-limits warning
  gma500: mdfld_dsi_dpi: drop unused variables
  gma500: mdfld_device: mark few functions as static
  gma500: cdv_intel_lvds: #if 0 currently unused functions
  gma500: cdv_intel_lvds: mark few functions as static
  gma500: cdv_intel_hdmi: add missing include
  gma500: cdv_intel_crt: mark few functions as static
  ...

83465324

gma500: psb_irq: mark mid_{enable, disable}_pipe_event() as static · 8e18db81

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>

8e18db81

gma500: mark psb_intel_sdvo_hdmi_sink_detect() as static · f42aaa6f

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>

f42aaa6f

gma500: psb_intel_display: drop unused variables · 2e33d6b9

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>

2e33d6b9

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