diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-30 09:49:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-30 09:49:06 +1000 |
| commit | a76edb8cec0cc864c8b72fa7e84a72336e033e23 (patch) | |
| tree | 3d680a904cc835aeb56f32d8814af7d8fd9a7767 /drivers/gpu/drm/radeon | |
| parent | f1a04d82585032d906e6a7d5b16d38a369033bd0 (diff) | |
| parent | 48aa1e748f29373fdcc2bc341eac08ef16bff269 (diff) | |
| download | talos-op-linux-a76edb8cec0cc864c8b72fa7e84a72336e033e23.tar.gz talos-op-linux-a76edb8cec0cc864c8b72fa7e84a72336e033e23.zip | |
Merge tag 'topic/drm-misc-2015-10-22' of git://anongit.freedesktop.org/drm-intel into drm-next
Few more drm-misc stragglers for 4.4. Big thing is the generic probe for
imx/rockchip/armada (but the variant for msm/rpi/exynos is still missing).
Also the hdmi clocking fixes from Ville which was a lot of confusion about
which tree it should be applied to ;-)
* tag 'topic/drm-misc-2015-10-22' of git://anongit.freedesktop.org/drm-intel:
drm: correctly check failed allocation
vga_switcheroo: Constify vga_switcheroo_handler
drm/armada: Convert the probe function to the generic drm_of_component_probe()
drm/rockchip: Convert the probe function to the generic drm_of_component_probe()
drm/imx: Convert the probe function to the generic drm_of_component_probe()
drm: Introduce generic probe function for component based masters.
drm/edid: Round to closest when computing the CEA/HDMI alternate clock
drm/edid: Fix up clock for CEA/HDMI modes specified via detailed timings
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atpx_handler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index a771b9f0bf98..c4b4f298a283 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c @@ -499,7 +499,7 @@ static int radeon_atpx_get_client_id(struct pci_dev *pdev) return VGA_SWITCHEROO_DIS; } -static struct vga_switcheroo_handler radeon_atpx_handler = { +static const struct vga_switcheroo_handler radeon_atpx_handler = { .switchto = radeon_atpx_switchto, .power_state = radeon_atpx_power_state, .init = radeon_atpx_init, |
