diff --git a/libs/ui/dialogs/kis_dlg_preferences.h b/libs/ui/dialogs/kis_dlg_preferences.h
--- a/libs/ui/dialogs/kis_dlg_preferences.h
+++ b/libs/ui/dialogs/kis_dlg_preferences.h
@@ -270,6 +270,9 @@
 protected Q_SLOTS:
     void slotUseOpenGLToggled(bool isChecked);
 
+private:
+	void updateOpenGLWarning(bool useOpenGL);
+
 public:
 };
 
diff --git a/libs/ui/dialogs/kis_dlg_preferences.cc b/libs/ui/dialogs/kis_dlg_preferences.cc
--- a/libs/ui/dialogs/kis_dlg_preferences.cc
+++ b/libs/ui/dialogs/kis_dlg_preferences.cc
@@ -841,6 +841,8 @@
     cmbRenderer->setCurrentIndex(0);
 #endif
 
+    lblWarnOpenGL->hide();
+
 #ifdef Q_OS_WIN
     if (!(KisOpenGL::getSupportedOpenGLRenderers() &
             (KisOpenGL::RendererDesktopGL | KisOpenGL::RendererAngle))) {
@@ -897,6 +899,7 @@
     chkChannelsAsColor->setChecked(cfg.showSingleChannelAsColor());
     chkHidePopups->setChecked(cfg.hidePopups());
 
+    updateOpenGLWarning(grpOpenGL->isChecked());
     connect(grpOpenGL, SIGNAL(toggled(bool)), SLOT(slotUseOpenGLToggled(bool)));
 
     KoColor gridColor(KoColorSpaceRegistry::instance()->rgb8());
@@ -964,6 +967,27 @@
     chkUseTextureBuffer->setEnabled(isChecked);
     chkDisableVsync->setEnabled(isChecked);
     cmbFilterMode->setEnabled(isChecked);
+    updateOpenGLWarning(isChecked);
+}
+
+void DisplaySettingsTab::updateOpenGLWarning(bool useOpenGL)
+{
+    if (useOpenGL) {
+        QString warnings = KisOpenGL::getWarnings();
+        if (warnings.size() > 0) {
+            const QString warningTriangle = "<span style=\"font-size:30pt; font-weight:bolder; color: red;\">" +
+                QString(QChar(0xA0, 0x26)) + "</span>";
+            lblWarnOpenGL->setWordWrap(true);
+            lblWarnOpenGL->setText("<table><tr><td>" + warningTriangle + "</td><td>&nbsp;&nbsp;</td><td>" +
+				"Canvas Graphics Acceleration probably won't work correctly on your machine (" + warnings + "). " +
+                "If you experience any problems, please turn it off.</td></tr></table>");
+            lblWarnOpenGL->show();
+        } else {
+            lblWarnOpenGL->hide();
+        }
+    } else {
+        lblWarnOpenGL->hide();
+    }
 }
 
 //---------------------------------------------------------------------------------------------------
diff --git a/libs/ui/forms/wdgdisplaysettings.ui b/libs/ui/forms/wdgdisplaysettings.ui
--- a/libs/ui/forms/wdgdisplaysettings.ui
+++ b/libs/ui/forms/wdgdisplaysettings.ui
@@ -181,7 +181,7 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout">
-      <item row="1" column="1">
+      <item row="2" column="1">
        <widget class="QComboBox" name="cmbFilterMode">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -214,7 +214,7 @@
         </item>
        </widget>
       </item>
-      <item row="3" column="1">
+      <item row="4" column="1">
        <widget class="QCheckBox" name="chkDisableVsync">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Try to disable vsync for Krita. This makes painting more responsive. Uncheck only when experiencing crashes with some GPU/driver combinations.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -227,7 +227,7 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="3" column="1">
        <widget class="QCheckBox" name="chkUseTextureBuffer">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -243,7 +243,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
+      <item row="2" column="0">
        <widget class="QLabel" name="label">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@@ -256,16 +256,26 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
+      <item row="1" column="0">
        <widget class="QLabel" name="lblRenderer">
         <property name="text">
          <string>Renderer (needs restart):</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item row="1" column="1">
        <widget class="QComboBox" name="cmbRenderer"/>
       </item>
+      <item row="0" column="0" colspan="2">
+       <widget class="QLabel" name="lblWarnOpenGL">
+        <property name="text">
+         <string/>
+        </property>
+        <property name="margin">
+         <number>8</number>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/libs/ui/opengl/kis_opengl.h b/libs/ui/opengl/kis_opengl.h
--- a/libs/ui/opengl/kis_opengl.h
+++ b/libs/ui/opengl/kis_opengl.h
@@ -82,6 +82,8 @@
     /// Check for OpenGL
     static bool hasOpenGL();
 
+    static QString getWarnings();
+
     /**
      * @brief supportsFilter
      * @return True if OpenGL provides fence sync methods.
diff --git a/libs/ui/opengl/kis_opengl.cpp b/libs/ui/opengl/kis_opengl.cpp
--- a/libs/ui/opengl/kis_opengl.cpp
+++ b/libs/ui/opengl/kis_opengl.cpp
@@ -79,14 +79,21 @@
         bool isSupportedVersion() const {
             return
 #ifdef Q_OS_OSX
-                    ((glMajorVersion * 100 + glMinorVersion) >= 302
-                     && !rendererString.toLower().contains("amd")
-                     && !rendererString.toLower().contains("radeon"))
+                    (glMajorVersion * 100 + glMinorVersion) >= 302
 #else
                     (glMajorVersion >= 3 && (supportsDeprecatedFunctions || isOpenGLES)) ||
                     ((glMajorVersion * 100 + glMinorVersion) == 201)
 #endif
-                    ;
+					;
+        }
+
+        QString getWarnings() const {
+#ifdef Q_OS_OSX
+			if (rendererString.toLower().contains("amd") || rendererString.toLower().contains("radeon")) {
+                return "detected an unsupported AMD/Radeon GPU";
+            }
+#endif
+            return "";
         }
 
         bool supportsLoD() const {
@@ -600,3 +607,8 @@
 {
     return openGLCheckResult->isSupportedVersion();
 }
+
+QString KisOpenGL::getWarnings()
+{
+    return openGLCheckResult->getWarnings();
+}